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

Merge pull request #790 from DataDog/mar-kolya/minor-fixes 

Mar kolya/minor fixes
This commit is contained in:
Nikolay Martynov 2019-04-05 09:24:13 -04:00 committed by GitHub
parent 03e614fa4b 1bba166554
commit a608fe4758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/instrumentation/java-concurrent/akka-2.5-testing/akka-2.5-testing.gradle
View File

@ -9,6 +9,8 @@ apply from: "${rootDir}/gradle/java.gradle"
apply from: "${rootDir}/gradle/test-with-scala.gradle" apply from: "${rootDir}/gradle/test-with-scala.gradle"
dependencies { dependencies {
compileOnly deps.scala
testCompile project(':dd-trace-api') testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot') testCompile project(':dd-trace-ot')
testCompile deps.scala testCompile deps.scala

2
dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
View File

@ -8,6 +8,8 @@ apply from: "${rootDir}/gradle/java.gradle"
apply from: "${rootDir}/gradle/test-with-scala.gradle" apply from: "${rootDir}/gradle/test-with-scala.gradle"
dependencies { dependencies {
compileOnly deps.scala
testCompile project(':dd-trace-api') testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot') testCompile project(':dd-trace-ot')
testCompile deps.scala testCompile deps.scala

2
dd-java-agent/instrumentation/java-concurrent/scala-testing/scala-testing.gradle
View File

@ -8,6 +8,8 @@ apply from: "${rootDir}/gradle/java.gradle"
apply from: "${rootDir}/gradle/test-with-scala.gradle" apply from: "${rootDir}/gradle/test-with-scala.gradle"
dependencies { dependencies {
compileOnly deps.scala
testCompile project(':dd-trace-api') testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot') testCompile project(':dd-trace-ot')
testCompile deps.scala testCompile deps.scala

2
dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/NettyHttpClientDecorator.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.netty41.client; package datadog.trace.instrumentation.netty41.client;
import static io.netty.handler.codec.http.HttpHeaders.Names.HOST; import static io.netty.handler.codec.http.HttpHeaderNames.HOST;
import datadog.trace.agent.decorator.HttpClientDecorator; import datadog.trace.agent.decorator.HttpClientDecorator;
import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpRequest;

2
dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/server/NettyHttpServerDecorator.java
View File

@ -1,6 +1,6 @@
package datadog.trace.instrumentation.netty41.server; package datadog.trace.instrumentation.netty41.server;
import static io.netty.handler.codec.http.HttpHeaders.Names.HOST; import static io.netty.handler.codec.http.HttpHeaderNames.HOST;
import datadog.trace.agent.decorator.HttpServerDecorator; import datadog.trace.agent.decorator.HttpServerDecorator;
import io.netty.handler.codec.http.HttpRequest; import io.netty.handler.codec.http.HttpRequest;

2
gradle/java.gradle
View File

@ -273,7 +273,7 @@ for (def env : System.getenv().entrySet()) {
executable = javaPath executable = javaPath
if (javaName == "7") { if (javaName == "7") {
// Disable JIT for this method. Somtimes Java7 JVM crashes trying to compile it. // Disable JIT for this method. Sometimes Java7 JVM crashes trying to compile it.
jvmArgs '-XX:CompileCommand=exclude,net.bytebuddy.description.type.TypeDescription$Generic$Visitor$Substitutor::onParameterizedType' jvmArgs '-XX:CompileCommand=exclude,net.bytebuddy.description.type.TypeDescription$Generic$Visitor$Substitutor::onParameterizedType'
} }