feat(meshmetric): restore old flow

Signed-off-by: slonka <[email protected]>
kumahq · Apr 2, 2024 · 4f0950d · 4f0950d
1 parent d2e2e03
commit 4f0950d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/app/kuma-dp/cmd/run.go b/app/kuma-dp/cmd/run.go
@@ -322,7 +322,7 @@ func getApplicationsToScrape(kumaSidecarConfiguration *types.KumaSidecarConfigur
 		IsIPv6:            false,
 		QueryModifier:     metrics.AddPrometheusFormat,
 		Mutator:           metrics.AggregatedMetricsMutator(metrics.MergeClustersForPrometheus),
-		MeshMetricMutator: metrics.AggregatedOtelMutator(metrics.MergeClustersForOpenTelemetry),
+		MeshMetricMutator: metrics.AggregatedOtelMutator(),
 	})
 	return applicationsToScrape
 }

diff --git a/app/kuma-dp/pkg/dataplane/meshmetrics/component.go b/app/kuma-dp/pkg/dataplane/meshmetrics/component.go
@@ -279,7 +279,7 @@ func (cf *ConfigFetcher) mapApplicationToApplicationToScrape(applications []xds.
 		Port:              cf.envoyAdminPort,
 		IsIPv6:            false,
 		QueryModifier:     metrics.AggregatedQueryParametersModifier(metrics.AddPrometheusFormat, metrics.AddSidecarParameters(sidecar)),
-		MeshMetricMutator: metrics.AggregatedOtelMutator(metrics.ProfileMutatorGenerator(sidecar), metrics.MergeClustersForOpenTelemetry),
+		MeshMetricMutator: metrics.AggregatedOtelMutator(metrics.ProfileMutatorGenerator(sidecar)),
 	})
 
 	return applicationsToScrape

diff --git a/app/kuma-dp/pkg/dataplane/metrics/merge.go b/app/kuma-dp/pkg/dataplane/metrics/merge.go
@@ -35,23 +35,6 @@ func MergeClustersForPrometheus(in map[string]*io_prometheus_client.MetricFamily
 	return nil
 }
 
-func MergeClustersForOpenTelemetry(metricFamilies map[string]*io_prometheus_client.MetricFamily) error {
-	for _, metricFamily := range metricFamilies {
-		switch {
-		case isClusterMetricFamily(metricFamily):
-			if err := handleClusterMetric(metricFamily); err != nil {
-				return err
-			}
-		case isHttpMetricFamily(metricFamily):
-			if err := handleHttpMetricFamily(metricFamily); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
 func handleClusterMetric(metricFamily *io_prometheus_client.MetricFamily) error {
 	// metricsByClusterNames returns the data in the following format:
 	// 'cluster_name' ->