fix(otelcol/fanoutconsumer): fix panic when fanning out to invalid re…

…ceivers (#6759) Signed-off-by: hainenber <[email protected]> Co-authored-by: Paschalis Tsilias <[email protected]>
grafana · Apr 4, 2024 · bc294b1 · bc294b1
1 parent 077d70b
commit bc294b1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -73,6 +73,8 @@ Main (unreleased)
   whenever that argument is explicitly configured. This issue only affected a
   small subset of arguments across 15 components. (@erikbaranowski, @rfratto)
 
+- Fix panic when fanning out to invalid receivers. (@hainenber) 
+
 - Fix a bug where a panic could occur when reloading custom components. (@wildum)
 
 - The `import.git` config block did not work with branches or tags this now fixes that behavior. (@mattdurham)

diff --git a/internal/component/otelcol/internal/fanoutconsumer/metrics.go b/internal/component/otelcol/internal/fanoutconsumer/metrics.go
@@ -28,6 +28,9 @@ func Metrics(in []otelcol.Consumer) otelconsumer.Metrics {
 	// Iterate through all the consumers besides the last.
 	for i := 0; i < len(in)-1; i++ {
 		consumer := in[i]
+		if consumer == nil {
+			continue
+		}
 
 		if consumer.Capabilities().MutatesData {
 			clone = append(clone, consumer)

diff --git a/internal/component/otelcol/internal/fanoutconsumer/traces.go b/internal/component/otelcol/internal/fanoutconsumer/traces.go
@@ -28,6 +28,9 @@ func Traces(in []otelcol.Consumer) otelconsumer.Traces {
 	// Iterate through all the consumers besides the last.
 	for i := 0; i < len(in)-1; i++ {
 		consumer := in[i]
+		if consumer == nil {
+			continue
+		}
 
 		if consumer.Capabilities().MutatesData {
 			clone = append(clone, consumer)