ref(core): Use user attribute constants from conventions (#24974)

Uses `USER_ID`, `USER_EMAIL`, `USER_IP_ADDRESS`, and `USER_NAME` from
`@sentry/conventions/attributes`. Deprecates the existing core constants
while preserving their public exports and identical attribute keys;
emitted values and data-collection behavior remain unchanged.
`USER_NAME` still maps the existing username to `user.name`.

Part of #24961 / [JS-3868](https://linear.app/getsentry/issue/JS-3868).

Co-authored-by: GPT-6 <codex@openai.com>

Author: nicohrubec

packages/core/src/integrations/requestdata.ts

@@ -1,7 +1,6 @@
 import type { Client } from '../client';
 import { getIsolationScope } from '../currentScopes';
 import { defineIntegration } from '../integration';
-import { SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS } from '../semanticAttributes';
 import type { SdkProcessingMetadata } from '../scope';
 import type { CollectBehavior, ResolvedDataCollection } from '../types/datacollection';
 import type { Event } from '../types/event';
@@ -19,7 +18,7 @@ import { getUrlQuery } from '../utils/url';
 import { getClientIPAddress } from '../utils/clientIPAddress';
 import { ipHeaderNames } from '../vendor/getIpAddress';
 import { safeSetSpanJSONAttributes } from '../tracing/spans/captureSpan';
-import { SENTRY_IS_LOCALHOST, URL_FULL, URL_QUERY } from '@sentry/conventions/attributes';
+import { SENTRY_IS_LOCALHOST, URL_FULL, URL_QUERY, USER_IP_ADDRESS } from '@sentry/conventions/attributes';
 
 type RequestDataIncludeOptions = {
   cookies?: boolean;
@@ -262,7 +261,7 @@ function addNormalizedRequestDataToSpan(
   if (include.ip) {
     const ip = (normalizedRequest.headers && getClientIPAddress(normalizedRequest.headers)) || ipAddress || undefined;
     if (ip) {
-      safeSetSpanJSONAttributes(span, { [SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS]: ip });
+      safeSetSpanJSONAttributes(span, { [USER_IP_ADDRESS]: ip });
     }
   }
 }

packages/core/src/semanticAttributes.ts

@@ -74,13 +74,25 @@ export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_VERSION = 'sentry.sdk.version';
 /** The list of integrations enabled in the Sentry SDK (e.g., ["EventFilters", "BrowserTracing"]) */
 export const SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS = 'sentry.sdk.integrations';
 
-/** The user ID */
+/**
+ * The user ID
+ * @deprecated Use `USER_ID` from `@sentry/conventions/attributes` instead.
+ */
 export const SEMANTIC_ATTRIBUTE_USER_ID = 'user.id';
-/** The user email */
+/**
+ * The user email
+ * @deprecated Use `USER_EMAIL` from `@sentry/conventions/attributes` instead.
+ */
 export const SEMANTIC_ATTRIBUTE_USER_EMAIL = 'user.email';
-/** The user IP address */
+/**
+ * The user IP address
+ * @deprecated Use `USER_IP_ADDRESS` from `@sentry/conventions/attributes` instead.
+ */
 export const SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS = 'user.ip_address';
-/** The user username */
+/**
+ * The user username
+ * @deprecated Use `USER_NAME` from `@sentry/conventions/attributes` instead.
+ */
 export const SEMANTIC_ATTRIBUTE_USER_USERNAME = 'user.name';
 
 /**

packages/core/src/tracing/spans/captureSpan.ts

@@ -5,10 +5,6 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT,
   SEMANTIC_ATTRIBUTE_SENTRY_RELEASE,
   SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
-  SEMANTIC_ATTRIBUTE_USER_EMAIL,
-  SEMANTIC_ATTRIBUTE_USER_ID,
-  SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS,
-  SEMANTIC_ATTRIBUTE_USER_USERNAME,
 } from '../../semanticAttributes';
 import type { SerializedStreamedSpan, Span, SpanAttributeValue, SpanJSON, StreamedSpanJSON } from '../../types/span';
 import { getCombinedScopeData } from '../../utils/scopeData';
@@ -29,6 +25,10 @@ import {
   SENTRY_SEGMENT_ID,
   SENTRY_SEGMENT_NAME,
   SENTRY_TRACE_LIFECYCLE,
+  USER_EMAIL,
+  USER_ID,
+  USER_IP_ADDRESS,
+  USER_NAME,
 } from '@sentry/conventions/attributes';
 
 export type SerializedStreamedSpanWithSegmentSpan = SerializedStreamedSpan & {
@@ -138,10 +138,10 @@ function commonSpanAttributes(
     [SENTRY_SDK_VERSION]: sdk?.sdk?.version,
     [SEMANTIC_ATTRIBUTE_SENTRY_RELEASE]: release,
     [SEMANTIC_ATTRIBUTE_SENTRY_ENVIRONMENT]: environment || DEFAULT_ENVIRONMENT,
-    [SEMANTIC_ATTRIBUTE_USER_ID]: scopeData.user?.id,
-    [SEMANTIC_ATTRIBUTE_USER_EMAIL]: scopeData.user?.email,
-    [SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS]: scopeData.user?.ip_address,
-    [SEMANTIC_ATTRIBUTE_USER_USERNAME]: scopeData.user?.username,
+    [USER_ID]: scopeData.user?.id,
+    [USER_EMAIL]: scopeData.user?.email,
+    [USER_IP_ADDRESS]: scopeData.user?.ip_address,
+    [USER_NAME]: scopeData.user?.username,
     ...(includeScopeAttributes ? scopeData.attributes : undefined),
   };
 }

packages/core/test/lib/tracing/spans/captureSpan.test.ts

@@ -9,10 +9,6 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_RELEASE,
   SEMANTIC_ATTRIBUTE_SENTRY_SAMPLE_RATE,
   SEMANTIC_ATTRIBUTE_SENTRY_SDK_INTEGRATIONS,
-  SEMANTIC_ATTRIBUTE_USER_EMAIL,
-  SEMANTIC_ATTRIBUTE_USER_ID,
-  SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS,
-  SEMANTIC_ATTRIBUTE_USER_USERNAME,
   spanStreamingIntegration,
   startInactiveSpan,
   startSpan,
@@ -33,6 +29,10 @@ import {
   SENTRY_SEGMENT_NAME,
   SENTRY_SEGMENT_NAME_SOURCE,
   SENTRY_TRACE_LIFECYCLE,
+  USER_EMAIL,
+  USER_ID,
+  USER_IP_ADDRESS,
+  USER_NAME,
 } from '@sentry/conventions/attributes';
 
 describe('captureSpan', () => {
@@ -109,19 +109,19 @@ describe('captureSpan', () => {
           value: 'staging',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_ID]: {
+        [USER_ID]: {
           value: '123',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_EMAIL]: {
+        [USER_EMAIL]: {
           value: 'user@example.com',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_USERNAME]: {
+        [USER_NAME]: {
           value: 'testuser',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS]: {
+        [USER_IP_ADDRESS]: {
           value: '127.0.0.1',
           type: 'string',
         },
@@ -217,19 +217,19 @@ describe('captureSpan', () => {
           value: '1.0.0',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_ID]: {
+        [USER_ID]: {
           value: '123',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_EMAIL]: {
+        [USER_EMAIL]: {
           value: 'user@example.com',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_USERNAME]: {
+        [USER_NAME]: {
           value: 'testuser',
           type: 'string',
         },
-        [SEMANTIC_ATTRIBUTE_USER_IP_ADDRESS]: {
+        [USER_IP_ADDRESS]: {
           value: '127.0.0.1',
           type: 'string',
         },