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.

Author: jvoravong

CHANGELOG.md

@@ -76,6 +76,8 @@ and the [opentelemetry-collector-contrib v0.127.0](https://github.com/open-telem
 
 ### 🧰 Bug fixes 🧰
 
+- (Core) `confmap`: Do not panic on assigning nil maps to non-nil maps ([#13117](https://github.com/open-telemetry/opentelemetry-collector/pull/13117))
+  - 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.
 - (Contrib) `azuremonitorreceiver`: Use ``metrics`` aggregation filter when ``use_batch_api: true`` ([#40079](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/40079))
 - (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))
 - (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

@@ -707,7 +707,7 @@ require (
 	go.opencensus.io v0.24.0
 	go.opentelemetry.io/collector/component v1.33.0
 	go.opentelemetry.io/collector/consumer v1.33.0
-	go.opentelemetry.io/collector/featuregate v1.33.0
+	go.opentelemetry.io/collector/featuregate v1.34.0
 	go.opentelemetry.io/collector/semconv v0.127.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
@@ -772,3 +772,6 @@ replace github.com/veraison/go-cose v1.2.0 => github.com/veraison/go-cose v1.1.1
 // This is only needed for splunk-otel-collector 0.127.0 and can be removed in 0.128.0
 // See: https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/40103/files#diff-2bb8e77bc0a07447b4df98ee53c775b57b842fe5d8a649c52506406aeb18c1c8
 replace github.com/prometheus/common v0.64.0 => github.com/prometheus/common v0.62.0
+// This is only needed for splunk-otel-collector 0.127.0 and can be removed in 0.128.0
+// See: https://github.com/open-telemetry/opentelemetry-collector/issues/13117
+replace go.opentelemetry.io/collector/confmap v1.33.0 => go.opentelemetry.io/collector/confmap v1.34.0

go.sum

@@ -1977,8 +1977,8 @@ go.opentelemetry.io/collector/config/configtelemetry v0.127.0 h1:m4HKEbxcxclMiJJ
 go.opentelemetry.io/collector/config/configtelemetry v0.127.0/go.mod h1:WXmlNatI0vwjv7whh/qF1Xy+UufCZDk7VLtYqML7QmA=
 go.opentelemetry.io/collector/config/configtls v1.33.0 h1:4pGT0nFM24KCtyyq8ng7VWW9fVN1VLQMlkNrMhiWRhU=
 go.opentelemetry.io/collector/config/configtls v1.33.0/go.mod h1:50tvOLlI6iedkrQ9/HMO1KWxzzx0Nu28MgSRXxTwSkY=
-go.opentelemetry.io/collector/confmap v1.33.0 h1:dCLSrONMssTWhnbELZZpJoWMn+P+DVJc8r10JJCeS/4=
-go.opentelemetry.io/collector/confmap v1.33.0/go.mod h1:fq5ccP4lzF3IVK/Cs0kWsiH0dynejXkMc8gaNwvkvtk=
+go.opentelemetry.io/collector/confmap v1.34.0 h1:PG4sYlLxgCMnA5F7daKXZV+NKjU1IzXBzVQeyvcwyh0=
+go.opentelemetry.io/collector/confmap v1.34.0/go.mod h1:BbAit8+hAJg5vyFBQoDh9vOXOH8UzCdNu91jCh+b72E=
 go.opentelemetry.io/collector/confmap/provider/envprovider v1.33.0 h1:A61tuCM6vlBH6Pk1YoJnkOeFUwUnH/vZMQHTKqEL3eo=
 go.opentelemetry.io/collector/confmap/provider/envprovider v1.33.0/go.mod h1:nbNjPiB6XBrGo4L+IR3W2NjK3AS1eK84yY1g2iDWgto=
 go.opentelemetry.io/collector/confmap/provider/fileprovider v1.33.0 h1:T7rVBmAKgLDLXYKQbCrgw15eD9sAhHqvnSGxYv735ew=
@@ -2041,8 +2041,8 @@ go.opentelemetry.io/collector/extension/xextension v0.127.0 h1:JT2lXY+MGiXuU6AoB
 go.opentelemetry.io/collector/extension/xextension v0.127.0/go.mod h1:IFx3P/zH8Gey2XP70eb5q4OZHBWMtizg5Gr71eXBndA=
 go.opentelemetry.io/collector/extension/zpagesextension v0.127.0 h1:iwxxrUh/5B858EAKqYDxjfiiINtioyFhty/0apHDV5A=
 go.opentelemetry.io/collector/extension/zpagesextension v0.127.0/go.mod h1:w6wwIJ1f+yM28kphp7leqeho2lpVr8Sb5qt6Cwwpzk4=
-go.opentelemetry.io/collector/featuregate v1.33.0 h1:ronhxafsUE7H3Cem4U2PXrvDZhxA9Gixx4Wik7X32X8=
-go.opentelemetry.io/collector/featuregate v1.33.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
+go.opentelemetry.io/collector/featuregate v1.34.0 h1:zqDHpEYy1UeudrfUCvlcJL2t13dXywrC6lwpNZ5DrCU=
+go.opentelemetry.io/collector/featuregate v1.34.0/go.mod h1:Y/KsHbvREENKvvN9RlpiWk/IGBK+CATBYzIIpU7nccc=
 go.opentelemetry.io/collector/filter v0.127.0 h1:scb/26S/P6RuJpPMNwahZl9/dCxJcY7uLdx4oFn1sE8=
 go.opentelemetry.io/collector/filter v0.127.0/go.mod h1:DwUuZqNcM5BLDknP32+qsRpObquvHslxm98X1eyTkW4=
 go.opentelemetry.io/collector/internal/fanoutconsumer v0.127.0 h1:LXLYLmPuf7ZwygcQmzFJzbc66CGC+CrFSxEjKH/ZOQ8=