Rename JSF javax shared module to jsf-common-javax (#18081)

Copilot · trask · web-flow · commit ce6751c94751 · 2026-04-20T08:55:19.000-07:00
Co-authored-by: copilot-swe-agent[bot] &lt;198982749+Copilot@users.noreply.github.com&gt;
Co-authored-by: trask &lt;218610+trask@users.noreply.github.com&gt;
diff --git a/.fossa.yml b/.fossa.yml
@@ -630,10 +630,10 @@ targets:
       target: ':instrumentation:jms:jms-common:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jsf:jsf-jakarta-common:javaagent'
+      target: ':instrumentation:jsf:jsf-common-javax:javaagent'
     - type: gradle
       path: ./
-      target: ':instrumentation:jsf:jsf-javax-common:javaagent'
+      target: ':instrumentation:jsf:jsf-jakarta-common:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:jsf:jsf-mojarra-1.2:javaagent'
diff --git a/instrumentation/jsf/jsf-common-javax/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-common-javax/javaagent/build.gradle.kts
diff --git a/instrumentation/jsf/jsf-common-javax/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/JsfErrorCauseExtractor.java b/instrumentation/jsf/jsf-common-javax/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/JsfErrorCauseExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.javax;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.javax;
 
 import io.opentelemetry.instrumentation.api.instrumenter.ErrorCauseExtractor;
 import javax.faces.FacesException;
diff --git a/instrumentation/jsf/jsf-common-javax/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/JsfRequest.java b/instrumentation/jsf/jsf-common-javax/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/JsfRequest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.javax;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.javax;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/instrumentation/jsf/jsf-common-javax/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/JsfServerSpanNaming.java b/instrumentation/jsf/jsf-common-javax/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/JsfServerSpanNaming.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.javax;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.javax;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
diff --git a/instrumentation/jsf/jsf-common-javax/testing/build.gradle.kts b/instrumentation/jsf/jsf-common-javax/testing/build.gradle.kts
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/BaseJsfTest.java b/instrumentation/jsf/jsf-common-javax/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/BaseJsfTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.javax;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.javax;
 
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/ExceptionFilter.java b/instrumentation/jsf/jsf-common-javax/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/ExceptionFilter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.javax;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.javax;
 
 import java.io.IOException;
 import javax.servlet.Filter;
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/GreetingForm.java b/instrumentation/jsf/jsf-common-javax/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/javax/GreetingForm.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.javax;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.javax;
 
 public class GreetingForm {
 
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml
@@ -4,7 +4,7 @@
   version="1.2">
   <managed-bean>
     <managed-bean-name>greetingForm</managed-bean-name>
-    <managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.javax.GreetingForm</managed-bean-class>
+    <managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.common.javax.GreetingForm</managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>
 
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml
@@ -20,7 +20,7 @@
 
   <filter>
     <filter-name>ExceptionFilter</filter-name>
-    <filter-class>io.opentelemetry.javaagent.instrumentation.jsf.javax.ExceptionFilter</filter-class>
+    <filter-class>io.opentelemetry.javaagent.instrumentation.jsf.common.javax.ExceptionFilter</filter-class>
   </filter>
 
   <filter-mapping>
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/greeting.xhtml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/greeting.xhtml
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/hello.xhtml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-1.2/hello.xhtml
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml
@@ -2,7 +2,7 @@
 <faces-config xmlns="http://java.sun.com/xml/ns/javaee" version="2.0">
   <managed-bean>
     <managed-bean-name>greetingForm</managed-bean-name>
-    <managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.javax.GreetingForm</managed-bean-class>
+    <managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.common.javax.GreetingForm</managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>
 </faces-config>
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/WEB-INF/web.xml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/WEB-INF/web.xml
@@ -6,7 +6,7 @@
 
   <filter>
     <filter-name>ExceptionFilter</filter-name>
-    <filter-class>io.opentelemetry.javaagent.instrumentation.jsf.javax.ExceptionFilter</filter-class>
+    <filter-class>io.opentelemetry.javaagent.instrumentation.jsf.common.javax.ExceptionFilter</filter-class>
   </filter>
 
   <filter-mapping>
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/greeting.xhtml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/greeting.xhtml
diff --git a/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/hello.xhtml b/instrumentation/jsf/jsf-common-javax/testing/src/main/resources/test-app-2/hello.xhtml
diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts
@@ -49,9 +49,9 @@ muzzle {
 dependencies {
   compileOnly("javax.faces:jsf-api:1.2")
 
-  implementation(project(":instrumentation:jsf:jsf-javax-common:javaagent"))
+  implementation(project(":instrumentation:jsf:jsf-common-javax:javaagent"))
 
-  testImplementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
+  testImplementation(project(":instrumentation:jsf:jsf-common-javax:testing"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jsf:jsf-mojarra-3.0:javaagent"))
@@ -61,7 +61,7 @@ testing {
   suites {
     val mojarra12Test by registering(JvmTestSuite::class) {
       dependencies {
-        implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
+        implementation(project(":instrumentation:jsf:jsf-common-javax:testing"))
         implementation("javax.faces:jsf-api:1.2")
         implementation("com.sun.facelets:jsf-facelets:1.1.14")
 
@@ -72,7 +72,7 @@ testing {
 
     val mojarra2Test by registering(JvmTestSuite::class) {
       dependencies {
-        implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
+        implementation(project(":instrumentation:jsf:jsf-common-javax:testing"))
 
         val version = if (otelProps.testLatestDeps) "2.+" else "2.2.0"
         implementation("org.glassfish:javax.faces:$version")
diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfRequest;
 import javax.annotation.Nullable;
 import javax.faces.event.ActionEvent;
 import net.bytebuddy.asm.Advice;
diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java
@@ -8,8 +8,8 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfErrorCauseExtractor;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfRequest;
 
 public class MojarraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-mojarra-1.2";
diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java
@@ -11,7 +11,7 @@
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfServerSpanNaming;
 import javax.faces.context.FacesContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/java/io/opentelemetry/javaagent/instrumentation/mojarra/Mojarra12Test.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra12Test/java/io/opentelemetry/javaagent/instrumentation/mojarra/Mojarra12Test.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.mojarra;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.BaseJsfTest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.BaseJsfTest;
 
 class Mojarra12Test extends BaseJsfTest {
   @Override
diff --git a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2Test/java/io/opentelemetry/javaagent/instrumentation/mojarra/Mojarra2Test.java b/instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/mojarra2Test/java/io/opentelemetry/javaagent/instrumentation/mojarra/Mojarra2Test.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.mojarra;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.BaseJsfTest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.BaseJsfTest;
 
 class Mojarra2Test extends BaseJsfTest {
   @Override
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts
@@ -16,9 +16,9 @@ dependencies {
   compileOnly("org.apache.myfaces.core:myfaces-api:1.2.12")
   compileOnly("javax.el:el-api:1.0")
 
-  implementation(project(":instrumentation:jsf:jsf-javax-common:javaagent"))
+  implementation(project(":instrumentation:jsf:jsf-common-javax:javaagent"))
 
-  testImplementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
+  testImplementation(project(":instrumentation:jsf:jsf-common-javax:testing"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:jsf:jsf-myfaces-3.0:javaagent"))
@@ -28,7 +28,7 @@ testing {
   suites {
     val myfaces12Test by registering(JvmTestSuite::class) {
       dependencies {
-        implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
+        implementation(project(":instrumentation:jsf:jsf-common-javax:testing"))
         implementation("com.sun.facelets:jsf-facelets:1.1.14")
 
         val version = if (otelProps.testLatestDeps) "1.2.+" else "1.2.2"
@@ -38,7 +38,7 @@ testing {
 
     val myfaces2Test by registering(JvmTestSuite::class) {
       dependencies {
-        implementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
+        implementation(project(":instrumentation:jsf:jsf-common-javax:testing"))
         implementation("javax.xml.bind:jaxb-api:2.2.11")
         implementation("com.sun.xml.bind:jaxb-impl:2.2.11")
 
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java
@@ -12,7 +12,7 @@
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfRequest;
 import javax.annotation.Nullable;
 import javax.faces.event.ActionEvent;
 import net.bytebuddy.asm.Advice;
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesErrorCauseExtractor.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.myfaces;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfErrorCauseExtractor;
 import javax.el.ELException;
 
 final class MyFacesErrorCauseExtractor extends JsfErrorCauseExtractor {
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java
@@ -8,7 +8,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.javaagent.bootstrap.internal.ExperimentalConfig;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfRequest;
 
 final class MyFacesSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-myfaces-1.2";
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java
@@ -11,7 +11,7 @@
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.JsfServerSpanNaming;
 import javax.faces.context.FacesContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/java/io/opentelemetry/javaagent/instrumentation/myfaces/Myfaces12Test.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces12Test/java/io/opentelemetry/javaagent/instrumentation/myfaces/Myfaces12Test.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.myfaces;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.BaseJsfTest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.BaseJsfTest;
 
 class Myfaces12Test extends BaseJsfTest {
   @Override
diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/java/io/opentelemetry/javaagent/instrumentation/myfaces/Myfaces2Test.java b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/myfaces2Test/java/io/opentelemetry/javaagent/instrumentation/myfaces/Myfaces2Test.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.myfaces;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.javax.BaseJsfTest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.javax.BaseJsfTest;
 
 class Myfaces2Test extends BaseJsfTest {
   @Override
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -402,10 +402,10 @@ include(":instrumentation:jmx-metrics:testing-apps:camel-testing-app")
 include(":instrumentation:jmx-metrics:testing-apps:testing-webapp")
 include(":instrumentation:jodd-http-4.2:javaagent")
 include(":instrumentation:jodd-http-4.2:javaagent-unit-tests")
+include(":instrumentation:jsf:jsf-common-javax:javaagent")
+include(":instrumentation:jsf:jsf-common-javax:testing")
 include(":instrumentation:jsf:jsf-jakarta-common:javaagent")
 include(":instrumentation:jsf:jsf-jakarta-common:testing")
-include(":instrumentation:jsf:jsf-javax-common:javaagent")
-include(":instrumentation:jsf:jsf-javax-common:testing")
 include(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")
 include(":instrumentation:jsf:jsf-mojarra-3.0:javaagent")
 include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
