Skip to content

[Feature]: Upgrade to OTEL Collector 1.37 #7400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yurishkuro merged 3 commits into from
Jul 30, 2025
Merged

[Feature]: Upgrade to OTEL Collector 1.37 #7400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9276d3d
update configgrpc version to 0.131.0
wololowarrior Jul 30, 2025
139d50a
update tests to fix ci failure
wololowarrior Jul 30, 2025
ee43963
fmt
wololowarrior Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/collector/app/collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ func optionsForEphemeralPorts() *flags.CollectorOptions {
Transport: confignet.TransportTypeTCP,
},
Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{
ServerParameters: &configgrpc.KeepaliveServerParameters{
ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{
MaxConnectionIdle: 10,
},
}),
}),
},
OTLP: struct {
Expand All @@ -65,9 +65,9 @@ func optionsForEphemeralPorts() *flags.CollectorOptions {
Transport: confignet.TransportTypeTCP,
},
Keepalive: configoptional.Some(configgrpc.KeepaliveServerConfig{
ServerParameters: &configgrpc.KeepaliveServerParameters{
ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{
MaxConnectionIdle: 10,
},
}),
}),
},
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/app/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,10 +215,10 @@ func initGRPCFromViper(v *viper.Viper, opts *configgrpc.ServerConfig, cfg server
opts.NetAddr.Endpoint = ports.FormatHostPort(v.GetString(cfg.prefix + "." + flagSuffixHostPort))
opts.MaxRecvMsgSizeMiB = v.GetInt(cfg.prefix+"."+flagSuffixGRPCMaxReceiveMessageLength) / (1024 * 1024)
opts.Keepalive = configoptional.Some(configgrpc.KeepaliveServerConfig{
ServerParameters: &configgrpc.KeepaliveServerParameters{
ServerParameters: configoptional.Some(configgrpc.KeepaliveServerParameters{
MaxConnectionAge: v.GetDuration(cfg.prefix + "." + flagSuffixGRPCMaxConnectionAge),
MaxConnectionAgeGrace: v.GetDuration(cfg.prefix + "." + flagSuffixGRPCMaxConnectionAgeGrace),
},
}),
})

return nil
Expand Down
4 changes: 2 additions & 2 deletions cmd/collector/app/flags/flags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ func TestCollectorOptionsWithFlags_CheckMaxConnectionAge(t *testing.T) {
_, err := c.InitFromViper(v, zap.NewNop())
require.NoError(t, err)

assert.Equal(t, 5*time.Minute, c.GRPC.Keepalive.Get().ServerParameters.MaxConnectionAge)
assert.Equal(t, time.Minute, c.GRPC.Keepalive.Get().ServerParameters.MaxConnectionAgeGrace)
assert.Equal(t, 5*time.Minute, c.GRPC.Keepalive.Get().ServerParameters.Get().MaxConnectionAge)
assert.Equal(t, time.Minute, c.GRPC.Keepalive.Get().ServerParameters.Get().MaxConnectionAgeGrace)
assert.Equal(t, 5*time.Minute, c.HTTP.IdleTimeout)
assert.Equal(t, 6*time.Minute, c.HTTP.ReadTimeout)
assert.Equal(t, 5*time.Second, c.HTTP.ReadHeaderTimeout)
Expand Down
1 change: 0 additions & 1 deletion cmd/query/app/apiv3/snapshots/FindTraces.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
{
"kind": 2,
"name": "foobar",
"parentSpanId": "",
Copy link
Copy Markdown
Member

@yurishkuro yurishkuro Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unexpected, what is changed upstream to cause this?

Copy link
Copy Markdown
Contributor Author

@wololowarrior wololowarrior Jul 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it made me curious as well. Though I'm not versed with opentelemetry-collector repo, using claude I was probably able to identify the root cause. Lemme know if it makes sense:

  • This adds a marshal template which omits the field if its equal to the default.
    Resovles to:
if ms.orig.ParentSpanId != data.SpanID([8]byte{}) {
    dest.WriteObjectField("parentSpanId")
    ms.orig.ParentSpanId.MarshalJSONStream(dest)
}
  • ParentSpanId is not being set in the test thus it gets the default value of SpanID, i.e. data.SpanID([8]byte{})

Copy link
Copy Markdown
Member

@yurishkuro yurishkuro Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool, thanks for finding the reference (open-telemetry/opentelemetry-collector#13450). It's not a deal-breaker change, but I commented on that PR because they were saying "no changes to marshaling".

"spanId": "0000000000000002",
"status": {
"code": 2
Expand Down
1 change: 0 additions & 1 deletion cmd/query/app/apiv3/snapshots/GetTrace.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
{
"kind": 2,
"name": "foobar",
"parentSpanId": "",
"spanId": "0000000000000002",
"status": {
"code": 2
Expand Down
156 changes: 78 additions & 78 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,50 +46,50 @@ require (
github.com/stretchr/testify v1.10.0
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/xdg-go/scram v1.1.2
go.opentelemetry.io/collector/client v1.36.1
go.opentelemetry.io/collector/component v1.36.1
go.opentelemetry.io/collector/component/componentstatus v0.130.1
go.opentelemetry.io/collector/component/componenttest v0.130.1
go.opentelemetry.io/collector/config/configauth v0.130.1
go.opentelemetry.io/collector/config/configgrpc v0.130.1
go.opentelemetry.io/collector/config/confighttp v0.130.1
go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.130.1
go.opentelemetry.io/collector/config/confignet v1.36.1
go.opentelemetry.io/collector/config/configopaque v1.36.1
go.opentelemetry.io/collector/config/configoptional v0.130.1
go.opentelemetry.io/collector/config/configretry v1.36.1
go.opentelemetry.io/collector/config/configtls v1.36.1
go.opentelemetry.io/collector/confmap v1.36.1
go.opentelemetry.io/collector/confmap/provider/envprovider v1.36.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.1
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.36.1
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.36.1
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.36.1
go.opentelemetry.io/collector/confmap/xconfmap v0.130.1
go.opentelemetry.io/collector/connector v0.130.1
go.opentelemetry.io/collector/connector/forwardconnector v0.130.1
go.opentelemetry.io/collector/consumer v1.36.1
go.opentelemetry.io/collector/consumer/consumertest v0.130.1
go.opentelemetry.io/collector/exporter v0.130.1
go.opentelemetry.io/collector/exporter/debugexporter v0.130.1
go.opentelemetry.io/collector/exporter/exportertest v0.130.1
go.opentelemetry.io/collector/exporter/nopexporter v0.130.1
go.opentelemetry.io/collector/exporter/otlpexporter v0.130.1
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.130.1
go.opentelemetry.io/collector/extension v1.36.1
go.opentelemetry.io/collector/extension/zpagesextension v0.130.1
go.opentelemetry.io/collector/featuregate v1.36.1
go.opentelemetry.io/collector/otelcol v0.130.1
go.opentelemetry.io/collector/pdata v1.36.1
go.opentelemetry.io/collector/pipeline v0.130.1
go.opentelemetry.io/collector/processor v1.36.1
go.opentelemetry.io/collector/processor/batchprocessor v0.130.1
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.130.1
go.opentelemetry.io/collector/processor/processorhelper v0.130.1
go.opentelemetry.io/collector/processor/processortest v0.130.1
go.opentelemetry.io/collector/receiver v1.36.1
go.opentelemetry.io/collector/receiver/nopreceiver v0.130.1
go.opentelemetry.io/collector/receiver/otlpreceiver v0.130.1
go.opentelemetry.io/collector/client v1.37.0
go.opentelemetry.io/collector/component v1.37.0
go.opentelemetry.io/collector/component/componentstatus v0.131.0
go.opentelemetry.io/collector/component/componenttest v0.131.0
go.opentelemetry.io/collector/config/configauth v0.131.0
go.opentelemetry.io/collector/config/configgrpc v0.131.0
go.opentelemetry.io/collector/config/confighttp v0.131.0
go.opentelemetry.io/collector/config/confighttp/xconfighttp v0.131.0
go.opentelemetry.io/collector/config/confignet v1.37.0
go.opentelemetry.io/collector/config/configopaque v1.37.0
go.opentelemetry.io/collector/config/configoptional v0.131.0
go.opentelemetry.io/collector/config/configretry v1.37.0
go.opentelemetry.io/collector/config/configtls v1.37.0
go.opentelemetry.io/collector/confmap v1.37.0
go.opentelemetry.io/collector/confmap/provider/envprovider v1.37.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.37.0
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.37.0
go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.37.0
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.37.0
go.opentelemetry.io/collector/confmap/xconfmap v0.131.0
go.opentelemetry.io/collector/connector v0.131.0
go.opentelemetry.io/collector/connector/forwardconnector v0.131.0
go.opentelemetry.io/collector/consumer v1.37.0
go.opentelemetry.io/collector/consumer/consumertest v0.131.0
go.opentelemetry.io/collector/exporter v0.131.0
go.opentelemetry.io/collector/exporter/debugexporter v0.131.0
go.opentelemetry.io/collector/exporter/exportertest v0.131.0
go.opentelemetry.io/collector/exporter/nopexporter v0.131.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.131.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.131.0
go.opentelemetry.io/collector/extension v1.37.0
go.opentelemetry.io/collector/extension/zpagesextension v0.131.0
go.opentelemetry.io/collector/featuregate v1.37.0
go.opentelemetry.io/collector/otelcol v0.131.0
go.opentelemetry.io/collector/pdata v1.37.0
go.opentelemetry.io/collector/pipeline v0.131.0
go.opentelemetry.io/collector/processor v1.37.0
go.opentelemetry.io/collector/processor/batchprocessor v0.131.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.131.0
go.opentelemetry.io/collector/processor/processorhelper v0.131.0
go.opentelemetry.io/collector/processor/processortest v0.131.0
go.opentelemetry.io/collector/receiver v1.37.0
go.opentelemetry.io/collector/receiver/nopreceiver v0.131.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.131.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0
go.opentelemetry.io/contrib/samplers/jaegerremote v0.31.0
Expand Down Expand Up @@ -161,7 +161,7 @@ require (
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
Expand Down Expand Up @@ -191,7 +191,7 @@ require (
github.com/klauspost/compress v1.18.0 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
github.com/knadh/koanf/v2 v2.2.1 // indirect
github.com/knadh/koanf/v2 v2.2.2 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lightstep/go-expohisto v1.0.0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
Expand All @@ -200,7 +200,7 @@ require (
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
Expand Down Expand Up @@ -257,37 +257,37 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector v0.130.1 // indirect
go.opentelemetry.io/collector/config/configcompression v1.36.1 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.130.1 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.130.1 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.130.1 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.130.1 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.130.1 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.130.1 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.130.1 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.130.1 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.130.1 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.36.1 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.130.1
go.opentelemetry.io/collector/extension/extensionmiddleware v0.130.1 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.130.1 // indirect
go.opentelemetry.io/collector/extension/xextension v0.130.1 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.130.1 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.130.1 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.130.1 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.130.1 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.130.1 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.130.1 // indirect
go.opentelemetry.io/collector/pdata/xpdata v0.130.1 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.130.1 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.130.1 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.130.1 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.130.1 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.130.1 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.130.1 // indirect
go.opentelemetry.io/collector/service v0.130.1 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.130.1 // indirect
go.opentelemetry.io/collector v0.131.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.37.0 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.131.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.131.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.131.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.131.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.131.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.131.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.131.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.131.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.131.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v1.37.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.131.0
go.opentelemetry.io/collector/extension/extensionmiddleware v0.131.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.131.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.131.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.131.0 // indirect
go.opentelemetry.io/collector/internal/memorylimiter v0.131.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.131.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.131.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.131.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.131.0 // indirect
go.opentelemetry.io/collector/pdata/xpdata v0.131.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.131.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.131.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.131.0 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.131.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.131.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.131.0 // indirect
go.opentelemetry.io/collector/service v0.131.0 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.131.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
go.opentelemetry.io/contrib/otelconf v0.17.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.37.0 // indirect
Expand Down
Loading
Loading
⚡