Skip to content

Commit 0eeb554

Browse files
srv-gh-o11y-gdidmitryax
srv-gh-o11y-gdi
and
dmitryax
authored
Update OpenTelemetry Dependencies to latest (#6078)
* Update OpenTelemetry Dependencies to latest * Update TestInvalidEnvVarProperties test * Don't use disabled service::telemetry::metrics::address filed in tests * fix tests --------- Co-authored-by: Dmitry Anoshin <[email protected]>
1 parent af0c4ff commit 0eeb554

File tree

31 files changed

+1186
-1132
lines changed

31 files changed

+1186
-1132
lines changed

‎cmd/otelcol/fips/config/gateway_config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ exporters:
137137
log_data_enabled: false
138138

139139
service:
140-
telemetry:
141-
metrics:
142-
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
143140
extensions: [headers_setter, health_check, http_forwarder, zpages]
144141
pipelines:
145142
traces:

‎examples/redis/otel-collector-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ exporters:
2323
debug:
2424
verbosity: detailed
2525
service:
26-
telemetry:
27-
metrics:
28-
address: ":8888"
2926
pipelines:
3027
metrics/sfx:
3128
receivers: [redis]

‎go.mod

Lines changed: 248 additions & 243 deletions
Large diffs are not rendered by default.

‎go.sum

Lines changed: 542 additions & 515 deletions
Large diffs are not rendered by default.

‎internal/configconverter/testdata/without_memory_ballast_config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,4 @@ extensions:
1414

1515

1616
service:
17-
telemetry:
18-
metrics:
19-
address: "${SPLUNK_LISTEN_INTERFACE}:8888"
2017
extensions: [health_check, http_forwarder, zpages, smartagent]

‎internal/confmapprovider/discovery/properties/env_var_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func TestInvalidEnvVarProperties(t *testing.T) {
123123
}{
124124
{envVar: "SPLUNK_DISCOVERY_NOTVALIDCOMPONENT_TYPE_CONFIG_ONE", expectedError: "invalid env var property (parsing error): invalid property env var (parsing error): SPLUNK_DISCOVERY:1:18: unexpected token \"NOTVALIDCOMPONENT\" (expected (\"RECEIVERS\" | \"EXTENSIONS\") <underscore> EnvVarComponentID <underscore> (\"CONFIG\" | \"ENABLED\") (<underscore> (<string> | <underscore>)+)*)"},
125125
{envVar: "SPLUNK_DISCOVERY_RECEIVERS_TYPE_NOTCONFIG_ONE", expectedError: "invalid env var property (parsing error): invalid property env var (parsing error): SPLUNK_DISCOVERY:1:46: unexpected token \"<EOF>\" (expected <underscore> (\"CONFIG\" | \"ENABLED\") (<underscore> (<string> | <underscore>)+)*)"},
126-
{envVar: "SPLUNK_DISCOVERY_EXTENSIONS_TYPE_x2f_NAME_CONFIG_", expectedError: "invalid env var property (parsing error): invalid property env var (parsing error): SPLUNK_DISCOVERY:1:50: sub-expression (<string> | <underscore>)+ must match at least once"},
126+
{envVar: "SPLUNK_DISCOVERY_EXTENSIONS_TYPE_x2f_NAME_CONFIG_", expectedError: "invalid env var property (parsing error): invalid property env var (parsing error): SPLUNK_DISCOVERY:1:50: unexpected token \"<EOF>\" (expected (<string> | <underscore>)+)"},
127127
} {
128128
t.Run(tt.envVar, func(t *testing.T) {
129129
p, ok, err := NewPropertyFromEnvVar(tt.envVar, "val")

‎internal/receiver/signalfxgatewayprometheusremotewritereceiver/internal/testdata/otel-collector-config.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ exporters:
1313
debug:
1414
verbosity: detailed
1515
service:
16-
telemetry:
17-
metrics:
18-
address: ":8888"
1916
pipelines:
2017
metrics/logging:
2118
receivers: [signalfxgatewayprometheusremotewrite]

‎internal/signalfx-agent/go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ require (
8585
github.com/influxdata/telegraf v1.30.1
8686
github.com/microsoft/go-mssqldb v1.8.0
8787
github.com/smartystreets/goconvey v1.8.1
88-
go.opentelemetry.io/collector/pdata v1.28.1
88+
go.opentelemetry.io/collector/pdata v1.29.0
8989
)
9090

9191
require (
@@ -225,9 +225,10 @@ require (
225225
golang.org/x/text v0.23.0 // indirect
226226
golang.org/x/time v0.9.0 // indirect
227227
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
228+
gonum.org/v1/gonum v0.16.0 // indirect
228229
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a // indirect
229230
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
230-
google.golang.org/protobuf v1.36.5 // indirect
231+
google.golang.org/protobuf v1.36.6 // indirect
231232
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
232233
gopkg.in/fsnotify.v1 v1.4.7 // indirect
233234
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect

‎internal/signalfx-agent/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,8 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD
581581
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
582582
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
583583
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
584-
go.opentelemetry.io/collector/pdata v1.28.1 h1:ORl5WLpQJvjzBVpHu12lqKMdcf/qDBwRXMcUubhybiQ=
585-
go.opentelemetry.io/collector/pdata v1.28.1/go.mod h1:asKE8MD/4SOKz1mCrGdAz4VO2U2HUNg8A6094uK7pq0=
584+
go.opentelemetry.io/collector/pdata v1.29.0 h1:ZXSZ2fROdAEbv4JKKiCspBpjIjYZ5XaNt71LNH4RpQw=
585+
go.opentelemetry.io/collector/pdata v1.29.0/go.mod h1:9kb3zMtLFXBPA6WGWkBHbkFwlwwYL/OHk1m0ASWZpeY=
586586
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU=
587587
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ=
588588
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
@@ -750,8 +750,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
750750
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
751751
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da h1:noIWHXmPHxILtqtCOPIhSt0ABwskkZKjD3bXGnZGpNY=
752752
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
753-
gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0=
754-
gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o=
753+
gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
754+
gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
755755
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
756756
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
757757
google.golang.org/genproto/googleapis/api v0.0.0-20250218202821-56aae31c358a h1:nwKuGPlUAt+aR+pcrkfFRrTU1BVrSmYyYMxYbUIVHr0=
@@ -767,8 +767,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
767767
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
768768
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
769769
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
770-
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
771-
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
770+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
771+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
772772
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
773773
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
774774
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎internal/tools/go.mod

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/jstemmer/go-junit-report v1.0.0
1010
github.com/pavius/impi v0.0.3
1111
github.com/tcnksm/ghr v0.16.2
12-
go.opentelemetry.io/collector/cmd/mdatagen v0.122.1
12+
go.opentelemetry.io/collector/cmd/mdatagen v0.123.0
1313
golang.org/x/tools v0.31.0
1414
golang.org/x/vuln v1.1.4
1515
)
@@ -63,6 +63,8 @@ require (
6363
github.com/fzipp/gocyclo v0.6.0 // indirect
6464
github.com/ghostiam/protogetter v0.3.9 // indirect
6565
github.com/go-critic/go-critic v0.12.0 // indirect
66+
github.com/go-logr/logr v1.4.2 // indirect
67+
github.com/go-logr/stdr v1.2.2 // indirect
6668
github.com/go-toolsmith/astcast v1.1.0 // indirect
6769
github.com/go-toolsmith/astcopy v1.1.0 // indirect
6870
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -86,6 +88,7 @@ require (
8688
github.com/google/go-github v17.0.0+incompatible // indirect
8789
github.com/google/go-github/v47 v47.1.0 // indirect
8890
github.com/google/go-querystring v1.1.0 // indirect
91+
github.com/google/uuid v1.6.0 // indirect
8992
github.com/gordonklaus/ineffassign v0.1.0 // indirect
9093
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
9194
github.com/gostaticanalysis/comment v1.5.0 // indirect
@@ -198,14 +201,19 @@ require (
198201
gitlab.com/bosi/decorder v0.4.2 // indirect
199202
go-simpler.org/musttag v0.13.0 // indirect
200203
go-simpler.org/sloglint v0.9.0 // indirect
201-
go.opentelemetry.io/collector/component v1.28.1 // indirect
202-
go.opentelemetry.io/collector/confmap v1.28.1 // indirect
203-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.28.1 // indirect
204-
go.opentelemetry.io/collector/featuregate v1.28.1 // indirect
205-
go.opentelemetry.io/collector/filter v0.122.1 // indirect
206-
go.opentelemetry.io/collector/pdata v1.28.1 // indirect
204+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
205+
go.opentelemetry.io/collector/component v1.29.0 // indirect
206+
go.opentelemetry.io/collector/confmap v1.29.0 // indirect
207+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.29.0 // indirect
208+
go.opentelemetry.io/collector/featuregate v1.29.0 // indirect
209+
go.opentelemetry.io/collector/filter v0.123.0 // indirect
210+
go.opentelemetry.io/collector/internal/telemetry v0.123.0 // indirect
211+
go.opentelemetry.io/collector/pdata v1.29.0 // indirect
212+
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
207213
go.opentelemetry.io/otel v1.35.0 // indirect
214+
go.opentelemetry.io/otel/log v0.11.0 // indirect
208215
go.opentelemetry.io/otel/metric v1.35.0 // indirect
216+
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
209217
go.opentelemetry.io/otel/trace v1.35.0 // indirect
210218
go.uber.org/automaxprocs v1.6.0 // indirect
211219
go.uber.org/multierr v1.11.0 // indirect
@@ -221,7 +229,7 @@ require (
221229
golang.org/x/text v0.23.0 // indirect
222230
google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
223231
google.golang.org/grpc v1.71.0 // indirect
224-
google.golang.org/protobuf v1.36.5 // indirect
232+
google.golang.org/protobuf v1.36.6 // indirect
225233
gopkg.in/ini.v1 v1.67.0 // indirect
226234
gopkg.in/yaml.v2 v2.4.0 // indirect
227235
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)