Skip to content

Remove unneded akka/pekko exclusion #11952

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
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Jul 15, 2026
Merged

Remove unneded akka/pekko exclusion #11952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 1 addition & 18 deletions ...c/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaMailboxInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -39,16 +32,6 @@ public void methodAdvice(MethodTransformer transformer) {
isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice");
}

@Override
public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
List<String> excludedClass = singletonList("akka.dispatch.MailBox");
EnumMap<ExcludeFilter.ExcludeType, Collection<String>> 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.
Expand Down
19 changes: 1 addition & 18 deletions ...main/java/datadog/trace/instrumentation/pekko/concurrent/PekkoMailboxInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -39,16 +32,6 @@ public void methodAdvice(MethodTransformer transformer) {
isMethod().and(named("run")), getClass().getName() + "$SuppressMailboxRunAdvice");
}

@Override
public Map<ExcludeFilter.ExcludeType, ? extends Collection<String>> excludedClasses() {
List<String> excludedClass = singletonList("org.apache.pekko.dispatch.MailBox");
EnumMap<ExcludeFilter.ExcludeType, Collection<String>> 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.
Expand Down
Loading