open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: formatting and add version to spark java instrumentation

This commit is contained in:
Jørgen Grøndal 2018-03-07 12:14:10 +01:00 committed by Tyler Benson
parent 593a9b71ad
commit 8bfeae4a82
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dd-java-agent/instrumentation/jetty-9/src/main/java/datadog/trace/instrumentation/jetty9/HandlerInstrumentation.java
View File

@ -1,5 +1,9 @@
package datadog.trace.instrumentation.jetty9; package datadog.trace.instrumentation.jetty9;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.*;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.DDAdvice; import datadog.trace.agent.tooling.DDAdvice;
import datadog.trace.agent.tooling.HelperInjector; import datadog.trace.agent.tooling.HelperInjector;
@ -14,20 +18,15 @@ import io.opentracing.contrib.web.servlet.filter.ServletFilterSpanDecorator;
import io.opentracing.propagation.Format; import io.opentracing.propagation.Format;
import io.opentracing.tag.Tags; import io.opentracing.tag.Tags;
import io.opentracing.util.GlobalTracer; import io.opentracing.util.GlobalTracer;
import net.bytebuddy.agent.builder.AgentBuilder; import java.io.IOException;
import net.bytebuddy.asm.Advice; import java.util.Collections;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.servlet.AsyncEvent; import javax.servlet.AsyncEvent;
import javax.servlet.AsyncListener; import javax.servlet.AsyncListener;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import net.bytebuddy.agent.builder.AgentBuilder;
import java.util.Collections; import net.bytebuddy.asm.Advice;
import java.util.concurrent.atomic.AtomicBoolean;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.*;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class HandlerInstrumentation extends Instrumenter.Configurable { public final class HandlerInstrumentation extends Instrumenter.Configurable {

2
dd-java-agent/instrumentation/sparkjava/sparkjava.gradle → dd-java-agent/instrumentation/sparkjava-2.7/sparkjava.gradle
View File

@ -1,6 +1,6 @@
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
if (JavaVersion.current() != JavaVersion.VERSION_1_8) { if (JavaVersion.isJava8Compatible()) {
sourceSets { sourceSets {
test { test {
groovy { groovy {

6
dd-java-agent/instrumentation/sparkjava/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java → dd-java-agent/instrumentation/sparkjava-2.7/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java
View File

@ -1,5 +1,8 @@
package datadog.trace.instrumentation.sparkjava; package datadog.trace.instrumentation.sparkjava;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.*;
import datadog.trace.agent.tooling.DDAdvice; import datadog.trace.agent.tooling.DDAdvice;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
@ -10,9 +13,6 @@ import net.bytebuddy.asm.Advice;
import spark.route.HttpMethod; import spark.route.HttpMethod;
import spark.routematch.RouteMatch; import spark.routematch.RouteMatch;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static net.bytebuddy.matcher.ElementMatchers.*;
public class RoutesInstrumentation extends Instrumenter.Configurable { public class RoutesInstrumentation extends Instrumenter.Configurable {
public RoutesInstrumentation() { public RoutesInstrumentation() {

0
dd-java-agent/instrumentation/sparkjava/src/test/groovy/SparkJavaBasedTest.groovy → dd-java-agent/instrumentation/sparkjava-2.7/src/test/groovy/SparkJavaBasedTest.groovy
View File

0
dd-java-agent/instrumentation/sparkjava/src/test/java/TestSparkJavaApplication.java → dd-java-agent/instrumentation/sparkjava-2.7/src/test/java/TestSparkJavaApplication.java
View File

2
settings.gradle
View File

@ -35,7 +35,7 @@ include ':dd-java-agent:instrumentation:play-2.4:play-2.6-testing'
include ':dd-java-agent:instrumentation:ratpack-1.4' include ':dd-java-agent:instrumentation:ratpack-1.4'
include ':dd-java-agent:instrumentation:servlet-2' include ':dd-java-agent:instrumentation:servlet-2'
include ':dd-java-agent:instrumentation:servlet-3' include ':dd-java-agent:instrumentation:servlet-3'
include ':dd-java-agent:instrumentation:sparkjava' include ':dd-java-agent:instrumentation:sparkjava-2.7'
include ':dd-java-agent:instrumentation:spring-web' include ':dd-java-agent:instrumentation:spring-web'
include ':dd-java-agent:instrumentation:trace-annotation' include ':dd-java-agent:instrumentation:trace-annotation'