Skip to content

Commit 172ee83

Browse files
adambenhassenGemini
andauthored
chore(otel-collector): upgrade to v0.140.0 and Go 1.25, fixes security issues (#7304)
Co-authored-by: Gemini <gemini@google.com>
1 parent 4d302c9 commit 172ee83

File tree

7 files changed

+129
-136
lines changed

7 files changed

+129
-136
lines changed

.changeset/beefy-grand-bazaar.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Upgrade OpenTelemetry Collector to v0.140.0 (from v0.122.0) and Go to 1.25 (from 1.23). This includes updating all collector component dependencies and adapting the hive auth extension for API compatibility changes.
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
dist:
2-
version: 0.122.0
2+
version: 0.140.0
33
name: otelcol-custom
44
description: Custom OTel Collector distribution
55
output_path: ./otelcol-custom
66

77
receivers:
8-
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.122.0
8+
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.140.0
99

1010
processors:
11-
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.122.0
12-
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.122.0
11+
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.140.0
12+
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.140.0
1313
- gomod:
1414
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor
15-
v0.122.0
15+
v0.140.0
1616
- gomod:
17-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.122.0
17+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.140.0
1818

1919
exporters:
20-
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.122.0
20+
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.140.0
2121
- gomod:
22-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.122.0
22+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter v0.140.0
2323

2424
extensions:
2525
- gomod:
2626
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension
27-
v0.122.0
27+
v0.140.0
2828
- gomod: github.com/graphql-hive/console/docker/configs/otel-collector/extension-hiveauth v0.0.0
2929
path: ./extension-hiveauth
3030
name: hiveauthextension # when using local extensions, package name is required, otherwise you get "missing import path"

docker/configs/otel-collector/extension-hiveauth/extension.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,18 @@ import (
1616
"github.com/patrickmn/go-cache"
1717
"go.opentelemetry.io/collector/client"
1818
"go.opentelemetry.io/collector/component"
19+
"go.opentelemetry.io/collector/extension"
1920
"go.opentelemetry.io/collector/extension/extensionauth"
2021
"go.uber.org/zap"
2122
"golang.org/x/sync/singleflight"
2223
"go.opentelemetry.io/otel/metric"
2324
"go.opentelemetry.io/otel/attribute"
2425
)
2526

26-
var _ extensionauth.Server = (*hiveAuthExtension)(nil)
27+
var (
28+
_ extension.Extension = (*hiveAuthExtension)(nil)
29+
_ extensionauth.Server = (*hiveAuthExtension)(nil)
30+
)
2731

2832
var _ client.AuthData = (*authData)(nil)
2933

@@ -269,7 +273,7 @@ func newHiveAuthExtension(
269273
logger *zap.Logger,
270274
cfg component.Config,
271275
telemetrySettings component.TelemetrySettings,
272-
) (extensionauth.Server, error) {
276+
) (extension.Extension, error) {
273277
c, ok := cfg.(*Config)
274278
if !ok {
275279
return nil, errors.New("invalid configuration")

docker/configs/otel-collector/extension-hiveauth/generated_package_test.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker/configs/otel-collector/extension-hiveauth/go.mod

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,52 @@
11
module github.com/graphql-hive/console/docker/configs/otel-collector/extension-hiveauth
22

3-
go 1.23.0
3+
go 1.25
44

55
require (
66
github.com/patrickmn/go-cache v2.1.0+incompatible
7-
github.com/stretchr/testify v1.10.0
8-
go.opentelemetry.io/collector/client v1.28.0
9-
go.opentelemetry.io/collector/component v1.28.0
10-
go.opentelemetry.io/collector/component/componenttest v0.122.0
11-
go.opentelemetry.io/collector/confmap v1.28.0
12-
go.opentelemetry.io/collector/extension v1.28.0
13-
go.opentelemetry.io/collector/extension/extensionauth v0.122.0
14-
go.opentelemetry.io/collector/extension/extensiontest v0.122.0
7+
github.com/stretchr/testify v1.11.1
8+
go.opentelemetry.io/collector/client v1.46.0
9+
go.opentelemetry.io/collector/component v1.46.0
10+
go.opentelemetry.io/collector/component/componenttest v0.140.0
11+
go.opentelemetry.io/collector/confmap v1.46.0
12+
go.opentelemetry.io/collector/extension v1.46.0
13+
go.opentelemetry.io/collector/extension/extensionauth v1.46.0
14+
go.opentelemetry.io/collector/extension/extensiontest v0.140.0
15+
go.opentelemetry.io/otel v1.38.0
16+
go.opentelemetry.io/otel/metric v1.38.0
1517
go.uber.org/goleak v1.3.0
16-
go.uber.org/zap v1.27.0
17-
golang.org/x/sync v0.12.0
18+
go.uber.org/zap v1.27.1
19+
golang.org/x/sync v0.18.0
1820
)
1921

2022
require (
2123
github.com/davecgh/go-spew v1.1.1 // indirect
22-
github.com/go-logr/logr v1.4.2 // indirect
24+
github.com/go-logr/logr v1.4.3 // indirect
2325
github.com/go-logr/stdr v1.2.2 // indirect
24-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
25-
github.com/gogo/protobuf v1.3.2 // indirect
26+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
27+
github.com/gobwas/glob v0.2.3 // indirect
2628
github.com/google/uuid v1.6.0 // indirect
2729
github.com/hashicorp/go-version v1.7.0 // indirect
28-
github.com/knadh/koanf/maps v0.1.1 // indirect
29-
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
30-
github.com/knadh/koanf/v2 v2.1.2 // indirect
30+
github.com/json-iterator/go v1.1.12 // indirect
31+
github.com/knadh/koanf/maps v0.1.2 // indirect
32+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
33+
github.com/knadh/koanf/v2 v2.3.0 // indirect
3134
github.com/mitchellh/copystructure v1.2.0 // indirect
3235
github.com/mitchellh/reflectwalk v1.0.2 // indirect
36+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
37+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
3338
github.com/pmezard/go-difflib v1.0.0 // indirect
3439
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
35-
go.opentelemetry.io/collector/featuregate v1.28.0 // indirect
36-
go.opentelemetry.io/collector/pdata v1.28.0 // indirect
37-
go.opentelemetry.io/otel v1.35.0 // indirect
38-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
39-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
40-
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
41-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
40+
go.opentelemetry.io/collector/featuregate v1.46.0 // indirect
41+
go.opentelemetry.io/collector/pdata v1.46.0 // indirect
42+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
43+
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
44+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
4245
go.uber.org/multierr v1.11.0 // indirect
43-
golang.org/x/net v0.37.0 // indirect
44-
golang.org/x/sys v0.31.0 // indirect
45-
golang.org/x/text v0.23.0 // indirect
46-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
47-
google.golang.org/grpc v1.71.0 // indirect
48-
google.golang.org/protobuf v1.36.5 // indirect
46+
go.yaml.in/yaml/v3 v3.0.4 // indirect
47+
golang.org/x/sys v0.35.0 // indirect
48+
google.golang.org/grpc v1.76.0 // indirect
49+
google.golang.org/protobuf v1.36.10 // indirect
4950
gopkg.in/yaml.v3 v3.0.1 // indirect
5051
)
5152

0 commit comments

Comments
 (0)