From 6cf5d5efcc456f7e825f0c0c181f60f3f8eb962c Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 10 May 2022 01:02:49 -0700
Subject: [PATCH] Simply logging test configuration (#5996)

---
 .../exporter/AgentTestingCustomizer.java      |  6 ++++
 .../exporter/AgentTestingLogsCustomizer.java  | 33 -------------------
 2 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingLogsCustomizer.java

diff --git a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingCustomizer.java b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingCustomizer.java
index 001ae2a6ca..91631aab2e 100644
--- a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingCustomizer.java
+++ b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingCustomizer.java
@@ -8,6 +8,7 @@ package io.opentelemetry.javaagent.testing.exporter;
 import com.google.auto.service.AutoService;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
+import io.opentelemetry.sdk.logs.export.SimpleLogProcessor;
 import io.opentelemetry.sdk.metrics.export.MetricReader;
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
 import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
@@ -36,5 +37,10 @@ public class AgentTestingCustomizer implements AutoConfigurationCustomizerProvid
 
     autoConfigurationCustomizer.addMeterProviderCustomizer(
         (meterProvider, config) -> meterProvider.registerMetricReader(metricReader));
+
+    autoConfigurationCustomizer.addLogEmitterProviderCustomizer(
+        (logProvider, config) ->
+            logProvider.addLogProcessor(
+                SimpleLogProcessor.create(AgentTestingExporterFactory.logExporter)));
   }
 }
diff --git a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingLogsCustomizer.java b/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingLogsCustomizer.java
deleted file mode 100644
index c46218d598..0000000000
--- a/testing/agent-exporter/src/main/java/io/opentelemetry/javaagent/testing/exporter/AgentTestingLogsCustomizer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.javaagent.testing.exporter;
-
-import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.api.config.Config;
-import io.opentelemetry.instrumentation.sdk.appender.internal.DelegatingLogEmitterProvider;
-import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
-import io.opentelemetry.javaagent.extension.AgentListener;
-import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
-import io.opentelemetry.sdk.logs.SdkLogEmitterProvider;
-import io.opentelemetry.sdk.logs.export.SimpleLogProcessor;
-
-@AutoService(AgentListener.class)
-public class AgentTestingLogsCustomizer implements AgentListener {
-
-  @Override
-  public void beforeAgent(
-      Config config, AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
-
-    SdkLogEmitterProvider logEmitterProvider =
-        SdkLogEmitterProvider.builder()
-            .setResource(autoConfiguredOpenTelemetrySdk.getResource())
-            .addLogProcessor(SimpleLogProcessor.create(AgentTestingExporterFactory.logExporter))
-            .build();
-
-    AgentLogEmitterProvider.resetForTest();
-    AgentLogEmitterProvider.set(DelegatingLogEmitterProvider.from(logEmitterProvider));
-  }
-}