Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

// building against 2.3 and testing against 2.4 because JettyHandler is available since 2.4 only
muzzle {
pass {
Expand All @@ -22,3 +21,7 @@ dependencies {

latestDepTestImplementation group: 'com.sparkjava', name: 'spark-core', version: '+'
}

tasks.withType(Test).configureEach {
jvmArgs += ['-Ddd.trace.enabled=true']
}
168 changes: 0 additions & 168 deletions dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR;
import static datadog.trace.instrumentation.sparkjava.SparkJavaDecorator.DECORATE;
import static datadog.trace.instrumentation.sparkjava.SparkJavaDecorator.SPARK_JAVA;
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.returns;
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
Expand All @@ -11,6 +13,7 @@
import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.agent.tooling.InstrumenterModule;
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
import datadog.trace.bootstrap.instrumentation.api.Tags;
import net.bytebuddy.asm.Advice;
import spark.route.HttpMethod;
import spark.routematch.RouteMatch;
Expand All @@ -20,12 +23,12 @@ public class RoutesInstrumentation extends InstrumenterModule.Tracing
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {

public RoutesInstrumentation() {
super("sparkjava", "sparkjava-2.4");
super("sparkjava", "sparkjava-2.3");
}

@Override
public boolean defaultEnabled() {
return false;
public String[] helperClassNames() {
return new String[] {packageName + ".SparkJavaDecorator"};
}

@Override
Expand All @@ -52,6 +55,8 @@ public static void routeMatchEnricher(
final AgentSpan span = activeSpan();
if (span != null && routeMatch != null) {
HTTP_RESOURCE_DECORATOR.withRoute(span, method.name(), routeMatch.getMatchUri());
span.setSpanName(DECORATE.spanName());
span.setTag(Tags.COMPONENT, SPARK_JAVA);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package datadog.trace.instrumentation.sparkjava;

import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;

public class SparkJavaDecorator extends BaseDecorator {

public static final SparkJavaDecorator DECORATE = new SparkJavaDecorator();

public static final CharSequence SPARK_JAVA = UTF8BytesString.create("spark-java");
public static final CharSequence SPARK_REQUEST = UTF8BytesString.create("spark.request");

@Override
protected String[] instrumentationNames() {
return new String[] {"sparkjava"};
}

@Override
protected CharSequence spanType() {
return "web";
}

@Override
protected CharSequence component() {
return SPARK_JAVA;
}

public CharSequence spanName() {
return SPARK_REQUEST;
}
}

This file was deleted.

This file was deleted.

Loading