Copy enduser.id key over and remove dependency.

Incubating keys are internalized to avoid a dependency on a moving target.

Author: tylerbenson

instrumentation/servlet/servlet-3.0/library/build.gradle.kts

@@ -4,7 +4,6 @@ plugins {
 
 dependencies {
   compileOnly("javax.servlet:javax.servlet-api:3.0.1")
-  implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
 
   testLibrary("org.eclipse.jetty:jetty-server:8.0.0.v20110901")
   testLibrary("org.eclipse.jetty:jetty-servlet:8.0.0.v20110901")

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/copied/BaseServletHelper.java

@@ -14,7 +14,6 @@
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.LocalRootSpan;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute;
-import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes;
 import java.security.Principal;
 import java.util.function.Function;
 
@@ -132,7 +131,7 @@ private void captureRequestParameters(Span serverSpan, REQUEST request) {
   }
 
   /**
-   * Capture {@link EnduserIncubatingAttributes#ENDUSER_ID} as span attributes when SERVER span is
+   * Capture {@link ServletAdditionalAttributesExtractor#ENDUSER_ID} as span attributes when SERVER span is
    * not create by servlet instrumentation.
    *
    * <p>When SERVER span is created by servlet instrumentation we register {@link
@@ -148,7 +147,7 @@ private void captureEnduserId(Span serverSpan, REQUEST request) {
     if (principal != null) {
       String name = principal.getName();
       if (name != null) {
-        serverSpan.setAttribute(EnduserIncubatingAttributes.ENDUSER_ID, name);
+        serverSpan.setAttribute(ServletAdditionalAttributesExtractor.ENDUSER_ID, name);
       }
     }
   }

instrumentation/servlet/servlet-3.0/library/src/main/java/io/opentelemetry/instrumentation/servlet/v3_0/copied/ServletAdditionalAttributesExtractor.java

@@ -6,12 +6,12 @@
 package io.opentelemetry.instrumentation.servlet.v3_0.copied;
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes;
 import java.security.Principal;
 import javax.annotation.Nullable;
 
@@ -23,6 +23,9 @@ public class ServletAdditionalAttributesExtractor<REQUEST, RESPONSE>
           .getBoolean("otel.instrumentation.servlet.experimental-span-attributes", false);
   private static final AttributeKey<Long> SERVLET_TIMEOUT = longKey("servlet.timeout");
 
+  // copied from EnduserIncubatingAttributes
+  static final AttributeKey<String> ENDUSER_ID = stringKey("enduser.id");
+
   private final ServletAccessor<REQUEST, RESPONSE> accessor;
 
   public ServletAdditionalAttributesExtractor(ServletAccessor<REQUEST, RESPONSE> accessor) {
@@ -48,7 +51,7 @@ public void onEnd(
       if (principal != null) {
         String name = principal.getName();
         if (name != null) {
-          attributes.put(EnduserIncubatingAttributes.ENDUSER_ID, name);
+          attributes.put(ENDUSER_ID, name);
         }
       }
     }