From b53ba2c2f56fde740e76756c2835342ff339e25d Mon Sep 17 00:00:00 2001
From: Alex Boten <223565+codeboten@users.noreply.github.com>
Date: Tue, 28 May 2024 09:08:07 -0700
Subject: [PATCH] [chore] remove WithOTel test wrapper (#10236)

This is no longer needed since we're not testing WithOTel and
WithOpenCensus.

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
---
 exporter/exporterhelper/obsexporter_test.go | 10 ++++------
 processor/batchprocessor/metrics_test.go    |  4 +---
 processor/processorhelper/obsreport_test.go | 10 ++++------
 receiver/receiverhelper/obsreport_test.go   | 10 ++++------
 receiver/scraperhelper/obsreport_test.go    | 10 ++++------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/exporter/exporterhelper/obsexporter_test.go b/exporter/exporterhelper/obsexporter_test.go
index f6f46ccbad2..63da5fcf803 100644
--- a/exporter/exporterhelper/obsexporter_test.go
+++ b/exporter/exporterhelper/obsexporter_test.go
@@ -237,11 +237,9 @@ type testParams struct {
 }
 
 func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt componenttest.TestTelemetry)) {
-	t.Run("WithOTel", func(t *testing.T) {
-		tt, err := componenttest.SetupTelemetry(id)
-		require.NoError(t, err)
-		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
+	tt, err := componenttest.SetupTelemetry(id)
+	require.NoError(t, err)
+	t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
 
-		testFunc(t, tt)
-	})
+	testFunc(t, tt)
 }
diff --git a/processor/batchprocessor/metrics_test.go b/processor/batchprocessor/metrics_test.go
index 47345e99d57..0f7f4db9165 100644
--- a/processor/batchprocessor/metrics_test.go
+++ b/processor/batchprocessor/metrics_test.go
@@ -47,9 +47,7 @@ type expectedMetrics struct {
 }
 
 func telemetryTest(t *testing.T, testFunc func(t *testing.T, tel testTelemetry)) {
-	t.Run("WithOTel", func(t *testing.T) {
-		testFunc(t, setupTelemetry(t))
-	})
+	testFunc(t, setupTelemetry(t))
 }
 
 func setupTelemetry(t *testing.T) testTelemetry {
diff --git a/processor/processorhelper/obsreport_test.go b/processor/processorhelper/obsreport_test.go
index d80c1c180f6..f9df6456e08 100644
--- a/processor/processorhelper/obsreport_test.go
+++ b/processor/processorhelper/obsreport_test.go
@@ -173,11 +173,9 @@ func TestCheckProcessorLogViews(t *testing.T) {
 }
 
 func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt componenttest.TestTelemetry)) {
-	t.Run("WithOTel", func(t *testing.T) {
-		tt, err := componenttest.SetupTelemetry(id)
-		require.NoError(t, err)
-		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
+	tt, err := componenttest.SetupTelemetry(id)
+	require.NoError(t, err)
+	t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
 
-		testFunc(t, tt)
-	})
+	testFunc(t, tt)
 }
diff --git a/receiver/receiverhelper/obsreport_test.go b/receiver/receiverhelper/obsreport_test.go
index 3a417e176aa..b6d52f9bed0 100644
--- a/receiver/receiverhelper/obsreport_test.go
+++ b/receiver/receiverhelper/obsreport_test.go
@@ -297,11 +297,9 @@ func TestCheckReceiverLogsViews(t *testing.T) {
 }
 
 func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt componenttest.TestTelemetry)) {
-	t.Run("WithOTel", func(t *testing.T) {
-		tt, err := componenttest.SetupTelemetry(id)
-		require.NoError(t, err)
-		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
+	tt, err := componenttest.SetupTelemetry(id)
+	require.NoError(t, err)
+	t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
 
-		testFunc(t, tt)
-	})
+	testFunc(t, tt)
 }
diff --git a/receiver/scraperhelper/obsreport_test.go b/receiver/scraperhelper/obsreport_test.go
index 6ccbc8041cd..5e807962f0d 100644
--- a/receiver/scraperhelper/obsreport_test.go
+++ b/receiver/scraperhelper/obsreport_test.go
@@ -112,11 +112,9 @@ func TestCheckScraperMetricsViews(t *testing.T) {
 }
 
 func testTelemetry(t *testing.T, id component.ID, testFunc func(t *testing.T, tt componenttest.TestTelemetry)) {
-	t.Run("WithOTel", func(t *testing.T) {
-		tt, err := componenttest.SetupTelemetry(id)
-		require.NoError(t, err)
-		t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
+	tt, err := componenttest.SetupTelemetry(id)
+	require.NoError(t, err)
+	t.Cleanup(func() { require.NoError(t, tt.Shutdown(context.Background())) })
 
-		testFunc(t, tt)
-	})
+	testFunc(t, tt)
 }