From 20a1e1ce6336ac4c9e4cac7942a896f93b1d3908 Mon Sep 17 00:00:00 2001 From: Andrea Marziali Date: Wed, 15 Jul 2026 08:26:25 +0200 Subject: [PATCH] Remove unneded akka/pekko exlcusion --- .../AkkaMailboxInstrumentation.java | 19 +------------------ .../PekkoMailboxInstrumentation.java | 19 +------------------ 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java index 8515873fd5d..96efa140128 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java @@ -4,25 +4,18 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.checkpointActiveForRollback; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.rollbackActiveToCheckpoint; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; -import static java.util.Collections.singletonList; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import com.google.auto.service.AutoService; import datadog.context.Context; -import datadog.trace.agent.tooling.ExcludeFilterProvider; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.InstrumenterConfig; -import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter; -import java.util.Collection; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; import net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) public class AkkaMailboxInstrumentation extends InstrumenterModule.ContextTracking - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public AkkaMailboxInstrumentation() { super("akka_actor_mailbox", "akka_actor", "akka_concurrent", "java_concurrent"); @@ -39,16 +32,6 @@ public void methodAdvice(MethodTransformer transformer) { isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice"); } - @Override - public Map> excludedClasses() { - List excludedClass = singletonList("akka.dispatch.MailBox"); - EnumMap> excludedTypes = - new EnumMap<>(ExcludeFilter.ExcludeType.class); - excludedTypes.put(ExcludeFilter.ExcludeType.RUNNABLE, excludedClass); - excludedTypes.put(ExcludeFilter.ExcludeType.FORK_JOIN_TASK, excludedClass); - return excludedTypes; - } - /** * This instrumentation is defensive and closes all scopes on the scope stack that were not there * when we started processing this actor mailbox. The reason for that is twofold. diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java index ff88946b8d3..ab33ee024c7 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java @@ -4,25 +4,18 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.checkpointActiveForRollback; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.rollbackActiveToCheckpoint; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; -import static java.util.Collections.singletonList; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import com.google.auto.service.AutoService; import datadog.context.Context; -import datadog.trace.agent.tooling.ExcludeFilterProvider; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.InstrumenterConfig; -import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter; -import java.util.Collection; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; import net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) public class PekkoMailboxInstrumentation extends InstrumenterModule.ContextTracking - implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice, ExcludeFilterProvider { + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { public PekkoMailboxInstrumentation() { super("pekko_actor_mailbox", "pekko_actor", "pekko_concurrent", "java_concurrent"); @@ -39,16 +32,6 @@ public void methodAdvice(MethodTransformer transformer) { isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice"); } - @Override - public Map> excludedClasses() { - List excludedClass = singletonList("org.apache.pekko.dispatch.MailBox"); - EnumMap> excludedTypes = - new EnumMap<>(ExcludeFilter.ExcludeType.class); - excludedTypes.put(ExcludeFilter.ExcludeType.RUNNABLE, excludedClass); - excludedTypes.put(ExcludeFilter.ExcludeType.FORK_JOIN_TASK, excludedClass); - return excludedTypes; - } - /** * This instrumentation is defensive and closes all scopes on the scope stack that were not there * when we started processing this actor mailbox. The reason for that is twofold.