Rename JSF common jakarta module

Copilot · trask · trask · commit af92286ec155 · 2026-04-21T11:22:04.000-07:00
Agent-Logs-Url: https://github.com/open-telemetry/opentelemetry-java-instrumentation/sessions/c7afc927-4977-4aff-be9e-d852e4ed15ec Co-authored-by: trask <218610+trask@users.noreply.github.com>
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-common-javax:javaagent'
+      target: ':instrumentation:jsf:jsf-common-jakarta: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-mojarra-1.2:javaagent'
diff --git a/instrumentation/jsf/jsf-common-jakarta/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-common-jakarta/javaagent/build.gradle.kts
diff --git a/instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfErrorCauseExtractor.java b/instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfErrorCauseExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;
 
 import io.opentelemetry.instrumentation.api.instrumenter.ErrorCauseExtractor;
 import jakarta.faces.FacesException;
diff --git a/instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfRequest.java b/instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfRequest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfServerSpanNaming.java b/instrumentation/jsf/jsf-common-jakarta/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/JsfServerSpanNaming.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/build.gradle.kts b/instrumentation/jsf/jsf-common-jakarta/testing/build.gradle.kts
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/BaseJsfTest.java b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/BaseJsfTest.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;
 
 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-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/ExceptionFilter.java b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/ExceptionFilter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;
 
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/GreetingForm.java b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/common/jakarta/GreetingForm.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf.jakarta;
+package io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta;
 
 public class GreetingForm {
 
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/WEB-INF/faces-config.xml
@@ -5,7 +5,7 @@
 
   <managed-bean>
     <managed-bean-name>greetingForm</managed-bean-name>
-    <managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.jakarta.GreetingForm</managed-bean-class>
+    <managed-bean-class>io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.GreetingForm</managed-bean-class>
     <managed-bean-scope>request</managed-bean-scope>
   </managed-bean>
 
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/WEB-INF/web.xml b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/WEB-INF/web.xml
@@ -5,7 +5,7 @@
 
   <filter>
     <filter-name>ExceptionFilter</filter-name>
-    <filter-class>io.opentelemetry.javaagent.instrumentation.jsf.jakarta.ExceptionFilter</filter-class>
+    <filter-class>io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.ExceptionFilter</filter-class>
   </filter>
   <filter-mapping>
     <filter-name>ExceptionFilter</filter-name>
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/greeting.xhtml b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/greeting.xhtml
diff --git a/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/hello.xhtml b/instrumentation/jsf/jsf-common-jakarta/testing/src/main/resources/test-app/hello.xhtml
diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/build.gradle.kts
@@ -25,8 +25,8 @@ dependencies {
   library("jakarta.faces:jakarta.faces-api:3.0.0")
   testLibrary("org.glassfish:jakarta.faces:3.0.4")
 
-  implementation(project(":instrumentation:jsf:jsf-jakarta-common:javaagent"))
-  testImplementation(project(":instrumentation:jsf:jsf-jakarta-common:testing"))
+  implementation(project(":instrumentation:jsf:jsf-common-jakarta:javaagent"))
+  testImplementation(project(":instrumentation:jsf:jsf-common-jakarta:testing"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
   testInstrumentation(project(":instrumentation:jsf:jsf-mojarra-1.2:javaagent"))
diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/ActionListenerImplInstrumentation.java b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/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.jakarta.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;
 import jakarta.faces.event.ActionEvent;
 import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/MojarraSingletons.java b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/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.jakarta.JsfErrorCauseExtractor;
-import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;
 
 public class MojarraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-mojarra-3.0";
diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/RestoreViewPhaseInstrumentation.java b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/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.jakarta.JsfServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfServerSpanNaming;
 import jakarta.faces.context.FacesContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
diff --git a/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/Mojarra3Test.java b/instrumentation/jsf/jsf-mojarra-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mojarra/v3_0/Mojarra3Test.java
@@ -5,6 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.mojarra.v3_0;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.BaseJsfTest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.BaseJsfTest;
 
 class Mojarra3Test extends BaseJsfTest {}
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/build.gradle.kts
@@ -25,8 +25,8 @@ dependencies {
   library("org.apache.myfaces.core:myfaces-api:3.0.2")
   testLibrary("org.apache.myfaces.core:myfaces-impl:3.0.2")
 
-  implementation(project(":instrumentation:jsf:jsf-jakarta-common:javaagent"))
-  testImplementation(project(":instrumentation:jsf:jsf-jakarta-common:testing"))
+  implementation(project(":instrumentation:jsf:jsf-common-jakarta:javaagent"))
+  testImplementation(project(":instrumentation:jsf:jsf-common-jakarta:testing"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-5.0:javaagent"))
   testInstrumentation(project(":instrumentation:jsf:jsf-myfaces-1.2:javaagent"))
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/ActionListenerImplInstrumentation.java b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/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.jakarta.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;
 import jakarta.faces.event.ActionEvent;
 import javax.annotation.Nullable;
 import net.bytebuddy.asm.Advice;
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesErrorCauseExtractor.java b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesErrorCauseExtractor.java
@@ -5,7 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.myfaces.v3_0;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfErrorCauseExtractor;
 import jakarta.el.ELException;
 
 public class MyFacesErrorCauseExtractor extends JsfErrorCauseExtractor {
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/MyFacesSingletons.java b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/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.jakarta.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfRequest;
 
 public class MyFacesSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-myfaces-3.0";
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/RestoreViewExecutorInstrumentation.java b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/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.jakarta.JsfServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.JsfServerSpanNaming;
 import jakarta.faces.context.FacesContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
diff --git a/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/Myfaces3Test.java b/instrumentation/jsf/jsf-myfaces-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/myfaces/v3_0/Myfaces3Test.java
@@ -5,6 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.myfaces.v3_0;
 
-import io.opentelemetry.javaagent.instrumentation.jsf.jakarta.BaseJsfTest;
+import io.opentelemetry.javaagent.instrumentation.jsf.common.jakarta.BaseJsfTest;
 
 class Myfaces3Test extends BaseJsfTest {}
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-jakarta:javaagent")
+include(":instrumentation:jsf:jsf-common-jakarta:testing")
 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-mojarra-1.2:javaagent")
 include(":instrumentation:jsf:jsf-mojarra-3.0:javaagent")
 include(":instrumentation:jsf:jsf-myfaces-1.2:javaagent")
