Skip to content

Commit 61fefc4

Browse files
authored
Drop support for Go 1.25 (#9584)
1 parent d79bc33 commit 61fefc4

105 files changed

Lines changed: 2815 additions & 2841 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ body:
119119
attributes:
120120
label: Go Version
121121
description: What Golang version were you running?
122-
placeholder: '1.25'
122+
placeholder: '1.26'
123123
validations:
124124
required: true
125125
- type: input
@@ -139,4 +139,3 @@ body:
139139
useful context, avoiding comments like `+1` or `me too`, to help us
140140
triage it. Learn more
141141
[here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>
142-

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
compatibility-test:
140140
strategy:
141141
matrix:
142-
go-version: ["1.27.0", "1.26.0", "1.25.0"]
142+
go-version: ["1.27.0", "1.26.0"]
143143
platform:
144144
- os: ubuntu-latest
145145
arch: "386"

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88

99
## [Unreleased]
1010

11+
### Removed
12+
13+
- Drop support for [Go 1.25]. (#9584)
14+
1115
<!-- Released section -->
1216
<!-- Don't change this section unless doing release -->
1317

README.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![Docs](https://godoc.org/go.opentelemetry.io/contrib?status.svg)](https://pkg.go.dev/go.opentelemetry.io/contrib)
66
[![Go Report Card](https://goreportcard.com/badge/go.opentelemetry.io/contrib)](https://goreportcard.com/report/go.opentelemetry.io/contrib)
77
[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/opentelemetry-go-contrib.svg)](https://issues.oss-fuzz.com/issues?q=project:opentelemetry-go-contrib)
8-
[![Slack](https://img.shields.io/badge/slack-@cncf/otel--go-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01NPAXACKT)
8+
[![Slack](https://img.shields.io/badge/slack-@cncf/otel--go-brightgreen.svg?logo=slack)](https://slack.cncf.io/)
99

1010
Collection of 3rd-party packages for [OpenTelemetry-Go](https://github.com/open-telemetry/opentelemetry-go).
1111

@@ -27,7 +27,7 @@ Refer to the module for its version or our [versioning manifest](./versions.yaml
2727

2828
Project versioning information and stability guarantees can be found in the [versioning documentation](https://github.com/open-telemetry/opentelemetry-go/blob/a724cf884287e04785eaa91513d26a6ef9699288/VERSIONING.md).
2929

30-
Progress and status specific to this repository is tracked in our local [project boards](https://github.com/open-telemetry/opentelemetry-go-contrib/projects?query=is%3Aopen) and [milestones](https://github.com/open-telemetry/opentelemetry-go-contrib/milestones).
30+
Progress and status specific to this repository is tracked in our [project board](https://github.com/orgs/open-telemetry/projects/186) and [milestones](https://github.com/open-telemetry/opentelemetry-go-contrib/milestones).
3131

3232
### Compatibility
3333

@@ -54,22 +54,16 @@ This project is tested on the following systems.
5454
| -------- | ---------- | ------------ |
5555
| Ubuntu | 1.27 | amd64 |
5656
| Ubuntu | 1.26 | amd64 |
57-
| Ubuntu | 1.25 | amd64 |
5857
| Ubuntu | 1.27 | 386 |
5958
| Ubuntu | 1.26 | 386 |
60-
| Ubuntu | 1.25 | 386 |
6159
| macOS | 1.27 | amd64 |
6260
| macOS | 1.26 | amd64 |
63-
| macOS | 1.25 | amd64 |
6461
| macOS | 1.27 | arm64 |
6562
| macOS | 1.26 | arm64 |
66-
| macOS | 1.25 | arm64 |
6763
| Windows | 1.27 | amd64 |
6864
| Windows | 1.26 | amd64 |
69-
| Windows | 1.25 | amd64 |
7065
| Windows | 1.27 | 386 |
7166
| Windows | 1.26 | 386 |
72-
| Windows | 1.25 | 386 |
7367

7468
While this project should work for other systems, no compatibility guarantees
7569
are made for those systems currently.

bridges/otellogr/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/bridges/otellogr
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/go-logr/logr v1.4.4

bridges/otellogrus/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/bridges/otellogrus
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/sirupsen/logrus v1.10.2

bridges/otelslog/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/bridges/otelslog
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/stretchr/testify v1.12.1

bridges/otelzap/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/bridges/otelzap
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/stretchr/testify v1.12.1

bridges/prometheus/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module go.opentelemetry.io/contrib/bridges/prometheus
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/prometheus/client_golang v1.24.1
@@ -9,7 +9,6 @@ require (
99
go.opentelemetry.io/otel v1.46.0
1010
go.opentelemetry.io/otel/sdk v1.46.0
1111
go.opentelemetry.io/otel/sdk/metric v1.46.0
12-
google.golang.org/protobuf v1.36.12
1312
)
1413

1514
require (
@@ -26,4 +25,5 @@ require (
2625
go.opentelemetry.io/otel/trace v1.46.0 // indirect
2726
go.yaml.in/yaml/v3 v3.0.5 // indirect
2827
golang.org/x/sys v0.47.0 // indirect
28+
google.golang.org/protobuf v1.36.12 // indirect
2929
)

bridges/prometheus/producer_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616
"go.opentelemetry.io/otel/sdk/instrumentation"
1717
"go.opentelemetry.io/otel/sdk/metric/metricdata"
1818
"go.opentelemetry.io/otel/sdk/metric/metricdata/metricdatatest"
19-
"google.golang.org/protobuf/proto"
2019
)
2120

2221
const (
@@ -487,26 +486,26 @@ func TestProducePartialSuccess(t *testing.T) {
487486
p := NewMetricProducer(WithGatherer(gathererFunc(func() ([]*dto.MetricFamily, error) {
488487
return []*dto.MetricFamily{
489488
{
490-
Name: proto.String("test_gauge_metric"),
491-
Help: proto.String("A gauge metric for testing"),
489+
Name: new("test_gauge_metric"),
490+
Help: new("A gauge metric for testing"),
492491
Type: dto.MetricType_GAUGE.Enum(),
493492
Metric: []*dto.Metric{
494493
{
495494
Gauge: &dto.Gauge{
496-
Value: proto.Float64(123.4),
495+
Value: new(123.4),
497496
},
498497
Label: []*dto.LabelPair{
499498
{
500-
Name: proto.String("foo"),
501-
Value: proto.String("bar"),
499+
Name: new("foo"),
500+
Value: new("bar"),
502501
},
503502
},
504503
},
505504
},
506505
},
507506
{
508-
Name: proto.String("test_gauge_histogram_metric"),
509-
Help: proto.String("A gauge histogram metric for testing"),
507+
Name: new("test_gauge_histogram_metric"),
508+
Help: new("A gauge histogram metric for testing"),
510509
Type: dto.MetricType_GAUGE_HISTOGRAM.Enum(),
511510
Metric: []*dto.Metric{
512511
{},

0 commit comments

Comments
 (0)