chore: refactor metric gateway

internal/otelcollector/config/common/constants.go

@@ -149,7 +149,7 @@ const (
 	// CONNECTORS
 	// ================================================================================
 
-	ComponentIDForwardConnector                = "forward/%s" // dynamically filled with pipeline name
+	ComponentIDForwardConnector                = "forward"
 	ComponentIDRoutingConnector                = "routing/%s" // dynamically filled with pipeline name
 	ComponentIDEnrichmentRoutingConnector      = "routing/enrichment"
 	ComponentIDRuntimeInputRoutingConnector    = "routing/runtime-input"

internal/otelcollector/config/common/processor_builders.go

@@ -237,7 +237,7 @@ func FilterSpecsToTraceFilterProcessorConfig(specs []telemetryv1alpha1.FilterSpe
 	return &FilterProcessor{
 		ErrorMode: defaultFilterProcessorErrorMode,
 		Traces: FilterProcessorTraces{
-			// Use span context as it is it is always present even though spanevents is the lowest one
+			// Use span as context instead of spanevents, because while more granular, spanevents aren't always present
 			// span event filtering is not supported by user-defined filter until filter processor supports context inference
 			Span: mergedConditions,
 		},

internal/otelcollector/config/logagent/config_builder.go

@@ -50,6 +50,8 @@ func (b *Builder) Build(ctx context.Context, pipelines []telemetryv1alpha1.LogPi
 			b.addK8sAttributesProcessor(opts),
 			b.addInsertClusterAttributesProcessor(opts),
 			b.addServiceEnrichmentProcessor(),
+			// Kyma attributes are dropped before user-defined transform and filter processors
+			// to prevent user access to internal attributes.
 			b.addDropKymaAttributesProcessor(),
 			b.addUserDefinedTransformProcessor(),
 			b.addUserDefinedFilterProcessor(),

internal/otelcollector/config/logagent/config_builder_test.go

@@ -100,7 +100,7 @@ func TestBuildConfig(t *testing.T) {
 					}).
 					Build(),
 			},
-			goldenFileName: "two-pipelines-with-transforms.yaml",
+			goldenFileName: "user-defined-transforms.yaml",
 		},
 		{
 			name: "two pipelines with user-defined filter",
@@ -122,7 +122,7 @@ func TestBuildConfig(t *testing.T) {
 					}).
 					Build(),
 			},
-			goldenFileName: "two-pipelines-with-filter.yaml",
+			goldenFileName: "user-defined-filters.yaml",
 		},
 		{
 			name: "pipeline with user-defined transform and filter",
@@ -140,7 +140,7 @@ func TestBuildConfig(t *testing.T) {
 					}).
 					Build(),
 			},
-			goldenFileName: "pipeline-with-transform-filter.yaml",
+			goldenFileName: "user-defined-transform-filter.yaml",
 		},
 	}
 

internal/otelcollector/config/loggateway/config_builder.go

@@ -48,6 +48,8 @@ func (b *Builder) Build(ctx context.Context, pipelines []telemetryv1alpha1.LogPi
 			b.addNamespaceFilterProcessor(),
 			b.addInsertClusterAttributesProcessor(opts),
 			b.addServiceEnrichmentProcessor(),
+			// Kyma attributes are dropped before user-defined transform and filter processors
+			// to prevent user access to internal attributes.
 			b.addDropKymaAttributesProcessor(),
 			b.addIstioAccessLogsEnrichmentProcessor(opts),
 			b.addUserDefinedTransformProcessor(),

internal/otelcollector/config/loggateway/config_builder_test.go

@@ -107,7 +107,7 @@ func TestBuildConfig(t *testing.T) {
 					}).
 					Build(),
 			},
-			goldenFileName: "two-pipelines-with-transforms.yaml",
+			goldenFileName: "user-defined-transforms.yaml",
 		},
 		{
 			name: "two pipelines with user-defined filter",
@@ -127,7 +127,7 @@ func TestBuildConfig(t *testing.T) {
 					}).
 					Build(),
 			},
-			goldenFileName: "two-pipelines-with-filter.yaml",
+			goldenFileName: "user-defined-filters.yaml",
 		},
 		{
 			name: "pipeline with user-defined transform and filter",
@@ -143,7 +143,7 @@ func TestBuildConfig(t *testing.T) {
 						Conditions: []string{"IsMatch(log.attributes[\"foo\"], \".*bar.*\")"},
 					}).Build(),
 			},
-			goldenFileName: "pipeline-with-transform-filter.yaml",
+			goldenFileName: "user-defined-transform-filter.yaml",
 		},
 	}
 

internal/otelcollector/config/metricagent/config_builder.go

@@ -194,6 +194,8 @@ func (b *Builder) Build(ctx context.Context, pipelines []telemetryv1alpha1.Metri
 			// Generic processors
 			b.addInsertClusterAttributesProcessor(opts),
 			b.addDropSkipEnrichmentAttributeProcessor(),
+			// Kyma attributes are dropped before user-defined transform and filter processors
+			// to prevent user access to internal attributes.
 			b.addDropKymaAttributesProcessor(),
 			b.addUserDefinedTransformProcessor(),
 			b.addUserDefinedFilterProcessor(),

internal/otelcollector/config/metricagent/config_builder_test.go

@@ -321,7 +321,7 @@ func TestBuildConfig(t *testing.T) {
 		},
 		{
 			name:           "two pipelines with user-defined filter",
-			goldenFileName: "two-pipelines-with-filter.yaml",
+			goldenFileName: "user-defined-filters.yaml",
 			pipelines: []telemetryv1alpha1.MetricPipeline{
 				testutils.NewMetricPipelineBuilder().
 					WithName("test1").
@@ -341,7 +341,7 @@ func TestBuildConfig(t *testing.T) {
 		},
 		{
 			name:           "pipeline with user-defined transform and filter",
-			goldenFileName: "pipeline-with-transform-filter.yaml",
+			goldenFileName: "user-defined-transform-filter.yaml",
 			pipelines: []telemetryv1alpha1.MetricPipeline{
 				testutils.NewMetricPipelineBuilder().
 					WithName("test1").