From 27b8af661db511c63eee3eaad668a785e9f59332 Mon Sep 17 00:00:00 2001
From: Trask Stalnaker <trask.stalnaker@gmail.com>
Date: Thu, 28 Aug 2025 12:11:48 -0700
Subject: [PATCH] Add mapping for session.id

---
 .../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 14d169000203..3d1768cb68b6 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
@@ -896,6 +896,10 @@ static void applyCommonTags(MappingsBuilder mappingsBuilder) {
             if (value instanceof String) {
                 telemetryBuilder.addTag(ContextTagKeys.AI_USER_ID.toString(), (String) value);
             }
+        }).exact(SemanticAttributes.SESSION_ID.getKey(), (telemetryBuilder, value) -> {
+            if (value instanceof String) {
+                telemetryBuilder.addTag(ContextTagKeys.AI_SESSION_ID.toString(), (String) value);
+            }
         }).exact(AiSemanticAttributes.PREVIEW_APPLICATION_VERSION.getKey(), (telemetryBuilder, value) -> {
             if (value instanceof String) {
                 telemetryBuilder.addTag(ContextTagKeys.AI_APPLICATION_VER.toString(), (String) value);