Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-servlet3

Author: SylvainJuge

dependencyManagement/build.gradle.kts

@@ -94,7 +94,7 @@ val DEPENDENCIES = listOf(
   "commons-collections:commons-collections:3.2.2",
   "commons-digester:commons-digester:2.1",
   "commons-fileupload:commons-fileupload:1.5",
-  "commons-io:commons-io:2.17.0",
+  "commons-io:commons-io:2.18.0",
   "commons-lang:commons-lang:2.6",
   "commons-logging:commons-logging:1.3.4",
   "commons-validator:commons-validator:1.9.0",

instrumentation/jaxrs/jaxrs-1.0/javaagent/build.gradle.kts

@@ -20,12 +20,19 @@ dependencies {
 
   compileOnly("javax.ws.rs:jsr311-api:1.1.1")
 
-  // Jackson, used by the test, dropped support for jax 1.x in 2.13+
-  testImplementation(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.12.6"))
-  testImplementation("io.dropwizard:dropwizard-testing:0.7.1")
-  testImplementation("javax.xml.bind:jaxb-api:2.2.3")
+  testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
+
+  testImplementation("org.eclipse.jetty:jetty-webapp:9.4.6.v20170531")
+  testImplementation("com.sun.jersey:jersey-servlet:1.19.4")
+  testImplementation("javax.xml.bind:jaxb-api:2.2.11")
+  testImplementation("com.sun.xml.bind:jaxb-core:2.2.11")
+  testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
+  testImplementation("javax.activation:activation:1.1.1")
 }
 
 tasks.withType<Test>().configureEach {
   jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  // required on jdk17
+  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
 }

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsSingletons.java

@@ -13,11 +13,6 @@
 
 public final class JaxrsSingletons {
 
-  public static final String ABORT_FILTER_CLASS =
-      "io.opentelemetry.javaagent.instrumentation.jaxrs2.filter.abort.class";
-  public static final String ABORT_HANDLED =
-      "io.opentelemetry.javaagent.instrumentation.jaxrs2.filter.abort.handled";
-
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jaxrs-1.0";
 
   private static final Instrumenter<HandlerData, Void> INSTRUMENTER;

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/test/groovy/JaxRsAnnotations1InstrumentationTest.groovy

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+package io.opentelemetry.javaagent.instrumentation.jaxrs.v1_0;
+
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;