Skip to content

Migrate aerospike to instrumenter module #10283

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
amarziali merged 2 commits into from
Jan 2, 2026
Merged

Migrate aerospike to instrumenter module #10283

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
85ed373
Migrate aerospike to instrumenter module
amarziali Jan 2, 2026
91e6bf3
remove dangling autoservice annotation
amarziali Jan 2, 2026
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
16 changes: 1 addition & 15 deletions ...rc/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,18 @@
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import net.bytebuddy.asm.Advice;

@AutoService(InstrumenterModule.class)
public final class AerospikeClientInstrumentation extends InstrumenterModule.Tracing
public final class AerospikeClientInstrumentation
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
public AerospikeClientInstrumentation() {
super("aerospike");
}

@Override
public String instrumentedType() {
return "com.aerospike.client.AerospikeClient";
}

@Override
public String[] helperClassNames() {
return new String[] {
packageName + ".AerospikeClientDecorator", packageName + ".TracingListener",
};
}

@Override
public void methodAdvice(MethodTransformer transformer) {
transformer.applyAdvice(
Expand Down
36 changes: 36 additions & 0 deletions ...aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package datadog.trace.instrumentation.aerospike4;

import static java.util.Collections.singleton;

import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.InstrumenterConfig;
import java.util.ArrayList;
import java.util.List;

@AutoService(InstrumenterModule.class)
public final class AerospikeModule extends InstrumenterModule {
public AerospikeModule() {
super("aerospike");
}

@Override
public String[] helperClassNames() {
return new String[] {
packageName + ".AerospikeClientDecorator", packageName + ".TracingListener",
};
}

@Override
public List<Instrumenter> typeInstrumentations() {
final List<Instrumenter> ret = new ArrayList<>(4);
ret.add(new AerospikeClientInstrumentation());
ret.add(new CommandInstrumentation());
if (InstrumenterConfig.get().isIntegrationEnabled(singleton("java_concurrent"), true)) {
ret.add(new NioEventLoopInstrumentation());
}
ret.add(new PartitionInstrumentation());
return ret;
}
}
15 changes: 1 addition & 14 deletions ...ke-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,19 @@
import com.aerospike.client.cluster.Cluster;
import com.aerospike.client.cluster.Node;
import com.aerospike.client.cluster.Partition;
import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import net.bytebuddy.asm.Advice;

@AutoService(InstrumenterModule.class)
public final class CommandInstrumentation extends InstrumenterModule.Tracing
public final class CommandInstrumentation
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
public CommandInstrumentation() {
super("aerospike");
}

@Override
public String instrumentedType() {
return "com.aerospike.client.command.Command";
}

@Override
public String[] helperClassNames() {
return new String[] {
packageName + ".AerospikeClientDecorator",
};
}

@Override
public void methodAdvice(MethodTransformer transformer) {
transformer.applyAdvice(
Expand Down
8 changes: 1 addition & 7 deletions ...0/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,13 @@
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import static net.bytebuddy.matcher.ElementMatchers.takesArguments;

import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import java.util.concurrent.FutureTask;
import java.util.concurrent.RunnableFuture;
import net.bytebuddy.asm.Advice;

@AutoService(InstrumenterModule.class)
public final class NioEventLoopInstrumentation extends InstrumenterModule.Tracing
public final class NioEventLoopInstrumentation
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
public NioEventLoopInstrumentation() {
super("aerospike", "java_concurrent");
}

@Override
public String instrumentedType() {
Expand Down
15 changes: 1 addition & 14 deletions ...-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,19 @@
import com.aerospike.client.cluster.Cluster;
import com.aerospike.client.cluster.Node;
import com.aerospike.client.cluster.Partition;
import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import net.bytebuddy.asm.Advice;

@AutoService(InstrumenterModule.class)
public final class PartitionInstrumentation extends InstrumenterModule.Tracing
public final class PartitionInstrumentation
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
public PartitionInstrumentation() {
super("aerospike");
}

@Override
public String instrumentedType() {
return "com.aerospike.client.cluster.Partition";
}

@Override
public String[] helperClassNames() {
return new String[] {
packageName + ".AerospikeClientDecorator",
};
}

@Override
public void methodAdvice(MethodTransformer transformer) {
transformer.applyAdvice(
Expand Down