Rename module from jsf-common to jsf-javax-common (#7812)

instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfErrorCauseExtractor.java → instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfErrorCauseExtractor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf;
+package io.opentelemetry.javaagent.instrumentation.jsf.javax;
 
 import io.opentelemetry.instrumentation.api.instrumenter.ErrorCauseExtractor;
 import javax.faces.FacesException;

instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfRequest.java → instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfRequest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf;
+package io.opentelemetry.javaagent.instrumentation.jsf.javax;
 
 import java.util.Objects;
 import javax.faces.component.ActionSource2;

instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfServerSpanNaming.java → instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfServerSpanNaming.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.javaagent.instrumentation.jsf;
+package io.opentelemetry.javaagent.instrumentation.jsf.javax;
 
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;

instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts

@@ -64,9 +64,9 @@ tasks {
 dependencies {
   compileOnly("javax.faces:jsf-api:1.2")
 
-  implementation(project(":instrumentation:jsf:jsf-common:javaagent"))
+  implementation(project(":instrumentation:jsf:jsf-javax-common:javaagent"))
 
-  testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
+  testImplementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 

instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/ActionListenerImplInstrumentation.java

@@ -13,7 +13,7 @@ import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
 import javax.faces.event.ActionEvent;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;

instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/MojarraSingletons.java

@@ -8,8 +8,8 @@ package io.opentelemetry.javaagent.instrumentation.mojarra;
 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.JsfErrorCauseExtractor;
-import io.opentelemetry.javaagent.instrumentation.jsf.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
 
 public class MojarraSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-mojarra-1.2";

instrumentation/jsf/jsf-mojarra-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/mojarra/RestoreViewPhaseInstrumentation.java

@@ -11,7 +11,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.JsfServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfServerSpanNaming;
 import javax.faces.context.FacesContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;

instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts

@@ -33,9 +33,9 @@ dependencies {
   compileOnly("org.apache.myfaces.core:myfaces-api:1.2.12")
   compileOnly("javax.el:el-api:1.0")
 
-  implementation(project(":instrumentation:jsf:jsf-common:javaagent"))
+  implementation(project(":instrumentation:jsf:jsf-javax-common:javaagent"))
 
-  testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
+  testImplementation(project(":instrumentation:jsf:jsf-javax-common:testing"))
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
   testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
 

instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/ActionListenerImplInstrumentation.java

@@ -13,7 +13,7 @@ import io.opentelemetry.context.Scope;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
 import javax.faces.event.ActionEvent;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;

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.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfErrorCauseExtractor;
 import javax.el.ELException;
 
 public class MyFacesErrorCauseExtractor extends JsfErrorCauseExtractor {

instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/MyFacesSingletons.java

@@ -8,7 +8,7 @@ package io.opentelemetry.javaagent.instrumentation.myfaces;
 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.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfRequest;
 
 public class MyFacesSingletons {
   private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jsf-myfaces-1.2";

instrumentation/jsf/jsf-myfaces-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/myfaces/RestoreViewExecutorInstrumentation.java

@@ -11,7 +11,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
-import io.opentelemetry.javaagent.instrumentation.jsf.JsfServerSpanNaming;
+import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfServerSpanNaming;
 import javax.faces.context.FacesContext;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;

settings.gradle.kts

@@ -300,8 +300,8 @@ hideFromDependabot(":instrumentation:jms:jms-common:javaagent")
 hideFromDependabot(":instrumentation:jms:jms-common:javaagent-unit-tests")
 hideFromDependabot(":instrumentation:jmx-metrics:javaagent")
 hideFromDependabot(":instrumentation:jmx-metrics:library")
-hideFromDependabot(":instrumentation:jsf:jsf-common:javaagent")
-hideFromDependabot(":instrumentation:jsf:jsf-common:testing")
+hideFromDependabot(":instrumentation:jsf:jsf-javax-common:javaagent")
+hideFromDependabot(":instrumentation:jsf:jsf-javax-common:testing")
 hideFromDependabot(":instrumentation:jsf:jsf-jakarta-common:javaagent")
 hideFromDependabot(":instrumentation:jsf:jsf-jakarta-common:testing")
 hideFromDependabot(":instrumentation:jsf:jsf-mojarra-1.2:javaagent")