start jaxws

Author: jaydeluca

instrumentation-docs/collect.sh

@@ -154,17 +154,17 @@ main() {
   run_gradle_tasks "${gradle_tasks[@]}"
 
   # Setup colima if needed
-  setup_colima
-
-  # Process colima-specific instrumentations
-  echo "Processing colima instrumentations..."
-  gradle_tasks=()
-  while IFS= read -r line; do
-    gradle_tasks+=("$line")
-  done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
-  run_gradle_tasks "${gradle_tasks[@]}"
-
-  colima stop
+#  setup_colima
+#
+#  # Process colima-specific instrumentations
+#  echo "Processing colima instrumentations..."
+#  gradle_tasks=()
+#  while IFS= read -r line; do
+#    gradle_tasks+=("$line")
+#  done < <(process_descriptors "${COLIMA_INSTRUMENTATIONS[@]}")
+#  run_gradle_tasks "${gradle_tasks[@]}"
+#
+#  colima stop
 
   # uncomment the next line to remove all .telemetry directories
   #find_and_remove_all_telemetry

instrumentation-docs/instrumentations.sh

@@ -174,6 +174,8 @@ readonly INSTRUMENTATIONS=(
   "jaxrs:jaxrs-3.0:jaxrs-3.0-jersey-3.0:javaagent:testExperimental"
   "jaxrs:jaxrs-3.0:jaxrs-3.0-resteasy-6.0:javaagent:test"
   "jaxrs:jaxrs-3.0:jaxrs-3.0-resteasy-6.0:javaagent:testExperimental"
+  "jaxws:jaxws-2.0:javaagent:test"
+  "jaxws:jaxws-2.0-axis2-1.6:javaagent:test"
 )
 
 #  Some instrumentation test suites don't run ARM, so we use colima to run them in an x86_64

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/SemanticConvention.java

@@ -26,5 +26,5 @@ public enum SemanticConvention {
   GRAPHQL_SERVER_SPANS,
   FAAS_SERVER_SPANS,
   GENAI_CLIENT_SPANS,
-  GENAI_CLIENT_METRICS
+  GENAI_CLIENT_METRICS,
 }

instrumentation/jaxws/jaxws-2.0-axis2-1.6-testing/build.gradle.kts

@@ -23,4 +23,46 @@ dependencies {
 
   compileOnly(project(":muzzle"))
   compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
+
+  // Test dependencies from the former testing module
+  val axis2Version = "1.6.0"
+  testLibrary("org.apache.axis2:axis2-jaxws:$axis2Version")
+  testLibrary("org.apache.axis2:axis2-transport-http:$axis2Version")
+  testLibrary("org.apache.axis2:axis2-transport-local:$axis2Version")
+
+  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))
+
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-jws-api-1.1:javaagent"))
+  testInstrumentation(project(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:javaagent"))
+
+  testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
+  testInstrumentation(project(":instrumentation:jetty:jetty-8.0:javaagent"))
+
+  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("com.sun.xml.ws:jaxws-rt:2.2.8")
+  testImplementation("com.sun.xml.ws:jaxws-tools:2.2.8")
+
+  latestDepTestLibrary("org.apache.axis2:axis2-jaxws:1.+") // see jaxws-3.0-axis2-2.0-testing module
+  latestDepTestLibrary("org.apache.axis2:axis2-transport-http:1.+") // see jaxws-3.0-axis2-2.0-testing module
+  latestDepTestLibrary("org.apache.axis2:axis2-transport-local:1.+") // see jaxws-3.0-axis2-2.0-testing module
+}
+
+configurations.configureEach {
+  if (name.contains("test")) {
+    // axis has a dependency on servlet2 api, get rid of it - otherwise the servlet3 instrumentation
+    // will fail during tests
+    exclude("javax.servlet", "servlet-api")
+  }
+}
+
+tasks.withType<Test>().configureEach {
+  // required on jdk17
+  jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
+  jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
 }