working

jack-berg · jack-berg · commit 28a6b33f212f · 2025-12-05T19:19:15.000-06:00
diff --git a/instrumentation/internal/internal-slf4j-bridge/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/logging/OtelLoggerBridge.java b/instrumentation/internal/internal-slf4j-bridge/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/logging/OtelLoggerBridge.java
diff --git a/instrumentation/internal/internal-slf4j-bridge/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/logging/Slf4jBridgeInstaller.java b/instrumentation/internal/internal-slf4j-bridge/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/logging/Slf4jBridgeInstaller.java
@@ -0,0 +1,17 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.bootstrap.logging;
+
+import io.opentelemetry.javaagent.Slf4jLogRecorder;
+import io.opentelemetry.javaagent.bootstrap.Slf4jBridgeLogRecorderHolder;
+
+public class Slf4jBridgeInstaller {
+  private Slf4jBridgeInstaller() {}
+
+  public static void installSlf4jLogger(Slf4jLogRecorder slf4JLogRecorder) {
+    Slf4jBridgeLogRecorderHolder.initialize(slf4JLogRecorder);
+  }
+}
diff --git a/instrumentation/internal/internal-slf4j-bridge/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/logging/Slf4jBridgeInstallerFlags.java b/instrumentation/internal/internal-slf4j-bridge/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/logging/Slf4jBridgeInstallerFlags.java
@@ -7,9 +7,9 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public final class OtelLoggerFlags {
+public final class Slf4jBridgeInstallerFlags {
 
-  private OtelLoggerFlags() {}
+  private Slf4jBridgeInstallerFlags() {}
 
   public static final AtomicBoolean IS_INSTALLED = new AtomicBoolean(false);
 }
diff --git a/instrumentation/internal/internal-slf4j-bridge/javaagent/build.gradle.kts b/instrumentation/internal/internal-slf4j-bridge/javaagent/build.gradle.kts
@@ -24,28 +24,4 @@ dependencies {
       strictly("2.0.0")
     }
   }
-
-  // TODO
-//  if (latestDepTest) {
-//    testImplementation("ch.qos.logback:logback-classic:latest.release")
-//  } else {
-//    testImplementation("ch.qos.logback:logback-classic") {
-//      version {
-//        strictly("1.2.11")
-//      }
-//    }
-//    testImplementation("org.slf4j:slf4j-api") {
-//      version {
-//        strictly("1.7.36")
-//      }
-//    }
-//  }
 }
-
-// TODO
-// if (latestDepTest) {
-//  // spring 6 requires java 17
-//  otelJava {
-//    minJavaVersionSupported.set(JavaVersion.VERSION_17)
-//  }
-// }
diff --git a/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/LoggerFactoryInstrumentation.java b/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/LoggerFactoryInstrumentation.java
@@ -8,7 +8,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
 
-import io.opentelemetry.javaagent.bootstrap.logging.OtelLoggerFlags;
+import io.opentelemetry.javaagent.bootstrap.logging.Slf4jBridgeInstallerFlags;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
@@ -35,8 +35,8 @@ public static class GetLoggerFactoryAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class)
     public static void onExit() {
-      if (OtelLoggerFlags.IS_INSTALLED.compareAndSet(false, true)) {
-        Slf4jOtelLogger.install();
+      if (Slf4jBridgeInstallerFlags.IS_INSTALLED.compareAndSet(false, true)) {
+        Slf4jLogRecorderImpl.install();
       }
     }
   }
diff --git a/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/Slf4jBridgeIgnoredTypesConfigurer.java b/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/Slf4jBridgeIgnoredTypesConfigurer.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 
 @AutoService(IgnoredTypesConfigurer.class)
-public final class OtelLoggingIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
+public final class Slf4jBridgeIgnoredTypesConfigurer implements IgnoredTypesConfigurer {
 
   @Override
   public void configure(IgnoredTypesBuilder builder, ConfigProperties config) {
diff --git a/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/Slf4jBridgeInstrumentationModule.java b/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/Slf4jBridgeInstrumentationModule.java
@@ -13,10 +13,10 @@
 import java.util.List;
 
 @AutoService(InstrumentationModule.class)
-public class OtelLoggingInstrumentationModule extends InstrumentationModule {
+public class Slf4jBridgeInstrumentationModule extends InstrumentationModule {
 
-  public OtelLoggingInstrumentationModule() {
-    super("internal-otel-logger");
+  public Slf4jBridgeInstrumentationModule() {
+    super("internal-slf4j-bridge");
   }
 
   @Override
diff --git a/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/Slf4jLogRecorderImpl.java b/instrumentation/internal/internal-slf4j-bridge/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/internal/slf4jbridge/Slf4jLogRecorderImpl.java
@@ -10,21 +10,21 @@
 import io.opentelemetry.api.logs.LoggerProvider;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.javaagent.OtelLogger;
+import io.opentelemetry.javaagent.Slf4jLogRecorder;
 import io.opentelemetry.javaagent.bootstrap.CallDepth;
-import io.opentelemetry.javaagent.bootstrap.logging.OtelLoggerBridge;
 import javax.annotation.Nullable;
+import io.opentelemetry.javaagent.bootstrap.logging.Slf4jBridgeInstaller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
 import org.slf4j.spi.LoggingEventBuilder;
 
-public final class Slf4jOtelLogger implements OtelLogger {
+public final class Slf4jLogRecorderImpl implements Slf4jLogRecorder {
 
-  private Slf4jOtelLogger() {}
+  private Slf4jLogRecorderImpl() {}
 
   public static void install() {
-    OtelLoggerBridge.installSlf4jLogger(new Slf4jOtelLogger());
+    Slf4jBridgeInstaller.installSlf4jLogger(new Slf4jLogRecorderImpl());
   }
 
   @Override
@@ -40,14 +40,14 @@ public void record(
       if (callDepth.getAndIncrement() > 0) {
         return;
       }
-      recordInternal(scopeName, eventName, bodyValue, attributes, severity);
+      recordToSlf4j(scopeName, eventName, bodyValue, attributes, severity);
     } finally {
       callDepth.decrementAndGet();
     }
   }
 
   @SuppressWarnings("CheckReturnValue")
-  private static void recordInternal(
+  public static void recordToSlf4j(
       String scopeName,
       @Nullable String eventName,
       @Nullable Value<?> bodyValue,
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/Slf4jLogRecorder.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/Slf4jLogRecorder.java
@@ -12,7 +12,7 @@
 import javax.annotation.Nullable;
 
 @FunctionalInterface
-public interface OtelLogger {
+public interface Slf4jLogRecorder {
 
   void record(
       Context context,
diff --git a/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/Slf4jBridgeLogRecorderHolder.java b/javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/Slf4jBridgeLogRecorderHolder.java
@@ -9,32 +9,32 @@
 import io.opentelemetry.api.common.Value;
 import io.opentelemetry.api.logs.Severity;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.javaagent.OtelLogger;
+import io.opentelemetry.javaagent.Slf4jLogRecorder;
 import java.util.concurrent.atomic.AtomicReference;
 
-public final class OtelLoggerHolder {
+public final class Slf4jBridgeLogRecorderHolder {
 
-  private static final OtelLogger NOOP_OTEL_LOGGER =
+  private static final Slf4jLogRecorder NOOP_OTEL_LOGGER =
       (unused, unused2, unused3, unused4, unused5, unused6) -> {};
 
-  private static final AtomicReference<OtelLogger> otelLogger =
+  private static final AtomicReference<Slf4jLogRecorder> otelLogger =
       new AtomicReference<>(NOOP_OTEL_LOGGER);
 
-  public static void initialize(OtelLogger otelLogger) {
-    if (!OtelLoggerHolder.otelLogger.compareAndSet(NOOP_OTEL_LOGGER, otelLogger)) {
-      otelLogger.record(
+  public static void initialize(Slf4jLogRecorder slf4JLogRecorder) {
+    if (!Slf4jBridgeLogRecorderHolder.otelLogger.compareAndSet(NOOP_OTEL_LOGGER, slf4JLogRecorder)) {
+      slf4JLogRecorder.record(
           Context.root(),
-          OtelLogger.class.getName(),
+          Slf4jLogRecorder.class.getName(),
           null,
           Value.of("Developer error: logging system has already been initialized once"),
           Attributes.empty(),
           Severity.WARN);
     }
   }
 
-  public static OtelLogger get() {
+  public static Slf4jLogRecorder get() {
     return otelLogger.get();
   }
 
-  private OtelLoggerHolder() {}
+  private Slf4jBridgeLogRecorderHolder() {}
 }
diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/OpenTelemetryInstaller.java
@@ -9,9 +9,10 @@
 
 import io.opentelemetry.api.incubator.config.ConfigProvider;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
-import io.opentelemetry.javaagent.bootstrap.OtelLoggerHolder;
+import io.opentelemetry.javaagent.bootstrap.Slf4jBridgeLogRecorderHolder;
 import io.opentelemetry.javaagent.tooling.config.EarlyInitAgentConfig;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
@@ -21,6 +22,7 @@
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.logs.LogRecordProcessor;
+import io.opentelemetry.sdk.logs.ReadWriteLogRecord;
 import java.util.Arrays;
 
 public final class OpenTelemetryInstaller {
@@ -39,7 +41,7 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
             .setResultAsGlobal()
             .setServiceClassLoader(extensionClassLoader)
             .addLoggerProviderCustomizer(
-                (builder, unused) -> builder.addLogRecordProcessor(bridgeProcessor()))
+                (builder, unused) -> builder.addLogRecordProcessor(new Slf4jBridgeAgentProcessor()))
             .build();
     ConfigProvider configProvider = AutoConfigureUtil.getConfigProvider(autoConfiguredSdk);
     OpenTelemetrySdk sdk = autoConfiguredSdk.getOpenTelemetrySdk();
@@ -60,17 +62,18 @@ public static AutoConfiguredOpenTelemetrySdk installOpenTelemetrySdk(
     return autoConfiguredSdk;
   }
 
-  static LogRecordProcessor bridgeProcessor() {
-    return (context, logRecord) -> {
-      OtelLoggerHolder.get()
+  private static class Slf4jBridgeAgentProcessor implements LogRecordProcessor {
+    @Override
+    public void onEmit(Context context, ReadWriteLogRecord logRecord) {
+      Slf4jBridgeLogRecorderHolder.get()
           .record(
               context,
               logRecord.getInstrumentationScopeInfo().getName(),
               logRecord.getEventName(),
               logRecord.getBodyValue(),
               logRecord.getAttributes(),
               logRecord.getSeverity());
-    };
+    }
   }
 
   // Visible for testing

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`
`8`	`8`	`import java.util.concurrent.atomic.AtomicBoolean;`
`9`	`9`
`10`		`-public final class OtelLoggerFlags {`
	`10`	`+public final class Slf4jBridgeInstallerFlags {`
`11`	`11`
`12`		`- private OtelLoggerFlags() {}`
	`12`	`+ private Slf4jBridgeInstallerFlags() {}`
`13`	`13`
`14`	`14`	`public static final AtomicBoolean IS_INSTALLED = new AtomicBoolean(false);`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`import static net.bytebuddy.matcher.ElementMatchers.named;`
`9`	`9`	`import static net.bytebuddy.matcher.ElementMatchers.takesArguments;`
`10`	`10`
`11`		`-import io.opentelemetry.javaagent.bootstrap.logging.OtelLoggerFlags;`
	`11`	`+import io.opentelemetry.javaagent.bootstrap.logging.Slf4jBridgeInstallerFlags;`
`12`	`12`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;`
`13`	`13`	`import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;`
`14`	`14`	`import net.bytebuddy.asm.Advice;`
`@@ -35,8 +35,8 @@ public static class GetLoggerFactoryAdvice {`
`35`	`35`
`36`	`36`	`@Advice.OnMethodExit(suppress = Throwable.class)`
`37`	`37`	`public static void onExit() {`
`38`		`- if (OtelLoggerFlags.IS_INSTALLED.compareAndSet(false, true)) {`
`39`		`- Slf4jOtelLogger.install();`
	`38`	`+ if (Slf4jBridgeInstallerFlags.IS_INSTALLED.compareAndSet(false, true)) {`
	`39`	`+ Slf4jLogRecorderImpl.install();`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`