From 95bcd6453f00f16284c03f50292bc2e10044ee53 Mon Sep 17 00:00:00 2001
From: Ryan Tan <ryantanjunming@gmail.com>
Date: Tue, 19 Nov 2024 19:53:45 +0800
Subject: [PATCH] clean up

---
 .../k8s-helm/e2e-test/main_test.go            | 23 +++++------
 otel-integration/k8s-helm/e2e-test/sinks.go   | 38 -------------------
 2 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/otel-integration/k8s-helm/e2e-test/main_test.go b/otel-integration/k8s-helm/e2e-test/main_test.go
index 977c8159..2b1916e3 100644
--- a/otel-integration/k8s-helm/e2e-test/main_test.go
+++ b/otel-integration/k8s-helm/e2e-test/main_test.go
@@ -4,7 +4,6 @@
 package e2e
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
@@ -24,8 +23,6 @@ import (
 func TestE2E_Agent(t *testing.T) {
 
 	//Check if the HOST_ENDPOINT is set
-	fmt.Println("Detected HostEndpoint: " + k8stest.HostEndpoint(t))
-	fmt.Println("Env HostEndpoint: " + os.Getenv("HOSTENDPOINT"))
 	require.Equal(t, k8stest.HostEndpoint(t), os.Getenv("HOSTENDPOINT"), "HostEndpoints does not match env and detected")
 
 	k8sDir := filepath.Join("k8s")
@@ -51,28 +48,26 @@ func TestE2E_Agent(t *testing.T) {
 	shutdownSink := StartUpSinks(t, metricsConsumer, tracesConsumer)
 	defer shutdownSink()
 
-	nodeIP := os.Getenv("NODE_IP")
-	fmt.Print("Node IP: ", nodeIP)
 	testID := uuid.NewString()[:8]
 	createTeleOpts := &k8stest.TelemetrygenCreateOpts{
 		ManifestsDir: filepath.Join(k8sDir, "telemetrygen"),
 		TestID:       testID,
-		OtlpEndpoint: fmt.Sprintf("%s:4317", nodeIP),
+		OtlpEndpoint: "", //unused
 		DataTypes:    []string{"traces"},
 	}
-	//defer delete and check
-	_, telemetryGenObjInfos := k8stest.CreateTelemetryGenObjects(t, k8sClient, createTeleOpts)
-	// defer func() {
-	// 	for _, obj := range 	 {
-	// 		require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName())
-	// 	}
-	// }()
+
+	telemetryGenObjs, telemetryGenObjInfos := k8stest.CreateTelemetryGenObjects(t, k8sClient, createTeleOpts)
+	defer func() {
+		for _, obj := range telemetryGenObjs {
+			require.NoErrorf(t, k8stest.DeleteObject(k8sClient, obj), "failed to delete object %s", obj.GetName())
+		}
+	}()
 
 	for _, info := range telemetryGenObjInfos {
 		k8stest.WaitForTelemetryGenToStart(t, k8sClient, info.Namespace, info.PodLabelSelectors, info.Workload, info.DataType)
 	}
 
-	// WaitForMetrics(t, 5, metricsConsumer)
+	WaitForMetrics(t, 5, metricsConsumer)
 	WaitForTraces(t, 5, tracesConsumer)
 
 	checkResourceMetrics(t, metricsConsumer.AllMetrics())
diff --git a/otel-integration/k8s-helm/e2e-test/sinks.go b/otel-integration/k8s-helm/e2e-test/sinks.go
index e3461028..0d372c4f 100644
--- a/otel-integration/k8s-helm/e2e-test/sinks.go
+++ b/otel-integration/k8s-helm/e2e-test/sinks.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"regexp"
 	"slices"
-	"strconv"
 	"testing"
 	"time"
 
@@ -44,32 +43,6 @@ func NewExpectedValue(mode ExpectedValueMode, value string) ExpectedValue {
 	}
 }
 
-type ReceiverSinks struct {
-	Metrics *MetricSinkConfig
-	Traces  *TraceSinkConfig
-	Logs    *LogSinkConfig
-}
-
-type MetricSinkConfig struct {
-	Ports    *ReceiverPorts
-	Consumer *consumertest.MetricsSink
-}
-
-type TraceSinkConfig struct {
-	Ports    *ReceiverPorts
-	Consumer *consumertest.TracesSink
-}
-
-type LogSinkConfig struct {
-	Ports    *ReceiverPorts
-	Consumer *consumertest.LogsSink
-}
-
-type ReceiverPorts struct {
-	Grpc int
-	Http int
-}
-
 func StartUpSinks(t *testing.T, mc *consumertest.MetricsSink, tc *consumertest.TracesSink) func() {
 	f := otlpreceiver.NewFactory()
 	cfg := f.CreateDefaultConfig().(*otlpreceiver.Config)
@@ -87,17 +60,6 @@ func StartUpSinks(t *testing.T, mc *consumertest.MetricsSink, tc *consumertest.T
 	}
 }
 
-func setupReceiverPorts(cfg *otlpreceiver.Config, ports *ReceiverPorts) {
-	if ports != nil {
-		cfg.GRPC.NetAddr.Endpoint = "0.0.0.0:" + strconv.Itoa(ports.Grpc)
-		cfg.HTTP.Endpoint = "0.0.0.0:" + strconv.Itoa(ports.Http)
-	} else {
-		fmt.Println("Receiver ports not set, using default ports")
-		cfg.GRPC.NetAddr.Endpoint = "0.0.0.0:4317"
-		cfg.HTTP.Endpoint = "0.0.0.0:4318"
-	}
-}
-
 func WaitForMetrics(t *testing.T, entriesNum int, mc *consumertest.MetricsSink) {
 	timeoutSeconds := 180 // 3 minutes
 	require.Eventuallyf(t, func() bool {