Jakarta ee 8 integration

functional_test/build.gradle

@@ -62,8 +62,7 @@ dependencies {
     testImplementation("com.sun.jersey:jersey-core:1.9.1")
     testImplementation("javax.xml:jaxrpc-api:1.1")
 
-    // Removed from the JDK starting in Java 11
-    testImplementation("javax.xml.bind:jaxb-api:2.3.0")
+    testImplementation("jakarta.xml.ws:jakarta.xml.ws-api:2.3.3")
 
     testImplementation("org.apache.derby:derby:10.10.1.1")
     testImplementation("org.apache.struts:struts-core:1.3.5")

instrumentation/akka-http-2.11_2.4.5/build.gradle

@@ -21,7 +21,7 @@ dependencies {
     testImplementation(project(":instrumentation:akka-2.2")) { transitive = false }
     testImplementation(project(":instrumentation:scala-2.9.3")) { transitive = false }
     testImplementation("com.jayway.restassured:rest-assured:2.7.0")
-    testImplementation("javax.xml.bind:jaxb-api:2.3.0")
+    testImplementation("jakarta.xml.ws:jakarta.xml.ws-api:2.3.3")
 }
 
 verifyInstrumentation {

instrumentation/akka-http-2.13_10.1.8/build.gradle

@@ -20,7 +20,7 @@ dependencies {
     testImplementation(project(":instrumentation:akka-2.2")) { transitive = false }
     testImplementation(project(":instrumentation:scala-2.13.0")) { transitive = false }
     testImplementation("com.jayway.restassured:rest-assured:2.7.0")
-    testImplementation("javax.xml.bind:jaxb-api:2.3.0")
+    testImplementation("jakarta.xml.ws:jakarta.xml.ws-api:2.3.3")
 }
 
 verifyInstrumentation {

instrumentation/cxf-2.7/build.gradle

@@ -1,16 +1,15 @@
 dependencies {
     implementation(project(":agent-bridge"))
 
-    implementation("org.apache.cxf:cxf-api:2.7.11")
-    implementation("org.apache.cxf:cxf-rt-bindings-soap:2.7.11")
+    implementation("org.apache.cxf:cxf-rt-bindings-soap:3.5.3")
 }
 
 jar {
     manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.cxf-2.7' }
 }
 
 verifyInstrumentation {
-    passes 'org.apache.cxf:cxf-rt-bindings-soap:[2.1.3,)'
+    passesOnly 'org.apache.cxf:cxf-rt-bindings-soap:[2.1.3,)'
 }
 
 site {

instrumentation/cxf-2.7/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java

@@ -12,7 +12,6 @@
 import com.newrelic.api.agent.weaver.Weaver;
 import com.nr.agent.instrumentation.cxf27.CxfSoapUtils;
 import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.interceptor.Fault;
 
 @Weave
 public class SoapOutInterceptor {

instrumentation/ejb-3.0/build.gradle

@@ -1,7 +1,7 @@
 
 dependencies {
     implementation(project(":agent-bridge"))
-    implementation("javax:javaee-api:6.0")
+    implementation("jakarta.platform:jakarta.jakartaee-api:8.0.0")
 }
 
 jar {
@@ -11,9 +11,10 @@ jar {
 verifyInstrumentation {
     excludeRegex '.*-RC[0-9]+$'
     passesOnly 'javax:javaee-api:[6.0,)'
+    passesOnly 'jakarta.platform:jakarta.jakartaee-api:[8.0.0,9.0.0)'
 }
 
 site {
     title 'EJB'
     type 'Framework'
-}
+}

instrumentation/glassfish-3/build.gradle

@@ -1,9 +1,9 @@
 dependencies {
     implementation(project(":agent-bridge"))
 
-    implementation("javax.servlet:javax.servlet-api:3.0.1")
-    implementation("org.glassfish.main.web:web-core:3.1.2")
-    implementation("org.eclipse.persistence:javax.persistence:2.0.5")
+    implementation("jakarta.servlet:jakarta.servlet-api:4.0.4")
+    implementation("org.glassfish.main.web:web-core:5.1.0")
+    implementation("org.eclipse.persistence:javax.persistence:2.2.1")
 }
 
 jar {
@@ -23,6 +23,14 @@ verifyInstrumentation {
     passes 'org.glassfish.main.web:web-core:5.0'
     passes 'org.glassfish.main.web:web-core:5.0.1'
     passes 'org.glassfish.main.web:web-core:5.1.0'
+    fails 'org.glassfish.main.web:web-core:6.0.0'
+    fails 'org.glassfish.main.web:web-core:6.1.0'
+    fails 'org.glassfish.main.web:web-core:6.2.0'
+    fails 'org.glassfish.main.web:web-core:6.2.1'
+    fails 'org.glassfish.main.web:web-core:6.2.2'
+    fails 'org.glassfish.main.web:web-core:6.2.3'
+    fails 'org.glassfish.main.web:web-core:6.2.4'
+    fails 'org.glassfish.main.web:web-core:6.2.5'
 }
 
 site {

instrumentation/jax-rs-1.0/build.gradle

@@ -1,10 +1,11 @@
 dependencies {
     implementation(project(":agent-bridge"))
-    implementation("javax.ws.rs:javax.ws.rs-api:2.1")
+    implementation("jakarta.ws.rs:jakarta.ws.rs-api:2.1.6")
+    implementation ("org.glassfish.jersey.inject:jersey-hk2:2.28")
 
-    testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.16")
-    testImplementation("org.glassfish.jersey.test-framework:jersey-test-framework-core:2.16")
-    testImplementation("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.16")
+    testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.28")
+    testImplementation("org.glassfish.jersey.test-framework:jersey-test-framework-core:2.28")
+    testImplementation("org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.28")
     testImplementation(project(":instrumentation:jersey-2"))
 }
 

instrumentation/jboss-7/build.gradle

@@ -7,9 +7,8 @@ repositories {
 
 dependencies {
     implementation(project(":agent-bridge"))
-
-    implementation("org.jboss.web:jbossweb:7.0.0.Final")
-    implementation("javax.servlet:javax.servlet-api:3.0.1")
+    implementation("org.jboss.web:jbossweb:7.5.10.Final")
+    implementation("jakarta.servlet:jakarta.servlet-api:4.0.4")
 }
 
 jar {
@@ -18,7 +17,7 @@ jar {
 
 verifyInstrumentation {
     passes('org.jboss.web:jbossweb:[7.0,)') {
-        compile("javax.servlet:javax.servlet-api:3.0.1")
+        compile("jakarta.servlet:jakarta.servlet-api:4.0.4")
     }
     excludeRegex(".*(Alpha|Beta|CR).*")
     exclude("org.jboss.web:jbossweb:7.5.6.Final") // this appears to be a bad release that was excluded from multiple repos

instrumentation/jersey-2/build.gradle

@@ -1,22 +1,26 @@
 dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":newrelic-api"))
-    implementation("org.glassfish.jersey.core:jersey-server:2.0-m13-3")
+    implementation("org.glassfish.jersey.core:jersey-server:2.28")
 
     testImplementation("com.jayway.restassured:rest-assured:2.7.0")
     testImplementation("org.eclipse.jetty:jetty-server:9.4.6.v20170531")
     testImplementation("org.eclipse.jetty:jetty-servlet:9.4.6.v20170531")
-    testImplementation("org.glassfish.jersey.core:jersey-server:2.25.1")
-    testImplementation("org.glassfish.jersey.containers:jersey-container-servlet-core:2.25.1")
-    testImplementation("org.glassfish.jersey.containers:jersey-container-jetty-http:2.25.1")
-    testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.25.1")
-    testImplementation("javax.xml.bind:jaxb-api:2.3.0")
+    testImplementation("org.glassfish.jersey.core:jersey-server:2.28")
+    testImplementation("org.glassfish.jersey.containers:jersey-container-servlet-core:2.28")
+    testImplementation("org.glassfish.jersey.containers:jersey-container-jetty-http:2.28")
+    testImplementation("org.glassfish.jersey.containers:jersey-container-servlet:2.28")
+    testImplementation('org.glassfish.jersey.inject:jersey-hk2:2.28')
+    testImplementation("jakarta.xml.bind:jakarta.xml.bind-api:2.3.3")
+
 }
 
 jar {
     manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jersey-2' }
 }
 
+// org.glassfish.jersey.core 2.28 version starts pulling in jakarata jar named dependencies.
+// Version 3.0.0-M1 starts pulling in jakarata with renamed jar and packages
 verifyInstrumentation {
     passesOnly 'org.glassfish.jersey.core:jersey-server:[2.0,3.0.0-M1)'
     exclude 'org.glassfish.jersey.core:jersey-server:[2.0-m05-2,2.0)'

instrumentation/jersey-client-2.26/build.gradle

@@ -1,9 +1,11 @@
 dependencies {
     implementation(project(":agent-bridge"))
     implementation(project(":newrelic-api"))
-    implementation("org.glassfish.jersey.core:jersey-client:2.26")
-    testImplementation("org.glassfish.jersey.inject:jersey-hk2:2.26")
-    testImplementation("org.glassfish.jersey.core:jersey-common:2.26")
+    implementation("org.glassfish.jersey.core:jersey-client:2.28")
+
+    testImplementation("org.glassfish.jersey.inject:jersey-hk2:2.28")
+    testImplementation("org.glassfish.jersey.core:jersey-common:2.28")
+
 }
 
 jar {

instrumentation/jetty-10/build.gradle

@@ -0,0 +1,31 @@
+
+dependencies {
+    implementation(project(":agent-bridge"))
+
+    implementation("org.eclipse.jetty:jetty-server:10.0.11")
+}
+
+jar {
+    manifest { attributes 'Implementation-Title': 'com.newrelic.instrumentation.jetty-10' }
+}
+
+verifyInstrumentation {
+    passesOnly 'org.eclipse.jetty:jetty-server:[10.0.0-alpha1,11.0.0-alpha0)'
+}
+
+site {
+    title 'Jetty'
+    type 'Appserver'
+}
+
+// Jetty Server 10 is only compatible with Java 11+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
+}
+
+compileJava {
+    options.fork = true
+    options.bootstrapClasspath = null
+}

instrumentation/jetty-10/src/main/java/com/nr/agent/instrumentation/jetty10/AsyncListenerFactory.java

@@ -0,0 +1,55 @@
+/*
+ *
+ *  * Copyright 2022 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.nr.agent.instrumentation.jetty10;
+
+import com.newrelic.agent.bridge.AgentBridge;
+import org.eclipse.jetty.server.HttpChannelState;
+
+import javax.servlet.AsyncEvent;
+import javax.servlet.AsyncListener;
+import java.io.IOException;
+
+public final class AsyncListenerFactory {
+
+    /*
+     * The public enum Action was added in 9.1 and does not exist in 9.0.*. So declaring a variable of this type is
+     * sufficient to prevent this instrumentation module from loading in 9.0.*.
+     */
+    public static HttpChannelState.Action isPostJetty90 = null;
+
+    private AsyncListenerFactory() {
+    }
+
+    private static final AsyncListener ASYNC_LISTENER = new AsyncListener() {
+
+        @Override
+        public void onComplete(AsyncEvent asyncEvent) throws IOException {
+            AgentBridge.asyncApi.completeAsync(asyncEvent.getAsyncContext());
+        }
+
+        @Override
+        public void onTimeout(AsyncEvent asyncEvent) throws IOException {
+            // do nothing
+        }
+
+        @Override
+        public void onError(AsyncEvent asyncEvent) throws IOException {
+            AgentBridge.asyncApi.errorAsync(asyncEvent.getAsyncContext(), asyncEvent.getThrowable());
+        }
+
+        @Override
+        public void onStartAsync(AsyncEvent asyncEvent) throws IOException {
+            // do nothing
+        }
+
+    };
+
+    public static AsyncListener getAsyncListener() {
+        return ASYNC_LISTENER;
+    }
+}

instrumentation/jetty-10/src/main/java/com/nr/agent/instrumentation/jetty10/JettyRequest.java

@@ -0,0 +1,88 @@
+/*
+ *
+ *  * Copyright 2022 New Relic Corporation. All rights reserved.
+ *  * SPDX-License-Identifier: Apache-2.0
+ *
+ */
+
+package com.nr.agent.instrumentation.jetty10;
+
+import com.newrelic.api.agent.ExtendedRequest;
+import com.newrelic.api.agent.HeaderType;
+
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+
+public class JettyRequest extends ExtendedRequest {
+    private final HttpServletRequest request;
+
+    public JettyRequest(HttpServletRequest request) {
+        super();
+        this.request = request;
+    }
+
+    @Override
+    public String getRequestURI() {
+        return request.getRequestURI();
+    }
+
+    @Override
+    public String getHeader(String name) {
+        return request.getHeader(name);
+    }
+
+    @Override
+    public String getRemoteUser() {
+        return request.getRemoteUser();
+    }
+
+    @Override
+    public Enumeration getParameterNames() {
+        return request.getParameterNames();
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        return request.getParameterValues(name);
+    }
+
+    @Override
+    public Object getAttribute(String name) {
+        return request.getAttribute(name);
+    }
+
+    @Override
+    public String getCookieValue(String name) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies != null) {
+            for (Cookie cookie : cookies) {
+                if (name.equals(cookie.getName())) {
+                    return cookie.getValue();
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public HeaderType getHeaderType() {
+        return HeaderType.HTTP;
+    }
+
+    @Override
+    public String getMethod() {
+        return request.getMethod();
+    }
+
+    @Override
+    public List<String> getHeaders(String name) {
+        Enumeration headers = request.getHeaders(name);
+        if (headers == null) {
+            return Collections.emptyList();
+        }
+        return Collections.list(headers);
+    }
+}