Skip to content

Commit 16343ff

Browse files
BaliedgeBaliedge
authored
Update OpenTelemetry and associated packages. (#207)
* Update OpenTelemetry and associated packages. Remove Jaeger tracing functionality because OTel stopped supporting it. * Update semconv version * Update README.md. * Update GHA test Go version matrix. * Fix faulty test that breaks on go1.23+.
1 parent 083841f commit 16343ff

File tree

6 files changed

+117
-217
lines changed

6 files changed

+117
-217
lines changed

Diff for: ‎.github/workflows/test.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ jobs:
1616
strategy:
1717
matrix:
1818
go-version:
19-
- 1.21.x # a minimum supported version(from go.mod)
20-
- 1.22.x
19+
- 1.22.x # a minimum supported version(from go.mod)
20+
- 1.23.x
21+
- 1.24.x
2122
os: [ ubuntu-latest ]
2223
runs-on: ${{ matrix.os }}
2324
steps:

Diff for: ‎clock/rfc822_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func TestParseRFC822Time(t *testing.T) {
188188
{"Wed, November 03 2021 17:48:06 CST"},
189189

190190
// Timestamps without seconds.
191-
{"Sun, 31 Oct 2021 12:10 -5000"},
191+
{"Sun, 31 Oct 2021 12:10 -0500"},
192192
{"Thu, 3 Jun 2021 12:01 MST"},
193193
{"Thu, 3 Jun 2021 12:01 -0700"},
194194
{"Thu, 3 Jun 2021 12:01 -0700 (MST)"},

Diff for: ‎go.mod

+30-31
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/mailgun/holster/v4
22

3-
go 1.21
4-
5-
toolchain go1.21.12
3+
go 1.22.0
64

75
require (
86
github.com/Shopify/toxiproxy v2.1.4+incompatible
@@ -17,41 +15,40 @@ require (
1715
github.com/miekg/dns v1.1.50
1816
github.com/pkg/errors v0.9.1
1917
github.com/prometheus/client_golang v1.13.0
20-
github.com/sirupsen/logrus v1.9.2
21-
github.com/stretchr/testify v1.9.0
22-
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.2.1
18+
github.com/sirupsen/logrus v1.9.3
19+
github.com/stretchr/testify v1.10.0
20+
github.com/uptrace/opentelemetry-go-extra/otellogrus v0.3.2
2321
go.etcd.io/etcd/api/v3 v3.5.5
2422
go.etcd.io/etcd/client/v3 v3.5.5
25-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
26-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
27-
go.opentelemetry.io/otel v1.25.0
28-
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
29-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0
30-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0
31-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.25.0
32-
go.opentelemetry.io/otel/sdk v1.25.0
33-
go.opentelemetry.io/otel/trace v1.25.0
34-
golang.org/x/net v0.23.0
35-
google.golang.org/grpc v1.63.0
23+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
24+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0
25+
go.opentelemetry.io/otel v1.35.0
26+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.35.0
27+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.35.0
28+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0
29+
go.opentelemetry.io/otel/sdk v1.35.0
30+
go.opentelemetry.io/otel/trace v1.35.0
31+
golang.org/x/net v0.35.0
32+
google.golang.org/grpc v1.71.0
3633
gopkg.in/yaml.v3 v3.0.1
3734
)
3835

3936
require (
4037
github.com/armon/go-metrics v0.4.0 // indirect
4138
github.com/beorn7/perks v1.0.1 // indirect
4239
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
43-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
40+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4441
github.com/coreos/go-semver v0.3.0 // indirect
4542
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
4643
github.com/davecgh/go-spew v1.1.1 // indirect
4744
github.com/fatih/color v1.13.0 // indirect
4845
github.com/felixge/httpsnoop v1.0.4 // indirect
49-
github.com/go-logr/logr v1.4.1 // indirect
46+
github.com/go-logr/logr v1.4.2 // indirect
5047
github.com/go-logr/stdr v1.2.2 // indirect
5148
github.com/gogo/protobuf v1.3.2 // indirect
5249
github.com/google/btree v1.1.1 // indirect
5350
github.com/gorilla/mux v1.8.0 // indirect
54-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
51+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
5552
github.com/hashicorp/errwrap v1.1.0 // indirect
5653
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
5754
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
@@ -73,20 +70,22 @@ require (
7370
github.com/prometheus/procfs v0.8.0 // indirect
7471
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
7572
github.com/stretchr/objx v0.5.2 // indirect
76-
github.com/uptrace/opentelemetry-go-extra/otelutil v0.2.1 // indirect
73+
github.com/uptrace/opentelemetry-go-extra/otelutil v0.3.2 // indirect
7774
go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
78-
go.opentelemetry.io/otel/metric v1.25.0 // indirect
79-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
75+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
76+
go.opentelemetry.io/otel/log v0.6.0 // indirect
77+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
78+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8079
go.uber.org/atomic v1.9.0 // indirect
8180
go.uber.org/multierr v1.8.0 // indirect
8281
go.uber.org/zap v1.21.0 // indirect
83-
golang.org/x/mod v0.13.0 // indirect
84-
golang.org/x/sys v0.18.0 // indirect
85-
golang.org/x/text v0.14.0 // indirect
86-
golang.org/x/tools v0.14.0 // indirect
87-
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
88-
google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
89-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
90-
google.golang.org/protobuf v1.33.0 // indirect
82+
golang.org/x/mod v0.17.0 // indirect
83+
golang.org/x/sync v0.11.0 // indirect
84+
golang.org/x/sys v0.30.0 // indirect
85+
golang.org/x/text v0.22.0 // indirect
86+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
87+
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
88+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
89+
google.golang.org/protobuf v1.36.5 // indirect
9190
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9291
)

0 commit comments

Comments
 (0)