From 71dad570608dd25b9e6e607a02b4da6a9a67fa0b Mon Sep 17 00:00:00 2001
From: jason plumb <75337021+breedx-splk@users.noreply.github.com>
Date: Fri, 18 Dec 2020 20:27:43 -0800
Subject: [PATCH] Enable Java 15 for akka http instrumentation (#1869)

---
 .../javaagent/akka-http-10.0-javaagent.gradle               | 6 ------
 .../test/groovy/AkkaHttpClientInstrumentationTest.groovy    | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
index beedc935d3..a7846b594f 100644
--- a/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
+++ b/instrumentation/akka-http-10.0/javaagent/akka-http-10.0-javaagent.gradle
@@ -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/test-with-scala.gradle"
 apply plugin: 'org.unbroken-dome.test-sets'
diff --git a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy b/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
index fcc6b8d4d5..ad4aa074b8 100644
--- a/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
+++ b/instrumentation/akka-http-10.0/javaagent/src/test/groovy/AkkaHttpClientInstrumentationTest.groovy
@@ -58,7 +58,7 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest {
     Http.get(system).singleRequest(null, materializer)
 
     then:
-    thrown NullPointerException
+    def e = thrown NullPointerException
     assertTraces(1) {
       trace(0, 1) {
         span(0) {
@@ -66,7 +66,7 @@ class AkkaHttpClientInstrumentationTest extends HttpClientTest {
           name "HTTP request"
           kind CLIENT
           errored true
-          errorEvent(NullPointerException)
+          errorEvent(NullPointerException, e.getMessage())
         }
       }
     }