Skip to content

make java-util-logging indy-ready #15110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 24, 2025
+13 −7
Merged

make java-util-logging indy-ready #15110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1ad39a
make jul indy-ready
SylvainJuge Oct 23, 2025
542ebbd
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-i…
SylvainJuge Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...n/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,19 @@ public void transform(TypeTransformer transformer) {
public static class LogAdvice {

@Advice.OnMethodEnter(suppress = Throwable.class)
public static void methodEnter(
@Advice.This Logger logger,
@Advice.Argument(0) LogRecord logRecord,
@Advice.Local("otelCallDepth") CallDepth callDepth) {
public static CallDepth methodEnter(
@Advice.This Logger logger, @Advice.Argument(0) LogRecord logRecord) {
// need to track call depth across all loggers in order to avoid double capture when one
// logging framework delegates to another
callDepth = CallDepth.forClass(LoggerProvider.class);
CallDepth callDepth = CallDepth.forClass(LoggerProvider.class);
if (callDepth.getAndIncrement() == 0) {
JavaUtilLoggingHelper.capture(logger, logRecord);
}
return callDepth;
}

@Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
public static void methodExit(@Advice.Local("otelCallDepth") CallDepth callDepth) {
public static void methodExit(@Advice.Enter CallDepth callDepth) {
callDepth.decrementAndGet();
}
}
Expand Down
9 changes: 8 additions & 1 deletion .../io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
import com.google.auto.service.AutoService;
import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
import java.util.List;

@AutoService(InstrumentationModule.class)
public class JavaUtilLoggingInstrumentationModule extends InstrumentationModule {
public class JavaUtilLoggingInstrumentationModule extends InstrumentationModule
implements ExperimentalInstrumentationModule {

public JavaUtilLoggingInstrumentationModule() {
super("java-util-logging");
Expand All @@ -23,4 +25,9 @@ public JavaUtilLoggingInstrumentationModule() {
public List<TypeInstrumentation> typeInstrumentations() {
return singletonList(new JavaUtilLoggingInstrumentation());
}

@Override
public boolean isIndyReady() {
return true;
}
}
Loading