[Breaking] Test 'enduser.id' and 'enduser.pseudo.id' mappings

.github/workflows/build-common.yml

@@ -10,7 +10,7 @@ on:
 env:
   # set this to <repo>:<branch/sha> to build and test with an unreleased
   # version of the azure-monitor-opentelemetry-autoconfigure dependency
-  AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT:
+  AZURE_MONITOR_OPENTELEMETRY_AUTOCONFIGURE_SNAPSHOT: trask/azure-sdk-for-java:session-id
 
 jobs:
   spotless:

agent/instrumentation/applicationinsights-web-2.3/src/main/java/io/opentelemetry/javaagent/instrumentation/applicationinsightsweb/UserContextInstrumentation.java

@@ -43,7 +43,7 @@ public static void methodEnter(
         @Advice.This UserContext userContext, @Advice.Argument(0) String name) {
       Span span = VirtualField.find(UserContext.class, Span.class).get(userContext);
       if (span != null) {
-        span.setAttribute("enduser.id", name);
+        span.setAttribute("enduser.pseudo.id", name);
       }
     }
   }

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

@@ -69,7 +69,7 @@ void setRequestUser() {
                         .hasAttributesSatisfyingExactly(
                             equalTo(CodeIncubatingAttributes.CODE_NAMESPACE, "Code"),
                             equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "setUser"),
-                            equalTo(EnduserIncubatingAttributes.ENDUSER_ID, "myuser")),
+                            equalTo(EnduserIncubatingAttributes.ENDUSER_PSEUDO_ID, "myuser")),
                 span ->
                     span.hasName("Code.internalSetUser")
                         .hasKind(INTERNAL)

smoke-tests/apps/OpenTelemetryApiSupport/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java

@@ -20,6 +20,8 @@ public String testApi() {
     Span.current().setAttribute("myattr1", "myvalue1");
     Span.current().setAttribute("myattr2", "myvalue2");
     Span.current().setAttribute("enduser.id", "myuser");
+    Span.current().setAttribute("enduser.pseudo.id", "mypseudo");
+    Span.current().setAttribute("session.id", "mysession");
     Span.current().updateName("myspanname");
     return "OK!";
   }

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

@@ -54,7 +54,9 @@ void testApi() throws Exception {
         .isEqualTo("testroleinstance");
     assertThat(telemetry.rddEnvelope1.getTags())
         .hasEntrySatisfying("ai.internal.sdkVersion", v -> assertThat(v).startsWith("java:3."));
-    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.id", "myuser");
+    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.authUserId", "myuser");
+    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.user.id", "mypseudo");
+    assertThat(telemetry.rddEnvelope1.getTags()).containsEntry("ai.session.id", "mysession");
 
     SmokeTestExtension.assertParentChild(
         telemetry.rd,

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

@@ -50,7 +50,9 @@ 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");
+    assertThat(telemetry.rdEnvelope.getTags()).containsEntry("ai.session.id", "mysession");
   }
 
   @Test