From 3043d9a6cf2acda9573432d712e4db398442c15d Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 26 Aug 2025 15:30:29 -0700
Subject: [PATCH 1/3] Update 'enduser.id' mapping, add 'enduser.pseudo.id'
 mapping

---
 .../autoconfigure/implementation/SpanDataMapper.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java
index 05c425eaff34..14d169000203 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java
+++ b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SpanDataMapper.java
@@ -889,6 +889,10 @@ private static void addLinks(AbstractTelemetryBuilder telemetryBuilder, List<Lin
 
     static void applyCommonTags(MappingsBuilder mappingsBuilder) {
         mappingsBuilder.exact(SemanticAttributes.ENDUSER_ID.getKey(), (telemetryBuilder, value) -> {
+            if (value instanceof String) {
+                telemetryBuilder.addTag(ContextTagKeys.AI_USER_AUTH_USER_ID.toString(), (String) value);
+            }
+        }).exact(SemanticAttributes.ENDUSER_PSEUDO_ID.getKey(), (telemetryBuilder, value) -> {
             if (value instanceof String) {
                 telemetryBuilder.addTag(ContextTagKeys.AI_USER_ID.toString(), (String) value);
             }

From 53a8800f44db5eba91e2187905df1533a1547056 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Tue, 26 Aug 2025 16:02:36 -0700
Subject: [PATCH 2/3] oops

---
 .../autoconfigure/implementation/SemanticAttributes.java        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SemanticAttributes.java b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SemanticAttributes.java
index 4357a549a99a..4d859ffc63e2 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SemanticAttributes.java
+++ b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/src/main/java/com/azure/monitor/opentelemetry/autoconfigure/implementation/SemanticAttributes.java
@@ -164,6 +164,8 @@ public final class SemanticAttributes {
      */
     public static final AttributeKey<String> ENDUSER_ID = stringKey("enduser.id");
 
+    public static final AttributeKey<String> ENDUSER_PSEUDO_ID = stringKey("enduser.pseudo.id");
+
     /**
      * Actual/assumed role the client is making the request under extracted from token or application
      * security context.

From 71d0ebe4236e4a05787a6f4688e3555200d9ca99 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Wed, 27 Aug 2025 12:23:55 -0700
Subject: [PATCH 3/3] Add change log entries

---
 .../azure-monitor-opentelemetry-autoconfigure/CHANGELOG.md    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/CHANGELOG.md b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/CHANGELOG.md
index 839aafeadfe3..4c8c91068e67 100644
--- a/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/CHANGELOG.md
+++ b/sdk/monitor/azure-monitor-opentelemetry-autoconfigure/CHANGELOG.md
@@ -4,8 +4,12 @@
 
 ### Features Added
 
+- Added mapping for `enduser.pseudo.id` attribute to `user_AuthenticatedId` ([#46506](https://github.com/Azure/azure-sdk-for-java/pull/46506)
+
 ### Breaking Changes
 
+- Updated mapping for `enduser.id` attribute from `user_Id` to `user_AuthenticatedId` ([#46506](https://github.com/Azure/azure-sdk-for-java/pull/46506)
+
 ### Bugs Fixed
 
 ### Other Changes