delete legacy tests

Author: songy23

exporter/datadogexporter/integrationtest/integration_test.go

@@ -556,48 +556,6 @@ func sendLogs(t *testing.T, numLogs int, endpoint string) {
 	assert.NoError(t, logExporter.Export(ctx, lr))
 }
 
-func TestIntegrationHostMetrics_WithRemapping_LegacyMetricClient(t *testing.T) {
-	prevVal := pkgdatadog.MetricRemappingDisabledFeatureGate.IsEnabled()
-	require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), false))
-	require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", false))
-	defer func() {
-		require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), prevVal))
-		require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", true))
-	}()
-
-	expectedMetrics := map[string]struct{}{
-		// DD conventions
-		"system.load.15":    {},
-		"system.load.5":     {},
-		"system.mem.total":  {},
-		"system.mem.usable": {},
-
-		// OTel conventions with otel. prefix
-		"otel.system.cpu.load_average.15m": {},
-		"otel.system.cpu.load_average.5m":  {},
-		"otel.system.memory.usage":         {},
-	}
-	testIntegrationHostMetrics(t, expectedMetrics, false)
-}
-
-func TestIntegrationHostMetrics_WithoutRemapping_LegacyMetricClient(t *testing.T) {
-	prevVal := pkgdatadog.MetricRemappingDisabledFeatureGate.IsEnabled()
-	require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), true))
-	require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", false))
-	defer func() {
-		require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), prevVal))
-		require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", true))
-	}()
-
-	expectedMetrics := map[string]struct{}{
-		// OTel conventions
-		"system.cpu.load_average.15m": {},
-		"system.cpu.load_average.5m":  {},
-		"system.memory.usage":         {},
-	}
-	testIntegrationHostMetrics(t, expectedMetrics, false)
-}
-
 func TestIntegrationHostMetrics_WithRemapping_Serializer(t *testing.T) {
 	prevVal := pkgdatadog.MetricRemappingDisabledFeatureGate.IsEnabled()
 	require.NoError(t, featuregate.GlobalRegistry().Set(pkgdatadog.MetricRemappingDisabledFeatureGate.ID(), false))

exporter/datadogexporter/integrationtest/no_race_integration_test.go

@@ -7,7 +7,6 @@ package integrationtest // import "github.com/open-telemetry/opentelemetry-colle
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"runtime"
 	"strconv"
@@ -17,16 +16,11 @@ import (
 	"github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.opentelemetry.io/collector/featuregate"
 
 	commonTestutil "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/testutil"
 )
 
 func TestIntegrationInternalMetrics(t *testing.T) {
-	require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", false))
-	defer func() {
-		require.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.metricexportserializerclient", true))
-	}()
 	expectedMetrics := map[string]struct{}{
 		// Datadog internal metrics on trace and stats writers
 		"datadog.otlp_translator.resources.missing_source": {},
@@ -95,20 +89,14 @@ func testIntegrationInternalMetrics(t *testing.T, expectedMetrics map[string]str
 
 	// 4. Validate Datadog trace agent & OTel internal metrics are sent to the mock server
 	metricMap := make(map[string]series)
+	var err error
 	for len(metricMap) < len(expectedMetrics) {
 		select {
 		case <-tracesRec.ReqChan:
 			// Drain the channel, no need to look into the traces
 		case metricsBytes := <-seriesRec.ReqChan:
-			var metrics seriesSlice
-			gz := getGzipReader(t, metricsBytes)
-			dec := json.NewDecoder(gz)
-			assert.NoError(t, dec.Decode(&metrics))
-			for _, s := range metrics.Series {
-				if _, ok := expectedMetrics[s.Metric]; ok {
-					metricMap[s.Metric] = s
-				}
-			}
+			metricMap, err = seriesFromSerializer(metricsBytes, expectedMetrics)
+			require.NoError(t, err)
 		case <-time.After(60 * time.Second):
 			t.Fail()
 		}