From 8f32133430a78455cce418252a413f8b2f78f93e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 14 Feb 2023 23:39:08 -0800 Subject: [PATCH] Rename module from jsf-common to jsf-javax-common (#7812) --- .../javaagent/build.gradle.kts | 0 .../instrumentation/jsf/javax}/JsfErrorCauseExtractor.java | 2 +- .../javaagent/instrumentation/jsf/javax}/JsfRequest.java | 2 +- .../instrumentation/jsf/javax}/JsfServerSpanNaming.java | 2 +- .../{jsf-common => jsf-javax-common}/testing/build.gradle.kts | 0 .../testing/src/main/groovy/BaseJsfTest.groovy | 0 .../testing/src/main/groovy/ExceptionFilter.groovy | 0 .../testing/src/main/groovy/GreetingForm.groovy | 0 .../src/main/resources/test-app-1.2/WEB-INF/faces-config.xml | 0 .../testing/src/main/resources/test-app-1.2/WEB-INF/web.xml | 0 .../testing/src/main/resources/test-app-1.2/greeting.xhtml | 0 .../testing/src/main/resources/test-app-1.2/hello.xhtml | 0 .../src/main/resources/test-app-2/WEB-INF/faces-config.xml | 0 .../testing/src/main/resources/test-app-2/WEB-INF/web.xml | 0 .../testing/src/main/resources/test-app-2/greeting.xhtml | 0 .../testing/src/main/resources/test-app-2/hello.xhtml | 0 .../jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts | 4 ++-- .../mojarra/ActionListenerImplInstrumentation.java | 2 +- .../javaagent/instrumentation/mojarra/MojarraSingletons.java | 4 ++-- .../mojarra/RestoreViewPhaseInstrumentation.java | 2 +- .../jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts | 4 ++-- .../myfaces/ActionListenerImplInstrumentation.java | 2 +- .../instrumentation/myfaces/MyFacesErrorCauseExtractor.java | 2 +- .../javaagent/instrumentation/myfaces/MyFacesSingletons.java | 2 +- .../myfaces/RestoreViewExecutorInstrumentation.java | 2 +- settings.gradle.kts | 4 ++-- 26 files changed, 17 insertions(+), 17 deletions(-) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/javaagent/build.gradle.kts (100%) rename instrumentation/jsf/{jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf => jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax}/JsfErrorCauseExtractor.java (89%) rename instrumentation/jsf/{jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf => jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax}/JsfRequest.java (95%) rename instrumentation/jsf/{jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf => jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax}/JsfServerSpanNaming.java (94%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/build.gradle.kts (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/groovy/BaseJsfTest.groovy (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/groovy/ExceptionFilter.groovy (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/groovy/GreetingForm.groovy (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-1.2/greeting.xhtml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-1.2/hello.xhtml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-2/WEB-INF/web.xml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-2/greeting.xhtml (100%) rename instrumentation/jsf/{jsf-common => jsf-javax-common}/testing/src/main/resources/test-app-2/hello.xhtml (100%) diff --git a/instrumentation/jsf/jsf-common/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-javax-common/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/jsf/jsf-common/javaagent/build.gradle.kts rename to instrumentation/jsf/jsf-javax-common/javaagent/build.gradle.kts diff --git a/instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfErrorCauseExtractor.java b/instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfErrorCauseExtractor.java similarity index 89% rename from instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfErrorCauseExtractor.java rename to instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfErrorCauseExtractor.java index 598c49f7d4..294e0b5b4c 100644 --- a/instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfErrorCauseExtractor.java +++ b/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; diff --git a/instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfRequest.java b/instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfRequest.java similarity index 95% rename from instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfRequest.java rename to instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfRequest.java index 741444a1da..abd0298e91 100644 --- a/instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfRequest.java +++ b/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; diff --git a/instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfServerSpanNaming.java b/instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfServerSpanNaming.java similarity index 94% rename from instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfServerSpanNaming.java rename to instrumentation/jsf/jsf-javax-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/javax/JsfServerSpanNaming.java index e45268cddb..78a3daf77a 100644 --- a/instrumentation/jsf/jsf-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jsf/JsfServerSpanNaming.java +++ b/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; diff --git a/instrumentation/jsf/jsf-common/testing/build.gradle.kts b/instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts similarity index 100% rename from instrumentation/jsf/jsf-common/testing/build.gradle.kts rename to instrumentation/jsf/jsf-javax-common/testing/build.gradle.kts diff --git a/instrumentation/jsf/jsf-common/testing/src/main/groovy/BaseJsfTest.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/groovy/BaseJsfTest.groovy rename to instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/BaseJsfTest.groovy diff --git a/instrumentation/jsf/jsf-common/testing/src/main/groovy/ExceptionFilter.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/ExceptionFilter.groovy similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/groovy/ExceptionFilter.groovy rename to instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/ExceptionFilter.groovy diff --git a/instrumentation/jsf/jsf-common/testing/src/main/groovy/GreetingForm.groovy b/instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/GreetingForm.groovy similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/groovy/GreetingForm.groovy rename to instrumentation/jsf/jsf-javax-common/testing/src/main/groovy/GreetingForm.groovy diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/WEB-INF/faces-config.xml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/WEB-INF/web.xml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/greeting.xhtml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/greeting.xhtml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/greeting.xhtml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/greeting.xhtml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/hello.xhtml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/hello.xhtml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-1.2/hello.xhtml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-1.2/hello.xhtml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/WEB-INF/faces-config.xml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/WEB-INF/web.xml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/greeting.xhtml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/greeting.xhtml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/greeting.xhtml rename to instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/greeting.xhtml diff --git a/instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/hello.xhtml b/instrumentation/jsf/jsf-javax-common/testing/src/main/resources/test-app-2/hello.xhtml similarity index 100% rename from instrumentation/jsf/jsf-common/testing/src/main/resources/test-app-2/hello.xhtml rename to instrumentation/jsf/jsf-javax-common/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 index 215f158e09..e859825f8c 100644 --- a/instrumentation/jsf/jsf-mojarra-1.2/javaagent/build.gradle.kts +++ b/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")) 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 index 4dda06e7cc..83350e771c 100644 --- 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 @@ -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; 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 index 395e8654cc..5cd44f713c 100644 --- 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 @@ 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"; 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 index ae1948c0ef..3a76085360 100644 --- 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 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; diff --git a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts b/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts index 291503966b..132c5f2047 100644 --- a/instrumentation/jsf/jsf-myfaces-1.2/javaagent/build.gradle.kts +++ b/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")) 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 index 3239ca43c7..200548fd07 100644 --- 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 @@ -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; 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 index 32a74cd6d1..eb83d54556 100644 --- 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.JsfErrorCauseExtractor; +import io.opentelemetry.javaagent.instrumentation.jsf.javax.JsfErrorCauseExtractor; import javax.el.ELException; public 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 index 8da9a51d38..9be3ba9189 100644 --- 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 @@ 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"; 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 index 2be97475e2..5fe400baae 100644 --- 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 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; diff --git a/settings.gradle.kts b/settings.gradle.kts index 82aa607457..5c81aa53f5 100644 --- a/settings.gradle.kts +++ b/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")