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

Enable Java 15 for akka http instrumentation (#1869)

This commit is contained in:
jason plumb 2020-12-18 20:27:43 -08:00 committed by GitHub
parent ad82c30ec2
commit 71dad57060
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
View File

@ -1,9 +1,3 @@
ext {
// TODO remove once Scala/akka supports Java 15
// https://docs.scala-lang.org/overviews/jdk-compatibility/overview.html
maxJavaVersionForTests = JavaVersion.VERSION_14
}
apply from: "$rootDir/gradle/instrumentation.gradle" apply from: "$rootDir/gradle/instrumentation.gradle"
apply from: "$rootDir/gradle/test-with-scala.gradle" apply from: "$rootDir/gradle/test-with-scala.gradle"
apply plugin: 'org.unbroken-dome.test-sets' apply plugin: 'org.unbroken-dome.test-sets'

4
instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
View File

@ -58,7 +58,7 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest {
Http.get(system).singleRequest(null, materializer) Http.get(system).singleRequest(null, materializer)
then: then:
thrown NullPointerException def e = thrown NullPointerException
assertTraces(1) { assertTraces(1) {
trace(0, 1) { trace(0, 1) {
span(0) { span(0) {
@ -66,7 +66,7 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest {
name "HTTP request" name "HTTP request"
kind CLIENT kind CLIENT
errored true errored true
errorEvent(NullPointerException) errorEvent(NullPointerException, e.getMessage())
} }
} }
} }