up

Author: trask

agent/instrumentation/applicationinsights-web-2.3/src/test/java/ApplicationInsightsWebTest.java

@@ -20,7 +20,6 @@
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
-import io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes;
 import javax.annotation.Nullable;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -69,7 +68,7 @@ void setRequestUser() {
                         .hasAttributesSatisfyingExactly(
                             equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, "Code"),
                             equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "setUser"),
-                            equalTo(EnduserIncubatingAttributes.ENDUSER_ID, "myuser")),
+                            equalTo(stringKey("enduser.pseudo.id"), "myuser")),
                 span ->
                     span.hasName("Code.internalSetUser")
                         .hasKind(INTERNAL)

smoke-tests/apps/OpenTelemetryApiSupport/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryApiSupportTest.java

@@ -50,7 +50,8 @@ void testApi() throws Exception {
 
     assertThat(telemetry.rdEnvelope.getTags())
         .hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
-    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.id", "myuser");
+    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.authUserId", "myuser");
+    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.user.id", "mypseudo");
   }
 
   @Test