Move ServletContextPath to servlet-common:bootstrap (open-telemet…

…ry#4824)

* Move ServletContextPath to servlet-common:bootstrap

* fix tests

* Simplify ServletContextPath calls in restlet instrumentation

conventions/src/main/kotlin/otel.javaagent-bootstrap.gradle.kts

@@ -12,4 +12,8 @@ dependencies {
  compileOnly("io.opentelemetry:opentelemetry-api")
  compileOnly(project(":instrumentation-api"))
  compileOnly(project(":javaagent-instrumentation-api"))
+
+ testImplementation("io.opentelemetry:opentelemetry-api")
+ testImplementation(project(":instrumentation-api"))
+ testImplementation(project(":javaagent-instrumentation-api"))
 }

instrumentation/grails-3.0/javaagent/build.gradle.kts

@@ -32,6 +32,8 @@ val grailsVersion = "3.0.6"
 val springBootVersion = "1.2.5.RELEASE"
 
 dependencies {
+ bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
+
  library("org.grails:grails-plugin-url-mappings:$grailsVersion")
 
  testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))

instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsServerSpanNaming.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.grails;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import org.grails.web.mapping.mvc.GrailsControllerUrlMappingInfo;
 
 public class GrailsServerSpanNaming {

instrumentation/jaxrs/jaxrs-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v1_0/JaxrsServerSpanNaming.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v1_0;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.javaagent.bootstrap.jaxrs.JaxrsContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 
 public class JaxrsServerSpanNaming {
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JaxrsServerSpanNaming.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.javaagent.instrumentation.jaxrs.v2_0;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.javaagent.bootstrap.jaxrs.JaxrsContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 
 public class JaxrsServerSpanNaming {
 

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-cxf-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/CxfSpanName.java

@@ -10,8 +10,8 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNaming;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.javaagent.bootstrap.jaxrs.JaxrsContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import org.apache.cxf.jaxrs.model.ClassResourceInfo;
 import org.apache.cxf.jaxrs.model.OperationResourceInfo;
 import org.apache.cxf.jaxrs.model.URITemplate;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/JerseySpanName.java

@@ -10,8 +10,8 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNaming;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.javaagent.bootstrap.jaxrs.JaxrsContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import javax.annotation.Nullable;
 import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;

instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jaxrs/v2_0/ResteasySpanName.java

@@ -10,8 +10,8 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNaming;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
 import io.opentelemetry.javaagent.bootstrap.jaxrs.JaxrsContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import javax.annotation.Nullable;
 
 public final class ResteasySpanName implements ServerSpanNameSupplier<String> {

instrumentation/jaxrs/jaxrs-common/bootstrap/build.gradle.kts

@@ -1,3 +1,7 @@
 plugins {
  id("otel.javaagent-bootstrap")
 }
+
+dependencies {
+ api(project(":instrumentation:servlet:servlet-common:bootstrap"))
+}

instrumentation/jaxrs/jaxrs-common/bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/jaxrs/JaxrsContextPath.java

@@ -13,7 +13,7 @@
  * Helper container for storing context path for jax-rs requests. Jax-rs context path is the path
  * where jax-rs servlet is mapped or the value of ApplicationPath annotation. Span name is built by
  * combining servlet context path from {@code
- * io.opentelemetry.instrumentation.api.servlet.ServletContextPath}, jax-rs context path and the
+ * io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath}, jax-rs context path and the
  * Path annotation from called method or class.
  */
 public final class JaxrsContextPath {

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

@@ -17,14 +17,15 @@ muzzle {
 }
 
 configurations.configureEach {
- if (!name.contains("muzzle")) {
- // axis has a dependency on servlet api, get rid of it
+ 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")
  }
 }
 
 dependencies {
- implementation(project(":instrumentation:jaxws:jaxws-2.0-axis2-1.6:library"))
+ bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
  val axis2Version = "1.6.0"
  library("org.apache.axis2:axis2-jaxws:$axis2Version")

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2Helper.java → instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2Helper.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.axis2;
+package io.opentelemetry.javaagent.instrumentation.axis2;
 
 import static io.opentelemetry.instrumentation.api.servlet.ServerSpanNaming.Source.CONTROLLER;
-import static io.opentelemetry.instrumentation.axis2.Axis2Singletons.instrumenter;
+import static io.opentelemetry.javaagent.instrumentation.axis2.Axis2Singletons.instrumenter;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2Request.java → instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2Request.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.axis2;
+package io.opentelemetry.javaagent.instrumentation.axis2;
 
 import org.apache.axis2.jaxws.core.MessageContext;
 

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2ServerSpanNaming.java → instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2ServerSpanNaming.java

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.axis2;
+package io.opentelemetry.javaagent.instrumentation.axis2;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.axis2.jaxws.core.MessageContext;
 

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/Axis2Singletons.java → instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/Axis2Singletons.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.axis2;
+package io.opentelemetry.javaagent.instrumentation.axis2;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.config.ExperimentalConfig;

instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/InvocationListenerRegistryTypeInstrumentation.java

@@ -8,7 +8,6 @@
 import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
-import io.opentelemetry.instrumentation.axis2.TracingInvocationListenerFactory;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;

instrumentation/jaxws/jaxws-2.0-axis2-1.6/library/src/main/java/io/opentelemetry/instrumentation/axis2/TracingInvocationListenerFactory.java → instrumentation/jaxws/jaxws-2.0-axis2-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/axis2/TracingInvocationListenerFactory.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.axis2;
+package io.opentelemetry.javaagent.instrumentation.axis2;
 
 import org.apache.axis2.jaxws.core.MessageContext;
 import org.apache.axis2.jaxws.server.InvocationListener;

instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/build.gradle.kts → instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent-unit-tests/build.gradle.kts

@@ -1,10 +1,13 @@
 plugins {
- id("otel.library-instrumentation")
+ id("otel.java-conventions")
 }
 
 dependencies {
  compileOnly("javax.servlet:javax.servlet-api:3.0.1")
  compileOnly("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
 
+ implementation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:javaagent"))
+
+ testImplementation(project(":instrumentation-api"))
  testImplementation("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
 }

instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/build.gradle.kts

@@ -13,9 +13,11 @@ muzzle {
 }
 
 dependencies {
- implementation(project(":instrumentation:jaxws:jaxws-2.0-cxf-3.0:library"))
+ bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
  library("org.apache.cxf:cxf-rt-frontend-jaxws:3.0.0")
+ compileOnly("javax.servlet:javax.servlet-api:3.0.1")
+
  testLibrary("org.apache.cxf:cxf-rt-transports-http:3.0.0")
 
  testImplementation(project(":instrumentation:jaxws:jaxws-2.0-common-testing"))

instrumentation/jaxws/jaxws-2.0-cxf-3.0/library/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfServerSpanNaming.java → instrumentation/jaxws/jaxws-2.0-cxf-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/cxf/CxfServerSpanNaming.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.cxf;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import javax.servlet.http.HttpServletRequest;
 
 public class CxfServerSpanNaming {

instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/build.gradle.kts

@@ -15,6 +15,8 @@ muzzle {
 }
 
 dependencies {
+ bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
+
  library("com.sun.xml.ws:jaxws-rt:2.2.0.1")
 
  compileOnly("javax.servlet:javax.servlet-api:3.0.1")

instrumentation/jaxws/jaxws-2.0-metro-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/metro/MetroServerSpanNaming.java

@@ -7,7 +7,7 @@
 
 import com.sun.xml.ws.api.message.Packet;
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import javax.servlet.http.HttpServletRequest;
 import javax.xml.ws.handler.MessageContext;
 

instrumentation/jsf/jsf-common/library/build.gradle.kts → instrumentation/jsf/jsf-common/javaagent/build.gradle.kts

@@ -1,8 +1,10 @@
 plugins {
- id("otel.library-instrumentation")
+ id("otel.javaagent-instrumentation")
 }
 
 dependencies {
+ compileOnly(project(":instrumentation:servlet:servlet-common:bootstrap"))
+
  compileOnly("jakarta.faces:jakarta.faces-api:2.3.2")
  compileOnly("jakarta.el:jakarta.el-api:3.0.3")
 }

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

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

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

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

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

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.jsf;
+package io.opentelemetry.javaagent.instrumentation.jsf;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNameSupplier;
-import io.opentelemetry.instrumentation.api.servlet.ServletContextPath;
+import io.opentelemetry.javaagent.bootstrap.servlet.ServletContextPath;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 

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

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

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

@@ -10,10 +10,10 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.jsf.JsfRequest;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
+import io.opentelemetry.javaagent.instrumentation.jsf.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 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.config.ExperimentalConfig;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.jsf.JsfErrorCauseExtractor;
-import io.opentelemetry.instrumentation.jsf.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.JsfRequest;
 
 public class MojarraSingletons {
  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.mojarra-1.2";

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

@@ -11,9 +11,9 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import io.opentelemetry.instrumentation.api.servlet.ServerSpanNaming;
-import io.opentelemetry.instrumentation.jsf.JsfServerSpanNaming;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import io.opentelemetry.javaagent.instrumentation.jsf.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,7 +33,7 @@ dependencies {
  compileOnly("org.apache.myfaces.core:myfaces-api:1.2.12")
  compileOnly("javax.el:el-api:1.0")
 
- implementation(project(":instrumentation:jsf:jsf-common:library"))
+ implementation(project(":instrumentation:jsf:jsf-common:javaagent"))
 
  testImplementation(project(":instrumentation:jsf:jsf-common:testing"))
  testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))

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

@@ -10,10 +10,10 @@
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
-import io.opentelemetry.instrumentation.jsf.JsfRequest;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import io.opentelemetry.javaagent.instrumentation.api.Java8BytecodeBridge;
+import io.opentelemetry.javaagent.instrumentation.jsf.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.instrumentation.jsf.JsfErrorCauseExtractor;
+import io.opentelemetry.javaagent.instrumentation.jsf.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 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.instrumentation.api.config.ExperimentalConfig;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
-import io.opentelemetry.instrumentation.jsf.JsfRequest;
+import io.opentelemetry.javaagent.instrumentation.jsf.JsfRequest;
 
 public class MyFacesSingletons {
  private static final String INSTRUMENTATION_NAME = "io.opentelemetry.myfaces-1.2";

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

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

instrumentation/restlet/restlet-1.0/javaagent/build.gradle.kts

@@ -19,6 +19,7 @@ repositories {
 
 dependencies {
  api(project(":instrumentation:restlet:restlet-1.0:library"))
+ bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap"))
 
  library("org.restlet:org.restlet:1.1.5")
  library("com.noelios.restlet:com.noelios.restlet:1.1.5")