[chore] remove WithOTel test wrapper (open-telemetry#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>
bogdandrutu · May 28, 2024 · b53ba2c · b53ba2c
1 parent b111528
commit b53ba2c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)
 }