feat(attributes): Add server_name (deprecated) and sentry.metric.source

javascript/sentry-conventions/src/attributes.ts

@@ -7280,7 +7280,7 @@ export type HTTP_FRAGMENT_TYPE = string;
  * Attribute defined in OTEL: Yes
  * Visibility: public
  *
- * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link CLIENT_ADDRESS} `client.address`, {@link HTTP_SERVER_NAME} `http.server_name`, {@link NET_HOST_NAME} `net.host.name`
+ * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link CLIENT_ADDRESS} `client.address`, {@link HTTP_SERVER_NAME} `http.server_name`, {@link NET_HOST_NAME} `net.host.name`, {@link SERVER_NAME} `server_name`
  *
  * @deprecated Use {@link SERVER_ADDRESS} (server.address) instead - Deprecated, use one of `server.address` or `client.address`, depending on the usage
  * @example "example.com"
@@ -7967,7 +7967,7 @@ export type HTTP_SCHEME_TYPE = string;
  * Attribute defined in OTEL: Yes
  * Visibility: public
  *
- * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link NET_HOST_NAME} `net.host.name`, {@link HTTP_HOST} `http.host`
+ * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link NET_HOST_NAME} `net.host.name`, {@link HTTP_HOST} `http.host`, {@link SERVER_NAME} `server_name`
  *
  * @deprecated Use {@link SERVER_ADDRESS} (server.address) instead
  * @example "example.com"
@@ -10069,7 +10069,7 @@ export type NET_HOST_IP_TYPE = string;
  * Attribute defined in OTEL: Yes
  * Visibility: public
  *
- * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link HTTP_SERVER_NAME} `http.server_name`, {@link HTTP_HOST} `http.host`
+ * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link HTTP_SERVER_NAME} `http.server_name`, {@link HTTP_HOST} `http.host`, {@link SERVER_NAME} `server_name`
  *
  * @deprecated Use {@link SERVER_ADDRESS} (server.address) instead
  * @example "example.com"
@@ -13011,7 +13011,7 @@ export type SENTRY_USER_USERNAME_TYPE = string;
  * Attribute defined in OTEL: Yes
  * Visibility: public
  *
- * Aliases: {@link HTTP_SERVER_NAME} `http.server_name`, {@link NET_HOST_NAME} `net.host.name`, {@link HTTP_HOST} `http.host`
+ * Aliases: {@link HTTP_SERVER_NAME} `http.server_name`, {@link NET_HOST_NAME} `net.host.name`, {@link HTTP_HOST} `http.host`, {@link SERVER_NAME} `server_name`
  *
  * @example "example.com"
  */
@@ -13022,6 +13022,30 @@ export const SERVER_ADDRESS = 'server.address';
  */
 export type SERVER_ADDRESS_TYPE = string;
 
+// Path: model/attributes/server_name.json
+
+/**
+ * Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name. `server_name`
+ *
+ * Attribute Value Type: `string` {@link SERVER_NAME_TYPE}
+ *
+ * Apply Scrubbing: manual
+ *
+ * Attribute defined in OTEL: No
+ * Visibility: public
+ *
+ * Aliases: {@link SERVER_ADDRESS} `server.address`, {@link HTTP_SERVER_NAME} `http.server_name`, {@link NET_HOST_NAME} `net.host.name`, {@link HTTP_HOST} `http.host`
+ *
+ * @deprecated Use {@link SERVER_ADDRESS} (server.address) instead - This attribute is being deprecated in favor of server.address, which is the OTel-aligned replacement.
+ * @example "example.com"
+ */
+export const SERVER_NAME = 'server_name';
+
+/**
+ * Type for {@link SERVER_NAME} server_name
+ */
+export type SERVER_NAME_TYPE = string;
+
 // Path: model/attributes/server/server__port.json
 
 /**
@@ -15594,6 +15618,7 @@ export const ATTRIBUTE_TYPE: Record<string, AttributeType> = {
   'sentry.user.ip': 'string',
   'sentry.user.username': 'string',
   'server.address': 'string',
+  server_name: 'string',
   'server.port': 'integer',
   'service.name': 'string',
   'service.version': 'string',
@@ -16276,6 +16301,7 @@ export type AttributeName =
   | typeof SENTRY_USER_IP
   | typeof SENTRY_USER_USERNAME
   | typeof SERVER_ADDRESS
+  | typeof SERVER_NAME
   | typeof SERVER_PORT
   | typeof SERVICE_NAME
   | typeof SERVICE_VERSION
@@ -20913,7 +20939,7 @@ export const ATTRIBUTE_METADATA: Record<AttributeName, AttributeMetadata> = {
       replacement: 'server.address',
       reason: 'Deprecated, use one of `server.address` or `client.address`, depending on the usage',
     },
-    aliases: ['server.address', 'client.address', 'http.server_name', 'net.host.name'],
+    aliases: ['server.address', 'client.address', 'http.server_name', 'net.host.name', 'server_name'],
     changelog: [{ version: '0.1.0', prs: [61, 108, 127] }, { version: '0.0.0' }],
   },
   'http.method': {
@@ -21318,7 +21344,7 @@ export const ATTRIBUTE_METADATA: Record<AttributeName, AttributeMetadata> = {
     deprecation: {
       replacement: 'server.address',
     },
-    aliases: ['server.address', 'net.host.name', 'http.host'],
+    aliases: ['server.address', 'net.host.name', 'http.host', 'server_name'],
     changelog: [{ version: '0.1.0', prs: [61, 108, 127] }, { version: '0.0.0' }],
   },
   'http.server.request.time_in_queue': {
@@ -22598,7 +22624,7 @@ export const ATTRIBUTE_METADATA: Record<AttributeName, AttributeMetadata> = {
     deprecation: {
       replacement: 'server.address',
     },
-    aliases: ['server.address', 'http.server_name', 'http.host'],
+    aliases: ['server.address', 'http.server_name', 'http.host', 'server_name'],
     changelog: [{ version: '0.1.0', prs: [61, 108, 127] }, { version: '0.0.0' }],
   },
   'net.host.port': {
@@ -24321,9 +24347,26 @@ export const ATTRIBUTE_METADATA: Record<AttributeName, AttributeMetadata> = {
     isInOtel: true,
     visibility: 'public',
     example: 'example.com',
-    aliases: ['http.server_name', 'net.host.name', 'http.host'],
+    aliases: ['http.server_name', 'net.host.name', 'http.host', 'server_name'],
     changelog: [{ version: '0.1.0', prs: [108, 127] }, { version: '0.0.0' }],
   },
+  server_name: {
+    brief:
+      'Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.',
+    type: 'string',
+    applyScrubbing: {
+      key: 'manual',
+    },
+    isInOtel: false,
+    visibility: 'public',
+    example: 'example.com',
+    deprecation: {
+      replacement: 'server.address',
+      reason: 'This attribute is being deprecated in favor of server.address, which is the OTel-aligned replacement.',
+    },
+    aliases: ['server.address', 'http.server_name', 'net.host.name', 'http.host'],
+    changelog: [{ version: 'next', description: 'Added server_name attribute, deprecated in favor of server.address' }],
+  },
   'server.port': {
     brief: 'Server port number.',
     type: 'integer',
@@ -25986,6 +26029,7 @@ export type Attributes = {
   [SENTRY_USER_IP]?: SENTRY_USER_IP_TYPE;
   [SENTRY_USER_USERNAME]?: SENTRY_USER_USERNAME_TYPE;
   [SERVER_ADDRESS]?: SERVER_ADDRESS_TYPE;
+  [SERVER_NAME]?: SERVER_NAME_TYPE;
   [SERVER_PORT]?: SERVER_PORT_TYPE;
   [SERVICE_NAME]?: SERVICE_NAME_TYPE;
   [SERVICE_VERSION]?: SERVICE_VERSION_TYPE;

model/attributes/http/http__host.json

@@ -7,7 +7,7 @@
   },
   "is_in_otel": true,
   "example": "example.com",
-  "alias": ["server.address", "client.address", "http.server_name", "net.host.name"],
+  "alias": ["server.address", "client.address", "http.server_name", "net.host.name", "server_name"],
   "deprecation": {
     "_status": null,
     "replacement": "server.address",

model/attributes/http/http__server_name.json

@@ -7,7 +7,7 @@
   },
   "is_in_otel": true,
   "example": "example.com",
-  "alias": ["server.address", "net.host.name", "http.host"],
+  "alias": ["server.address", "net.host.name", "http.host", "server_name"],
   "deprecation": {
     "_status": null,
     "replacement": "server.address"

model/attributes/net/net__host__name.json

@@ -7,7 +7,7 @@
   },
   "is_in_otel": true,
   "example": "example.com",
-  "alias": ["server.address", "http.server_name", "http.host"],
+  "alias": ["server.address", "http.server_name", "http.host", "server_name"],
   "deprecation": {
     "_status": null,
     "replacement": "server.address"

model/attributes/server/server__address.json

@@ -7,7 +7,7 @@
   },
   "is_in_otel": true,
   "example": "example.com",
-  "alias": ["http.server_name", "net.host.name", "http.host"],
+  "alias": ["http.server_name", "net.host.name", "http.host", "server_name"],
   "visibility": "public",
   "changelog": [
     {

model/attributes/server_name.json

@@ -0,0 +1,24 @@
+{
+  "key": "server_name",
+  "brief": "Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.",
+  "type": "string",
+  "apply_scrubbing": {
+    "key": "manual"
+  },
+  "is_in_otel": false,
+  "example": "example.com",
+  "alias": ["server.address", "http.server_name", "net.host.name", "http.host"],
+  "deprecation": {
+    "_status": "backfill",
+    "replacement": "server.address",
+    "reason": "This attribute is being deprecated in favor of server.address, which is the OTel-aligned replacement."
+  },
+  "visibility": "public",
+  "changelog": [
+    {
+      "version": "next",
+      "prs": [],
+      "description": "Added server_name attribute, deprecated in favor of server.address"
+    }
+  ]
+}

python/src/sentry_conventions/attributes.py

@@ -273,6 +273,7 @@ class _AttributeNamesMeta(type):
         "SENTRY_USER_ID",
         "SENTRY_USER_IP",
         "SENTRY_USER_USERNAME",
+        "SERVER_NAME",
         "TIME_TO_FULL_DISPLAY",
         "TIME_TO_INITIAL_DISPLAY",
         "TRANSACTION",
@@ -4386,7 +4387,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
     Apply Scrubbing: manual
     Defined in OTEL: Yes
     Visibility: public
-    Aliases: server.address, client.address, http.server_name, net.host.name
+    Aliases: server.address, client.address, http.server_name, net.host.name, server_name
     DEPRECATED: Use server.address instead - Deprecated, use one of `server.address` or `client.address`, depending on the usage
     Example: "example.com"
     """
@@ -4805,7 +4806,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
     Apply Scrubbing: manual
     Defined in OTEL: Yes
     Visibility: public
-    Aliases: server.address, net.host.name, http.host
+    Aliases: server.address, net.host.name, http.host, server_name
     DEPRECATED: Use server.address instead
     Example: "example.com"
     """
@@ -5822,7 +5823,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
     Apply Scrubbing: manual
     Defined in OTEL: Yes
     Visibility: public
-    Aliases: server.address, http.server_name, http.host
+    Aliases: server.address, http.server_name, http.host, server_name
     DEPRECATED: Use server.address instead
     Example: "example.com"
     """
@@ -7578,7 +7579,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
     Apply Scrubbing: manual
     Defined in OTEL: Yes
     Visibility: public
-    Aliases: http.server_name, net.host.name, http.host
+    Aliases: http.server_name, net.host.name, http.host, server_name
     Example: "example.com"
     """
 
@@ -7594,6 +7595,19 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
     Example: 1337
     """
 
+    # Path: model/attributes/server_name.json
+    SERVER_NAME: Literal["server_name"] = "server_name"
+    """Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.
+
+    Type: str
+    Apply Scrubbing: manual
+    Defined in OTEL: No
+    Visibility: public
+    Aliases: server.address, http.server_name, net.host.name, http.host
+    DEPRECATED: Use server.address instead - This attribute is being deprecated in favor of server.address, which is the OTel-aligned replacement.
+    Example: "example.com"
+    """
+
     # Path: model/attributes/service/service__name.json
     SERVICE_NAME: Literal["service.name"] = "service.name"
     """Logical name of the service.
@@ -13561,6 +13575,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
             "client.address",
             "http.server_name",
             "net.host.name",
+            "server_name",
         ],
         changelog=[
             ChangelogEntry(version="0.1.0", prs=[61, 108, 127]),
@@ -13997,7 +14012,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
         visibility=Visibility.PUBLIC,
         example="example.com",
         deprecation=DeprecationInfo(replacement="server.address"),
-        aliases=["server.address", "net.host.name", "http.host"],
+        aliases=["server.address", "net.host.name", "http.host", "server_name"],
         changelog=[
             ChangelogEntry(version="0.1.0", prs=[61, 108, 127]),
             ChangelogEntry(version="0.0.0"),
@@ -15193,7 +15208,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
         visibility=Visibility.PUBLIC,
         example="example.com",
         deprecation=DeprecationInfo(replacement="server.address"),
-        aliases=["server.address", "http.server_name", "http.host"],
+        aliases=["server.address", "http.server_name", "http.host", "server_name"],
         changelog=[
             ChangelogEntry(version="0.1.0", prs=[61, 108, 127]),
             ChangelogEntry(version="0.0.0"),
@@ -17108,7 +17123,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
         is_in_otel=True,
         visibility=Visibility.PUBLIC,
         example="example.com",
-        aliases=["http.server_name", "net.host.name", "http.host"],
+        aliases=["http.server_name", "net.host.name", "http.host", "server_name"],
         changelog=[
             ChangelogEntry(version="0.1.0", prs=[108, 127]),
             ChangelogEntry(version="0.0.0"),
@@ -17127,6 +17142,26 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
             ChangelogEntry(version="0.0.0"),
         ],
     ),
+    "server_name": AttributeMetadata(
+        brief="Server domain name if available without reverse DNS lookup; otherwise, IP address or Unix domain socket name.",
+        type=AttributeType.STRING,
+        apply_scrubbing=ApplyScrubbingInfo(key=ApplyScrubbing.MANUAL),
+        is_in_otel=False,
+        visibility=Visibility.PUBLIC,
+        example="example.com",
+        deprecation=DeprecationInfo(
+            replacement="server.address",
+            reason="This attribute is being deprecated in favor of server.address, which is the OTel-aligned replacement.",
+            status=DeprecationStatus.BACKFILL,
+        ),
+        aliases=["server.address", "http.server_name", "net.host.name", "http.host"],
+        changelog=[
+            ChangelogEntry(
+                version="next",
+                description="Added server_name attribute, deprecated in favor of server.address",
+            ),
+        ],
+    ),
     "service.name": AttributeMetadata(
         brief="Logical name of the service.",
         type=AttributeType.STRING,
@@ -18835,6 +18870,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta):
         "sentry.user.username": str,
         "server.address": str,
         "server.port": int,
+        "server_name": str,
         "service.name": str,
         "service.version": str,
         "session.id": str,