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 #566 from DataDog/mar-kolya/specify-scala-dependency 

Mar kolya/specify scala dependency
This commit is contained in:
Nikolay Martynov 2018-11-05 21:05:54 -05:00 committed by GitHub
parent 9db83241bc 9c652cc5b2
commit 98efa8aaa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ excludedClassesConverage += ['*']
dependencies {
testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot')
testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
testCompile deps.scala
testCompile group: 'com.typesafe.akka', name: 'akka-actor_2.11', version: '2.3.16'
testCompile group: 'com.typesafe.akka', name: 'akka-testkit_2.11', version: '2.3.16'

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

@ -34,7 +34,7 @@ dependencies {
slickTestCompile project(':dd-java-agent:instrumentation:java-concurrent')
slickTestCompile project(':dd-java-agent:instrumentation:trace-annotation')
slickTestCompile project(':dd-java-agent:instrumentation:jdbc')
slickTestCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
slickTestCompile deps.scala
slickTestCompile group: 'com.typesafe.slick', name: 'slick_2.11', version: '3.2.0'
slickTestCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
}

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

@ -4,7 +4,7 @@ apply from: "${rootDir}/gradle/test-with-scala.gradle"
dependencies {
testCompile project(':dd-trace-api')
testCompile project(':dd-trace-ot')
testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
testCompile deps.scala
testCompile project(':dd-java-agent:testing')
testCompile project(':dd-java-agent:instrumentation:java-concurrent')

7
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java
View File

@ -68,17 +68,10 @@ public final class ExecutorInstrumentation extends Instrumenter.Default {
"akka.actor.ActorSystemImpl$$anon$1",
"akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinPool",
"akka.dispatch.forkjoin.ForkJoinPool",
"akka.dispatch.MessageDispatcher",
"akka.dispatch.Dispatcher",
"akka.dispatch.Dispatcher$LazyExecutorServiceDelegate",
"akka.actor.ActorSystemImpl$$anon$1",
"akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinPool",
"akka.dispatch.forkjoin.ForkJoinPool",
"akka.dispatch.BalancingDispatcher",
"akka.dispatch.ThreadPoolConfig$ThreadPoolExecutorServiceFactory$$anon$1",
"akka.dispatch.PinnedDispatcher",
"akka.dispatch.ExecutionContexts$sameThreadExecutionContext$",
"akka.dispatch.ExecutionContexts$sameThreadExecutionContext$",
"play.api.libs.streams.Execution$trampoline$",
"io.netty.channel.MultithreadEventLoopGroup",
"io.netty.util.concurrent.MultithreadEventExecutorGroup",

4
dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
View File

@ -35,7 +35,7 @@ dependencies {
annotationProcessor deps.autoservice
implementation deps.autoservice
testCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
testCompile deps.scala
testCompile group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
testCompile group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.4.0'
testCompile project(':dd-java-agent:testing')
@ -44,7 +44,7 @@ dependencies {
testCompile project(':dd-java-agent:instrumentation:akka-http-10.0')
testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
latestDepTestCompile group: 'org.scala-lang', name: 'scala-library', version: '2.11.12'
latestDepTestCompile deps.scala
latestDepTestCompile group: 'com.typesafe.play', name: 'play_2.11', version: '2.6.0'
latestDepTestCompile group: 'com.typesafe.play', name: 'play-test_2.11', version: '2.6.0'
}

2
gradle/dependencies.gradle
View File

@ -16,6 +16,7 @@ ext {
logback : "1.2.3",
lombok : "1.18.2",
bytebuddy : "1.9.3",
scala : "2.11.12",
]
deps = [
@ -57,5 +58,6 @@ ext {
dependencies.create(group: 'org.slf4j', name: 'jcl-over-slf4j', version: versions.slf4j),
dependencies.create(group: 'org.slf4j', name: 'jul-to-slf4j', version: versions.slf4j),
],
scala : dependencies.create(group: 'org.scala-lang', name: 'scala-library', version: "${versions.scala}"),
]
}