Skip to content

Commit e6a665a

Browse files
srv-gh-o11y-gdicrobert-1
srv-gh-o11y-gdi
and
crobert-1
authored
Update OpenTelemetry Dependencies to latest (signalfx#5973)
* Update OpenTelemetry Dependencies to latest * Update type for processor factory * make tidy * Add required argument to receivertest.NewNopSettings * Fix tests failures from open-telemetry/opentelemetry-collector#12381 * Fix tests failure from open-telemetry/opentelemetry-collector#12381 * Add required argument to receivertest.NewNopSettings * Add required argument to receivertest.NewNopSettings() * receivertest.NewNopSettingsWithType is deprecated: [v0.121.0] Use NewNopSettings(NopType) instead. --------- Co-authored-by: Curtis Robert <[email protected]>
1 parent fb352a9 commit e6a665a

File tree

31 files changed

+1139
-1113
lines changed

31 files changed

+1139
-1113
lines changed

‎go.mod

Lines changed: 264 additions & 260 deletions
Large diffs are not rendered by default.

‎go.sum

Lines changed: 559 additions & 546 deletions
Large diffs are not rendered by default.

‎internal/components/components.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ import (
126126
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
127127
"go.opentelemetry.io/collector/extension/zpagesextension"
128128
"go.opentelemetry.io/collector/otelcol"
129+
"go.opentelemetry.io/collector/processor"
129130
"go.opentelemetry.io/collector/processor/batchprocessor"
130131
"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
131132
"go.opentelemetry.io/collector/receiver/nopreceiver"
@@ -257,7 +258,7 @@ func Get() (otelcol.Factories, error) {
257258
errs = append(errs, err)
258259
}
259260

260-
processors, err := otelcol.MakeFactoryMap(
261+
processors, err := otelcol.MakeFactoryMap[processor.Factory](
261262
attributesprocessor.NewFactory(),
262263
batchprocessor.NewFactory(),
263264
cumulativetodeltaprocessor.NewFactory(),

‎internal/receiver/discoveryreceiver/factory_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func TestLogsReceiver(t *testing.T) {
4141
factory := NewFactory()
4242
cfg := factory.CreateDefaultConfig()
4343

44-
params := receivertest.NewNopSettings()
44+
params := receivertest.NewNopSettings(factory.Type())
4545
receiver, err := factory.CreateLogs(context.Background(), params, cfg, consumertest.NewNop())
4646
assert.NoError(t, err)
4747
assert.NotNil(t, receiver)
@@ -54,7 +54,7 @@ func TestMetricsReceiver(t *testing.T) {
5454
cfg := &Config{}
5555
require.Error(t, cfg.Validate())
5656

57-
params := receivertest.NewNopSettings()
57+
params := receivertest.NewNopSettings(factory.Type())
5858
receiver, err := factory.CreateMetrics(context.Background(), params, cfg, consumertest.NewNop())
5959
require.NoError(t, err)
6060
assert.NotNil(t, receiver)
@@ -68,7 +68,7 @@ func TestTracesReceiver(t *testing.T) {
6868
cfg := &Config{}
6969
require.Error(t, cfg.Validate())
7070

71-
params := receivertest.NewNopSettings()
71+
params := receivertest.NewNopSettings(factory.Type())
7272
receiver, err := factory.CreateTraces(context.Background(), params, cfg, consumertest.NewNop())
7373
require.Error(t, err)
7474
assert.EqualError(t, err, "telemetry type is not supported")

‎internal/receiver/lightprometheusreceiver/scraper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func TestScraper(t *testing.T) {
8787
cfg.ClientConfig.Endpoint = fmt.Sprintf("%s%s", promMock.URL, "/metrics")
8888
require.NoError(t, xconfmap.Validate(cfg))
8989

90-
scraper := newScraper(receivertest.NewNopSettingsWithType(receivertest.NopType), cfg)
90+
scraper := newScraper(receivertest.NewNopSettings(receivertest.NopType), cfg)
9191

9292
err := scraper.start(context.Background(), componenttest.NewNopHost())
9393
require.NoError(t, err)

‎internal/receiver/signalfxgatewayprometheusremotewritereceiver/factory_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestFactory(t *testing.T) {
4040
cfg.ListenPath = "/metrics"
4141

4242
nopHost := componenttest.NewNopHost()
43-
mockSettings := receivertest.NewNopSettings()
43+
mockSettings := receivertest.NewNopSettings(receivertest.NopType)
4444
mockConsumer := consumertest.NewNop()
4545
receiver, err := newReceiver(mockSettings, cfg, mockConsumer)
4646

‎internal/receiver/signalfxgatewayprometheusremotewritereceiver/generated_component_test.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/signalfx-agent/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ require (
8686
github.com/influxdata/telegraf v1.30.1
8787
github.com/microsoft/go-mssqldb v1.8.0
8888
github.com/smartystreets/goconvey v1.8.1
89-
go.opentelemetry.io/collector/pdata v1.26.0
89+
go.opentelemetry.io/collector/pdata v1.27.0
9090
)
9191

9292
require (
@@ -175,7 +175,7 @@ require (
175175
github.com/json-iterator/go v1.1.12 // indirect
176176
github.com/jtolds/gls v4.20.0+incompatible // indirect
177177
github.com/karrick/godirwalk v1.17.0 // indirect
178-
github.com/klauspost/compress v1.17.11 // indirect
178+
github.com/klauspost/compress v1.18.0 // indirect
179179
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
180180
github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
181181
github.com/miekg/dns v1.1.61 // indirect
@@ -200,7 +200,7 @@ require (
200200
github.com/signalfx/sapm-proto v0.12.0 // indirect
201201
github.com/smarty/assertions v1.15.0 // indirect
202202
github.com/smartystreets/assertions v1.13.1 // indirect
203-
github.com/spf13/pflag v1.0.5 // indirect
203+
github.com/spf13/pflag v1.0.6 // indirect
204204
github.com/stretchr/objx v0.5.2 // indirect
205205
github.com/tidwall/gjson v1.14.2 // indirect
206206
github.com/tidwall/match v1.1.1 // indirect

‎internal/signalfx-agent/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,8 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
356356
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
357357
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
358358
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
359-
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
360-
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
359+
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
360+
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
361361
github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
362362
github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
363363
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -519,8 +519,8 @@ github.com/snowflakedb/gosnowflake v1.12.0 h1:Saez8egtn5xAoVMBxFaMu9MYfAG9SS9dpA
519519
github.com/snowflakedb/gosnowflake v1.12.0/go.mod h1:wHfYmZi3zvtWItojesAhWWXBN7+niex2R1h/S7QCZYg=
520520
github.com/soniah/gosnmp v0.0.0-20190220004421-68e8beac0db9 h1:O4jq14rgUwG9Ssn0wZiRPl8Ya6q3a1h3xJzTAsBaRgo=
521521
github.com/soniah/gosnmp v0.0.0-20190220004421-68e8beac0db9/go.mod h1:DuEpAS0az51+DyVBQwITDsoq4++e3LTNckp2GoasF2I=
522-
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
523-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
522+
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
523+
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
524524
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
525525
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
526526
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -572,8 +572,8 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD
572572
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
573573
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
574574
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
575-
go.opentelemetry.io/collector/pdata v1.26.0 h1:o7nP0RTQOG0LXk55ZZjLrxwjX8x3wHF7Z7xPeOaskEA=
576-
go.opentelemetry.io/collector/pdata v1.26.0/go.mod h1:18e8/xDZsqyj00h/5HM5GLdJgBzzG9Ei8g9SpNoiMtI=
575+
go.opentelemetry.io/collector/pdata v1.27.0 h1:66yI7FYkUDia74h48Fd2/KG2Vk8DxZnGw54wRXykCEU=
576+
go.opentelemetry.io/collector/pdata v1.27.0/go.mod h1:18e8/xDZsqyj00h/5HM5GLdJgBzzG9Ei8g9SpNoiMtI=
577577
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
578578
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
579579
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=

‎internal/tools/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/ory/go-acc v0.2.8
1111
github.com/pavius/impi v0.0.3
1212
github.com/tcnksm/ghr v0.16.2
13-
go.opentelemetry.io/collector/cmd/mdatagen v0.120.0
13+
go.opentelemetry.io/collector/cmd/mdatagen v0.121.0
1414
golang.org/x/tools v0.31.0
1515
golang.org/x/vuln v1.1.3
1616
)
@@ -85,7 +85,7 @@ require (
8585
github.com/golangci/plugin-module-register v0.1.1 // indirect
8686
github.com/golangci/revgrep v0.5.3 // indirect
8787
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
88-
github.com/google/go-cmp v0.6.0 // indirect
88+
github.com/google/go-cmp v0.7.0 // indirect
8989
github.com/google/go-github v17.0.0+incompatible // indirect
9090
github.com/google/go-github/v47 v47.1.0 // indirect
9191
github.com/google/go-querystring v1.1.0 // indirect
@@ -173,9 +173,9 @@ require (
173173
github.com/sourcegraph/go-diff v0.7.0 // indirect
174174
github.com/spf13/afero v1.11.0 // indirect
175175
github.com/spf13/cast v1.5.0 // indirect
176-
github.com/spf13/cobra v1.8.1 // indirect
176+
github.com/spf13/cobra v1.9.1 // indirect
177177
github.com/spf13/jwalterweatherman v1.1.0 // indirect
178-
github.com/spf13/pflag v1.0.5 // indirect
178+
github.com/spf13/pflag v1.0.6 // indirect
179179
github.com/spf13/viper v1.12.0 // indirect
180180
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
181181
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
@@ -201,11 +201,11 @@ require (
201201
gitlab.com/bosi/decorder v0.4.2 // indirect
202202
go-simpler.org/musttag v0.13.0 // indirect
203203
go-simpler.org/sloglint v0.7.2 // indirect
204-
go.opentelemetry.io/collector/component v0.120.0 // indirect
205-
go.opentelemetry.io/collector/confmap v1.26.0 // indirect
206-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.26.0 // indirect
207-
go.opentelemetry.io/collector/filter v0.120.0 // indirect
208-
go.opentelemetry.io/collector/pdata v1.26.0 // indirect
204+
go.opentelemetry.io/collector/component v1.27.0 // indirect
205+
go.opentelemetry.io/collector/confmap v1.27.0 // indirect
206+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.27.0 // indirect
207+
go.opentelemetry.io/collector/filter v0.121.0 // indirect
208+
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
209209
go.opentelemetry.io/otel v1.34.0 // indirect
210210
go.opentelemetry.io/otel/metric v1.34.0 // indirect
211211
go.opentelemetry.io/otel/trace v1.34.0 // indirect

0 commit comments

Comments
 (0)