Skip to content

Commit c3bf242

Browse files
jvoravongjvoravong
authored
Backport fix to ensure the bug does not affect splunk-otel-collector v0.127.0 (#6314)
* Backported open-telemetry/opentelemetry-collector#13117 fix from https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.128.0 to ensure the bug does not affect splunk-otel-collector v0.127.0. * Remove replace statement in go.mod * update all go.mod files with the fix -> go.opentelemetry.io/collector/confmap v1.34.0 go.opentelemetry.io/collector/confmap/provider/envprovider v1.34.0 go.opentelemetry.io/collector/confmap/provider/fileprovider v1.34.0 go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.34.0 go.opentelemetry.io/collector/confmap/xconfmap v0.128.0 * patch update tests
1 parent 51af2e7 commit c3bf242

File tree

16 files changed

+56
-57
lines changed

16 files changed

+56
-57
lines changed

‎CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ and the [opentelemetry-collector-contrib v0.127.0](https://github.com/open-telem
7676

7777
### 🧰 Bug fixes 🧰
7878

79+
- (Core) `confmap`: Do not panic on assigning nil maps to non-nil maps ([#13117](https://github.com/open-telemetry/opentelemetry-collector/pull/13117))
80+
- This fix was backported from [opentelemetry-collector v0.128.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.128.0) to ensure the bug does not affect splunk-otel-collector v0.127.0.
7981
- (Contrib) `azuremonitorreceiver`: Use ``metrics`` aggregation filter when ``use_batch_api: true`` ([#40079](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/40079))
8082
- (Contrib) `postgresqlreceiver`: Fix too many top query got reported. Top query should only report those queries were executed during the query interval ([#39942](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/39942))
8183
- (Contrib) `filelogreceiver`: Introduce `utf8-raw` encoding to avoid replacing invalid bytes with \uFFFD when reading UTF-8 input. ([#39653](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/39653))

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ require (
137137
go.opentelemetry.io/collector/component/componenttest v0.127.0
138138
go.opentelemetry.io/collector/config/confighttp v0.127.0
139139
go.opentelemetry.io/collector/config/configopaque v1.33.0
140-
go.opentelemetry.io/collector/confmap v1.33.0
141-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.33.0
142-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0
143-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.33.0
144-
go.opentelemetry.io/collector/confmap/xconfmap v0.127.0
140+
go.opentelemetry.io/collector/confmap v1.34.0
141+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.34.0
142+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.34.0
143+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.34.0
144+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0
145145
go.opentelemetry.io/collector/connector/forwardconnector v0.127.0
146146
go.opentelemetry.io/collector/consumer/consumertest v0.127.0
147147
go.opentelemetry.io/collector/exporter/debugexporter v0.127.0
@@ -707,7 +707,7 @@ require (
707707
go.opencensus.io v0.24.0
708708
go.opentelemetry.io/collector/component v1.33.0
709709
go.opentelemetry.io/collector/consumer v1.33.0
710-
go.opentelemetry.io/collector/featuregate v1.33.0
710+
go.opentelemetry.io/collector/featuregate v1.34.0
711711
go.opentelemetry.io/collector/semconv v0.127.0 // indirect
712712
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
713713
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect

‎go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,18 +1977,18 @@ go.opentelemetry.io/collector/config/configtelemetry v0.127.0 h1:m4HKEbxcxclMiJJ
19771977
go.opentelemetry.io/collector/config/configtelemetry v0.127.0/go.mod h1:WXmlNatI0vwjv7whh/qF1Xy+UufCZDk7VLtYqML7QmA=
19781978
go.opentelemetry.io/collector/config/configtls v1.33.0 h1:4pGT0nFM24KCtyyq8ng7VWW9fVN1VLQMlkNrMhiWRhU=
19791979
go.opentelemetry.io/collector/config/configtls v1.33.0/go.mod h1:50tvOLlI6iedkrQ9/HMO1KWxzzx0Nu28MgSRXxTwSkY=
1980-
go.opentelemetry.io/collector/confmap v1.33.0 h1:dCLSrONMssTWhnbELZZpJoWMn+P+DVJc8r10JJCeS/4=
1981-
go.opentelemetry.io/collector/confmap v1.33.0/go.mod h1:fq5ccP4lzF3IVK/Cs0kWsiH0dynejXkMc8gaNwvkvtk=
1982-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.33.0 h1:A61tuCM6vlBH6Pk1YoJnkOeFUwUnH/vZMQHTKqEL3eo=
1983-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.33.0/go.mod h1:nbNjPiB6XBrGo4L+IR3W2NjK3AS1eK84yY1g2iDWgto=
1984-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0 h1:T7rVBmAKgLDLXYKQbCrgw15eD9sAhHqvnSGxYv735ew=
1985-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0/go.mod h1:JlAC1QMaaPiPx7x8hQYRcxxf2GiOeHYaM8uEIri1dPg=
1980+
go.opentelemetry.io/collector/confmap v1.34.0 h1:PG4sYlLxgCMnA5F7daKXZV+NKjU1IzXBzVQeyvcwyh0=
1981+
go.opentelemetry.io/collector/confmap v1.34.0/go.mod h1:BbAit8+hAJg5vyFBQoDh9vOXOH8UzCdNu91jCh+b72E=
1982+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.34.0 h1:MgqA+HESK5//GCMFl9MLf49zo27S4ydfy88tpiZEG5E=
1983+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.34.0/go.mod h1:LH2tS6MH5ulG9syCBN42qvejeXljz2DLEjLDmA3am4g=
1984+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.34.0 h1:WyKwbPQAq2aHdv0f27MiUhq+AOSDP9MgkLOF6Q+n2lE=
1985+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.34.0/go.mod h1:8VwdaWn9Bl6hJY1/LZS6CrfZIM6pfH0rw5Xkm4davxM=
19861986
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.33.0 h1:4Ut8IiBf+4BvlmwCw5HLduWaQH2jwKF30M/NeXzt64w=
19871987
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.33.0/go.mod h1:lL5ooXkstIKKhVTnUlGE61IzspudCQxwGZMfrsHfhT0=
1988-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.33.0 h1:M14VV2/mSU9TMnxfZeHi/fVgzPMv0caPPDNgFXoN8SU=
1989-
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.33.0/go.mod h1:8yugd3piWlNFCssSTlSdc9KAWGGah+dJ86Yr2wdFg9I=
1990-
go.opentelemetry.io/collector/confmap/xconfmap v0.127.0 h1:isSNkBXltLxUWstxJyHcJ3qVo9qp9GABCVhzIvZgIdM=
1991-
go.opentelemetry.io/collector/confmap/xconfmap v0.127.0/go.mod h1:K9GaSgmMYxM1/QlAVNIj2fX9LekInm9dwFnIeF1HCgs=
1988+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.34.0 h1:gNjSs0Y1W/aGF7Q9kY0nXB+caQr6ezAWWSWuLpermj8=
1989+
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.34.0/go.mod h1:9GdVUQ63VxkkDhFIw+xT3jeGjnT0qDZkQKigD/iQJO4=
1990+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0 h1:hcVKU45pjC+PLz7xUc8kwSlR5wsN2w8hs9midZ3ez10=
1991+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0/go.mod h1:2928x4NAAu1CysfzLbEJE6MSSDB/gOYVq6YRGWY9LmM=
19921992
go.opentelemetry.io/collector/connector v0.127.0 h1:oH1qfmZK5Ma6ytbXcInFHySSv3M34rBTCS+DbXzZK/4=
19931993
go.opentelemetry.io/collector/connector v0.127.0/go.mod h1:KYOVGKGj23WL4+y5bHvbPc7VSPRm8BpwzKdx6YOzb98=
19941994
go.opentelemetry.io/collector/connector/connectortest v0.127.0 h1:bTJCvSWj4TywQ4i9AAF3PFMcAuE7oUtYBXyzl6ng7Yo=
@@ -2041,8 +2041,8 @@ go.opentelemetry.io/collector/extension/xextension v0.127.0 h1:JT2lXY+MGiXuU6AoB
20412041
go.opentelemetry.io/collector/extension/xextension v0.127.0/go.mod h1:IFx3P/zH8Gey2XP70eb5q4OZHBWMtizg5Gr71eXBndA=
20422042
go.opentelemetry.io/collector/extension/zpagesextension v0.127.0 h1:iwxxrUh/5B858EAKqYDxjfiiINtioyFhty/0apHDV5A=
20432043
go.opentelemetry.io/collector/extension/zpagesextension v0.127.0/go.mod h1:w6wwIJ1f+yM28kphp7leqeho2lpVr8Sb5qt6Cwwpzk4=
2044-
go.opentelemetry.io/collector/featuregate v1.33.0 h1:ronhxafsUE7H3Cem4U2PXrvDZhxA9Gixx4Wik7X32X8=
2045-
go.opentelemetry.io/collector/featuregate v1.33.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
2044+
go.opentelemetry.io/collector/featuregate v1.34.0 h1:zqDHpEYy1UeudrfUCvlcJL2t13dXywrC6lwpNZ5DrCU=
2045+
go.opentelemetry.io/collector/featuregate v1.34.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
20462046
go.opentelemetry.io/collector/filter v0.127.0 h1:scb/26S/P6RuJpPMNwahZl9/dCxJcY7uLdx4oFn1sE8=
20472047
go.opentelemetry.io/collector/filter v0.127.0/go.mod h1:DwUuZqNcM5BLDknP32+qsRpObquvHslxm98X1eyTkW4=
20482048
go.opentelemetry.io/collector/internal/fanoutconsumer v0.127.0 h1:LXLYLmPuf7ZwygcQmzFJzbc66CGC+CrFSxEjKH/ZOQ8=

‎internal/tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ require (
201201
go-simpler.org/sloglint v0.9.0 // indirect
202202
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
203203
go.opentelemetry.io/collector/component v1.33.0 // indirect
204-
go.opentelemetry.io/collector/confmap v1.33.0 // indirect
204+
go.opentelemetry.io/collector/confmap v1.34.0 // indirect
205205
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0 // indirect
206-
go.opentelemetry.io/collector/featuregate v1.33.0 // indirect
206+
go.opentelemetry.io/collector/featuregate v1.34.0 // indirect
207207
go.opentelemetry.io/collector/filter v0.127.0 // indirect
208208
go.opentelemetry.io/collector/internal/telemetry v0.127.0 // indirect
209209
go.opentelemetry.io/collector/pdata v1.33.0 // indirect

‎internal/tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -677,12 +677,12 @@ go.opentelemetry.io/collector/cmd/mdatagen v0.127.0 h1:E3qetjHe4KLBtVjmIZkk7yGjk
677677
go.opentelemetry.io/collector/cmd/mdatagen v0.127.0/go.mod h1:l50vnC+IRWJ3ZovYr6xoqtr7MjpuKMliWd+DUORk9P0=
678678
go.opentelemetry.io/collector/component v1.33.0 h1:AoP5ZGEU7Q3YDYQx2CgYy82Xmy3gLgh1WCMeLtTXXFo=
679679
go.opentelemetry.io/collector/component v1.33.0/go.mod h1:/5v3hl1GSQT45D6T7sE/LB6nlQMMRHCYDX1glJamh7E=
680-
go.opentelemetry.io/collector/confmap v1.33.0 h1:dCLSrONMssTWhnbELZZpJoWMn+P+DVJc8r10JJCeS/4=
681-
go.opentelemetry.io/collector/confmap v1.33.0/go.mod h1:fq5ccP4lzF3IVK/Cs0kWsiH0dynejXkMc8gaNwvkvtk=
680+
go.opentelemetry.io/collector/confmap v1.34.0 h1:PG4sYlLxgCMnA5F7daKXZV+NKjU1IzXBzVQeyvcwyh0=
681+
go.opentelemetry.io/collector/confmap v1.34.0/go.mod h1:BbAit8+hAJg5vyFBQoDh9vOXOH8UzCdNu91jCh+b72E=
682682
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0 h1:T7rVBmAKgLDLXYKQbCrgw15eD9sAhHqvnSGxYv735ew=
683683
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0/go.mod h1:JlAC1QMaaPiPx7x8hQYRcxxf2GiOeHYaM8uEIri1dPg=
684-
go.opentelemetry.io/collector/featuregate v1.33.0 h1:ronhxafsUE7H3Cem4U2PXrvDZhxA9Gixx4Wik7X32X8=
685-
go.opentelemetry.io/collector/featuregate v1.33.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
684+
go.opentelemetry.io/collector/featuregate v1.34.0 h1:zqDHpEYy1UeudrfUCvlcJL2t13dXywrC6lwpNZ5DrCU=
685+
go.opentelemetry.io/collector/featuregate v1.34.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
686686
go.opentelemetry.io/collector/filter v0.127.0 h1:scb/26S/P6RuJpPMNwahZl9/dCxJcY7uLdx4oFn1sE8=
687687
go.opentelemetry.io/collector/filter v0.127.0/go.mod h1:DwUuZqNcM5BLDknP32+qsRpObquvHslxm98X1eyTkW4=
688688
go.opentelemetry.io/collector/internal/telemetry v0.127.0 h1:/wAnPmFjUN7MwnRyDYJzUJZa5n0qK9zM1F7PgMWM5Y0=

‎pkg/extension/smartagentextension/config_linux_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestBundleDirDefault(t *testing.T) {
3636
defaultSettingsID := component.MustNewIDWithName("smartagent", "default_settings")
3737
cm, err := cfg.Sub(defaultSettingsID.String())
3838
require.NoError(t, err)
39-
emptyConfig := createDefaultConfig().(*Config)
39+
emptyConfig := createDefaultConfig()
4040
err = cm.Unmarshal(&emptyConfig)
4141
require.NoError(t, err)
4242
require.NotNil(t, emptyConfig)

‎pkg/extension/smartagentextension/config_windows_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestBundleDirDefault(t *testing.T) {
3636
defaultSettingsID := component.MustNewIDWithName("smartagent", "default_settings")
3737
cm, err := cfg.Sub(defaultSettingsID.String())
3838
require.NoError(t, err)
39-
emptyConfig := NewFactory().CreateDefaultConfig().(*Config)
39+
emptyConfig := createDefaultConfig()
4040
err = cm.Unmarshal(&emptyConfig)
4141
require.NoError(t, err)
4242

‎pkg/extension/smartagentextension/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/stretchr/testify v1.10.0
99
go.opentelemetry.io/collector/component v1.33.0
1010
go.opentelemetry.io/collector/component/componenttest v0.127.0
11-
go.opentelemetry.io/collector/confmap v1.33.0
11+
go.opentelemetry.io/collector/confmap v1.34.0
1212
go.opentelemetry.io/collector/extension v1.33.0
1313
gopkg.in/yaml.v2 v2.4.0
1414
)
@@ -40,7 +40,7 @@ require (
4040
github.com/signalfx/golib/v3 v3.3.54 // indirect
4141
github.com/sirupsen/logrus v1.9.3 // indirect
4242
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
43-
go.opentelemetry.io/collector/featuregate v1.33.0 // indirect
43+
go.opentelemetry.io/collector/featuregate v1.34.0 // indirect
4444
go.opentelemetry.io/collector/internal/telemetry v0.127.0 // indirect
4545
go.opentelemetry.io/collector/pdata v1.33.0 // indirect
4646
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect

‎pkg/extension/smartagentextension/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ go.opentelemetry.io/collector/component v1.33.0 h1:AoP5ZGEU7Q3YDYQx2CgYy82Xmy3gL
300300
go.opentelemetry.io/collector/component v1.33.0/go.mod h1:/5v3hl1GSQT45D6T7sE/LB6nlQMMRHCYDX1glJamh7E=
301301
go.opentelemetry.io/collector/component/componenttest v0.127.0 h1:2cieQeh5OS1zf73Aad4b8Rf5vCDk5Hlb6oeJH7Q1VYs=
302302
go.opentelemetry.io/collector/component/componenttest v0.127.0/go.mod h1:0jHbHYRXSNS+nm2vSsxpdAsIj+EDehxKRGk4oclyHKs=
303-
go.opentelemetry.io/collector/confmap v1.33.0 h1:dCLSrONMssTWhnbELZZpJoWMn+P+DVJc8r10JJCeS/4=
304-
go.opentelemetry.io/collector/confmap v1.33.0/go.mod h1:fq5ccP4lzF3IVK/Cs0kWsiH0dynejXkMc8gaNwvkvtk=
303+
go.opentelemetry.io/collector/confmap v1.34.0 h1:PG4sYlLxgCMnA5F7daKXZV+NKjU1IzXBzVQeyvcwyh0=
304+
go.opentelemetry.io/collector/confmap v1.34.0/go.mod h1:BbAit8+hAJg5vyFBQoDh9vOXOH8UzCdNu91jCh+b72E=
305305
go.opentelemetry.io/collector/extension v1.33.0 h1:QXNOwcvKi9iwai83ielK8B8fCOH9wNO9K98IY0ftotM=
306306
go.opentelemetry.io/collector/extension v1.33.0/go.mod h1:EVsoOULEODW5vzHE76ltl7BjOdaYnDw5/EmAFFFAmBg=
307-
go.opentelemetry.io/collector/featuregate v1.33.0 h1:ronhxafsUE7H3Cem4U2PXrvDZhxA9Gixx4Wik7X32X8=
308-
go.opentelemetry.io/collector/featuregate v1.33.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
307+
go.opentelemetry.io/collector/featuregate v1.34.0 h1:zqDHpEYy1UeudrfUCvlcJL2t13dXywrC6lwpNZ5DrCU=
308+
go.opentelemetry.io/collector/featuregate v1.34.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
309309
go.opentelemetry.io/collector/internal/telemetry v0.127.0 h1:/wAnPmFjUN7MwnRyDYJzUJZa5n0qK9zM1F7PgMWM5Y0=
310310
go.opentelemetry.io/collector/internal/telemetry v0.127.0/go.mod h1:Un7Zn//l0BkE6hk6wirsTGwnJJpxw/gJWgzYL3eSruk=
311311
go.opentelemetry.io/collector/pdata v1.33.0 h1:PuqiZzdCoBJo9NmMzuYfzazpeFZyLmbDVcRrvb497lg=

‎pkg/processor/timestampprocessor/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.23.10
55
require (
66
github.com/stretchr/testify v1.10.0
77
go.opentelemetry.io/collector/component v1.33.0
8-
go.opentelemetry.io/collector/confmap v1.33.0
8+
go.opentelemetry.io/collector/confmap v1.34.0
99
go.opentelemetry.io/collector/consumer v1.33.0
1010
go.opentelemetry.io/collector/pdata v1.33.0
1111
go.opentelemetry.io/collector/processor v1.33.0
@@ -31,7 +31,7 @@ require (
3131
github.com/modern-go/reflect2 v1.0.2 // indirect
3232
github.com/pmezard/go-difflib v1.0.0 // indirect
3333
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
34-
go.opentelemetry.io/collector/featuregate v1.33.0 // indirect
34+
go.opentelemetry.io/collector/featuregate v1.34.0 // indirect
3535
go.opentelemetry.io/collector/internal/telemetry v0.127.0 // indirect
3636
go.opentelemetry.io/collector/pipeline v0.127.0 // indirect
3737
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect

‎pkg/processor/timestampprocessor/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,16 +268,16 @@ go.opentelemetry.io/collector/component/componentstatus v0.127.0 h1:3oZU2b7Giyc+
268268
go.opentelemetry.io/collector/component/componentstatus v0.127.0/go.mod h1:9afwixYMvsb1xvmxxg33XzMU7ZTe4pBitkugj5DDZdQ=
269269
go.opentelemetry.io/collector/component/componenttest v0.127.0 h1:2cieQeh5OS1zf73Aad4b8Rf5vCDk5Hlb6oeJH7Q1VYs=
270270
go.opentelemetry.io/collector/component/componenttest v0.127.0/go.mod h1:0jHbHYRXSNS+nm2vSsxpdAsIj+EDehxKRGk4oclyHKs=
271-
go.opentelemetry.io/collector/confmap v1.33.0 h1:dCLSrONMssTWhnbELZZpJoWMn+P+DVJc8r10JJCeS/4=
272-
go.opentelemetry.io/collector/confmap v1.33.0/go.mod h1:fq5ccP4lzF3IVK/Cs0kWsiH0dynejXkMc8gaNwvkvtk=
271+
go.opentelemetry.io/collector/confmap v1.34.0 h1:PG4sYlLxgCMnA5F7daKXZV+NKjU1IzXBzVQeyvcwyh0=
272+
go.opentelemetry.io/collector/confmap v1.34.0/go.mod h1:BbAit8+hAJg5vyFBQoDh9vOXOH8UzCdNu91jCh+b72E=
273273
go.opentelemetry.io/collector/consumer v1.33.0 h1:y6ohYtFsXHdD3eJ67SRHSgumRQRNlR6N+DuyjOq3hYo=
274274
go.opentelemetry.io/collector/consumer v1.33.0/go.mod h1:WwB/nHWw6KwumVy7OayUmvRa7V3UsfK+f8qwW8/c5rY=
275275
go.opentelemetry.io/collector/consumer/consumertest v0.127.0 h1:rtp7ilS1P1xVfmZu0XnWohhi1N2d+wtWo9ORo8A1Xb8=
276276
go.opentelemetry.io/collector/consumer/consumertest v0.127.0/go.mod h1:SFn8ifdrKulaQWDIvQskmEjSNdMZMQ5upQYJXLFEvzg=
277277
go.opentelemetry.io/collector/consumer/xconsumer v0.127.0 h1:23qpVECDiqad44d9HtQ1M4P4g2xbB4A7R1b9yux2Gag=
278278
go.opentelemetry.io/collector/consumer/xconsumer v0.127.0/go.mod h1:vZ06tk8nu2OyeizjN6AtlaftY79WuODi2rC3U7lxsb4=
279-
go.opentelemetry.io/collector/featuregate v1.33.0 h1:ronhxafsUE7H3Cem4U2PXrvDZhxA9Gixx4Wik7X32X8=
280-
go.opentelemetry.io/collector/featuregate v1.33.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
279+
go.opentelemetry.io/collector/featuregate v1.34.0 h1:zqDHpEYy1UeudrfUCvlcJL2t13dXywrC6lwpNZ5DrCU=
280+
go.opentelemetry.io/collector/featuregate v1.34.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
281281
go.opentelemetry.io/collector/internal/telemetry v0.127.0 h1:/wAnPmFjUN7MwnRyDYJzUJZa5n0qK9zM1F7PgMWM5Y0=
282282
go.opentelemetry.io/collector/internal/telemetry v0.127.0/go.mod h1:Un7Zn//l0BkE6hk6wirsTGwnJJpxw/gJWgzYL3eSruk=
283283
go.opentelemetry.io/collector/pdata v1.33.0 h1:PuqiZzdCoBJo9NmMzuYfzazpeFZyLmbDVcRrvb497lg=

‎pkg/receiver/smartagentreceiver/config_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,7 @@ func TestLoadInvalidConfigWithoutType(t *testing.T) {
174174
withoutType := CreateDefaultConfig().(*Config)
175175
err = cm.Unmarshal(&withoutType)
176176
require.NoError(t, err)
177-
err = withoutType.Validate()
178-
require.Error(t, err)
179-
require.ErrorContains(t, err,
180-
`you must specify a "type" for a smartagent receiver`)
177+
require.Nil(t, withoutType)
181178
}
182179

183180
func TestLoadInvalidConfigWithUnknownType(t *testing.T) {

‎pkg/receiver/smartagentreceiver/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ require (
1616
github.com/stretchr/testify v1.10.0
1717
go.opentelemetry.io/collector/component v1.33.0
1818
go.opentelemetry.io/collector/component/componenttest v0.127.0
19-
go.opentelemetry.io/collector/confmap v1.33.0
20-
go.opentelemetry.io/collector/confmap/xconfmap v0.127.0
19+
go.opentelemetry.io/collector/confmap v1.34.0
20+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0
2121
go.opentelemetry.io/collector/consumer v1.33.0
2222
go.opentelemetry.io/collector/consumer/consumertest v0.127.0
2323
go.opentelemetry.io/collector/exporter v0.127.0
@@ -212,7 +212,7 @@ require (
212212
go.opentelemetry.io/collector/consumer/consumererror v0.127.0 // indirect
213213
go.opentelemetry.io/collector/consumer/xconsumer v0.127.0 // indirect
214214
go.opentelemetry.io/collector/exporter/xexporter v0.127.0 // indirect
215-
go.opentelemetry.io/collector/featuregate v1.33.0 // indirect
215+
go.opentelemetry.io/collector/featuregate v1.34.0 // indirect
216216
go.opentelemetry.io/collector/internal/telemetry v0.127.0 // indirect
217217
go.opentelemetry.io/collector/pdata/pprofile v0.127.0 // indirect
218218
go.opentelemetry.io/collector/receiver/receivertest v0.127.0 // indirect

‎pkg/receiver/smartagentreceiver/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,10 @@ go.opentelemetry.io/collector/component/componenttest v0.127.0 h1:2cieQeh5OS1zf7
796796
go.opentelemetry.io/collector/component/componenttest v0.127.0/go.mod h1:0jHbHYRXSNS+nm2vSsxpdAsIj+EDehxKRGk4oclyHKs=
797797
go.opentelemetry.io/collector/config/configretry v1.33.0 h1:HAzchQZKq1lCVzLZnUjRYt3J+Uk4Q1Mr1SZXMgwtb+c=
798798
go.opentelemetry.io/collector/config/configretry v1.33.0/go.mod h1:QNnb+MCk7aS1k2EuGJMtlNCltzD7b8uC7Xel0Dxm1wQ=
799-
go.opentelemetry.io/collector/confmap v1.33.0 h1:dCLSrONMssTWhnbELZZpJoWMn+P+DVJc8r10JJCeS/4=
800-
go.opentelemetry.io/collector/confmap v1.33.0/go.mod h1:fq5ccP4lzF3IVK/Cs0kWsiH0dynejXkMc8gaNwvkvtk=
801-
go.opentelemetry.io/collector/confmap/xconfmap v0.127.0 h1:isSNkBXltLxUWstxJyHcJ3qVo9qp9GABCVhzIvZgIdM=
802-
go.opentelemetry.io/collector/confmap/xconfmap v0.127.0/go.mod h1:K9GaSgmMYxM1/QlAVNIj2fX9LekInm9dwFnIeF1HCgs=
799+
go.opentelemetry.io/collector/confmap v1.34.0 h1:PG4sYlLxgCMnA5F7daKXZV+NKjU1IzXBzVQeyvcwyh0=
800+
go.opentelemetry.io/collector/confmap v1.34.0/go.mod h1:BbAit8+hAJg5vyFBQoDh9vOXOH8UzCdNu91jCh+b72E=
801+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0 h1:hcVKU45pjC+PLz7xUc8kwSlR5wsN2w8hs9midZ3ez10=
802+
go.opentelemetry.io/collector/confmap/xconfmap v0.128.0/go.mod h1:2928x4NAAu1CysfzLbEJE6MSSDB/gOYVq6YRGWY9LmM=
803803
go.opentelemetry.io/collector/consumer v1.33.0 h1:y6ohYtFsXHdD3eJ67SRHSgumRQRNlR6N+DuyjOq3hYo=
804804
go.opentelemetry.io/collector/consumer v1.33.0/go.mod h1:WwB/nHWw6KwumVy7OayUmvRa7V3UsfK+f8qwW8/c5rY=
805805
go.opentelemetry.io/collector/consumer/consumererror v0.127.0 h1:9MylkP5eR2hlaj80v67VRUjSoiHNNHTK37gCrtz/9+w=
@@ -820,8 +820,8 @@ go.opentelemetry.io/collector/extension/extensiontest v0.127.0 h1:wf+rP15+mRRyNf
820820
go.opentelemetry.io/collector/extension/extensiontest v0.127.0/go.mod h1:yZKXiLKaJOTXgNOmvWgYKZ2DGToCxHzrqN6PX8YC+fI=
821821
go.opentelemetry.io/collector/extension/xextension v0.127.0 h1:JT2lXY+MGiXuU6AoBX5kRLnUtr5jG6+xKSV0o//rMTk=
822822
go.opentelemetry.io/collector/extension/xextension v0.127.0/go.mod h1:IFx3P/zH8Gey2XP70eb5q4OZHBWMtizg5Gr71eXBndA=
823-
go.opentelemetry.io/collector/featuregate v1.33.0 h1:ronhxafsUE7H3Cem4U2PXrvDZhxA9Gixx4Wik7X32X8=
824-
go.opentelemetry.io/collector/featuregate v1.33.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
823+
go.opentelemetry.io/collector/featuregate v1.34.0 h1:zqDHpEYy1UeudrfUCvlcJL2t13dXywrC6lwpNZ5DrCU=
824+
go.opentelemetry.io/collector/featuregate v1.34.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
825825
go.opentelemetry.io/collector/internal/telemetry v0.127.0 h1:/wAnPmFjUN7MwnRyDYJzUJZa5n0qK9zM1F7PgMWM5Y0=
826826
go.opentelemetry.io/collector/internal/telemetry v0.127.0/go.mod h1:Un7Zn//l0BkE6hk6wirsTGwnJJpxw/gJWgzYL3eSruk=
827827
go.opentelemetry.io/collector/pdata v1.33.0 h1:PuqiZzdCoBJo9NmMzuYfzazpeFZyLmbDVcRrvb497lg=

0 commit comments

Comments
 (0)