From 823fddf17b6d3d35b03fbb1d579037bae7d56151 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 6 Mar 2026 11:36:33 +0100 Subject: [PATCH 1/5] feat(attributes): Add network connection-related attributes --- model/attributes/connectionType.json | 23 +++++++++++++++++++ .../network/network__connection__type.json | 16 +++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 model/attributes/connectionType.json create mode 100644 model/attributes/network/network__connection__type.json diff --git a/model/attributes/connectionType.json b/model/attributes/connectionType.json new file mode 100644 index 00000000..1f52485d --- /dev/null +++ b/model/attributes/connectionType.json @@ -0,0 +1,23 @@ +{ + "key": "connectionType", + "brief": "type of current connection (e.g. wifi, ethernet, cellular , etc).", + "type": "string", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": "wifi", + "sdks": ["javascript-browser"], + "alias": ["network.connection.type"], + "deprecation": { + "replacement": "network.connection.type", + "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future" + }, + "changelog": [ + { + "version": "next", + "prs": [278], + "description": "Added and deprecated attribute to document JS SDK's current behaviour" + } + ] +} diff --git a/model/attributes/network/network__connection__type.json b/model/attributes/network/network__connection__type.json new file mode 100644 index 00000000..6d4935f2 --- /dev/null +++ b/model/attributes/network/network__connection__type.json @@ -0,0 +1,16 @@ +{ + "key": "network.connection.type", + "brief": "Specifies the type of the current connection", + "type": "string", + "pii": { + "key": "maybe" + }, + "is_in_otel": true, + "example": "wifi", + "alias": [ + "connectionType" + ], + "sdks": [ + "javascript-browser" + ] +} From a0c8036e3d66261854756669fbc800832d5d110e Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 6 Mar 2026 11:41:28 +0100 Subject: [PATCH 2/5] generate --- .../sentry-conventions/src/attributes.ts | 91 +++++++++++++++++++ model/attributes/connectionType.json | 7 +- .../network/network__connection__type.json | 15 +-- python/src/sentry_conventions/attributes.py | 65 +++++++++++++ shared/deprecated_attributes.json | 18 ++++ 5 files changed, 187 insertions(+), 9 deletions(-) diff --git a/javascript/sentry-conventions/src/attributes.ts b/javascript/sentry-conventions/src/attributes.ts index 1a494122..e72bb124 100644 --- a/javascript/sentry-conventions/src/attributes.ts +++ b/javascript/sentry-conventions/src/attributes.ts @@ -1633,6 +1633,29 @@ export const CODE_NAMESPACE = 'code.namespace'; */ export type CODE_NAMESPACE_TYPE = string; +// Path: model/attributes/connectionType.json + +/** + * Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc). `connectionType` + * + * Attribute Value Type: `string` {@link CONNECTIONTYPE_TYPE} + * + * Contains PII: maybe + * + * Attribute defined in OTEL: No + * + * Aliases: {@link NETWORK_CONNECTION_TYPE} `network.connection.type` + * + * @deprecated Use {@link NETWORK_CONNECTION_TYPE} (network.connection.type) instead - Old namespace-less attribute, to be replaced with network.connection.type with span-first future + * @example "wifi" + */ +export const CONNECTIONTYPE = 'connectionType'; + +/** + * Type for {@link CONNECTIONTYPE} connectionType + */ +export type CONNECTIONTYPE_TYPE = string; + // Path: model/attributes/culture/culture__calendar.json /** @@ -6007,6 +6030,28 @@ export const NEL_TYPE = 'nel.type'; */ export type NEL_TYPE_TYPE = string; +// Path: model/attributes/network/network__connection__type.json + +/** + * Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc). `network.connection.type` + * + * Attribute Value Type: `string` {@link NETWORK_CONNECTION_TYPE_TYPE} + * + * Contains PII: maybe + * + * Attribute defined in OTEL: Yes + * + * Aliases: {@link CONNECTIONTYPE} `connectionType` + * + * @example "wifi" + */ +export const NETWORK_CONNECTION_TYPE = 'network.connection.type'; + +/** + * Type for {@link NETWORK_CONNECTION_TYPE} network.connection.type + */ +export type NETWORK_CONNECTION_TYPE_TYPE = string; + // Path: model/attributes/network/network__local__address.json /** @@ -9917,6 +9962,7 @@ export const ATTRIBUTE_TYPE: Record = { [CODE_LINENO]: 'integer', [CODE_LINE_NUMBER]: 'integer', [CODE_NAMESPACE]: 'string', + [CONNECTIONTYPE]: 'string', [CULTURE_CALENDAR]: 'string', [CULTURE_DISPLAY_NAME]: 'string', [CULTURE_IS_24_HOUR_FORMAT]: 'boolean', @@ -10126,6 +10172,7 @@ export const ATTRIBUTE_TYPE: Record = { [NEL_REFERRER]: 'string', [NEL_SAMPLING_FUNCTION]: 'double', [NEL_TYPE]: 'string', + [NETWORK_CONNECTION_TYPE]: 'string', [NETWORK_LOCAL_ADDRESS]: 'string', [NETWORK_LOCAL_PORT]: 'integer', [NETWORK_PEER_ADDRESS]: 'string', @@ -10387,6 +10434,7 @@ export type AttributeName = | typeof CODE_LINENO | typeof CODE_LINE_NUMBER | typeof CODE_NAMESPACE + | typeof CONNECTIONTYPE | typeof CULTURE_CALENDAR | typeof CULTURE_DISPLAY_NAME | typeof CULTURE_IS_24_HOUR_FORMAT @@ -10596,6 +10644,7 @@ export type AttributeName = | typeof NEL_REFERRER | typeof NEL_SAMPLING_FUNCTION | typeof NEL_TYPE + | typeof NETWORK_CONNECTION_TYPE | typeof NETWORK_LOCAL_ADDRESS | typeof NETWORK_LOCAL_PORT | typeof NETWORK_PEER_ADDRESS @@ -11790,6 +11839,28 @@ export const ATTRIBUTE_METADATA: Record = { }, changelog: [{ version: '0.1.0', prs: [61, 74] }, { version: '0.0.0' }], }, + [CONNECTIONTYPE]: { + brief: 'Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).', + type: 'string', + pii: { + isPii: 'maybe', + }, + isInOtel: false, + example: 'wifi', + deprecation: { + replacement: 'network.connection.type', + reason: 'Old namespace-less attribute, to be replaced with network.connection.type with span-first future', + }, + aliases: [NETWORK_CONNECTION_TYPE], + sdks: ['javascript-browser'], + changelog: [ + { + version: 'next', + prs: [279], + description: "Added and deprecated attribute to document JS SDK's current behaviour", + }, + ], + }, [CULTURE_CALENDAR]: { brief: 'The calendar system used by the culture.', type: 'string', @@ -14383,6 +14454,24 @@ export const ATTRIBUTE_METADATA: Record = { example: 'dns.unreachable', changelog: [{ version: '0.1.0', prs: [68, 127] }], }, + [NETWORK_CONNECTION_TYPE]: { + brief: 'Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).', + type: 'string', + pii: { + isPii: 'maybe', + }, + isInOtel: true, + example: 'wifi', + aliases: [CONNECTIONTYPE], + sdks: ['javascript-browser'], + changelog: [ + { + version: 'next', + prs: [278], + description: 'Added attribute network.connection.type to be used instead of connectionType', + }, + ], + }, [NETWORK_LOCAL_ADDRESS]: { brief: 'Local address of the network connection - IP address or Unix domain socket name.', type: 'string', @@ -16497,6 +16586,7 @@ export type Attributes = { [CODE_LINENO]?: CODE_LINENO_TYPE; [CODE_LINE_NUMBER]?: CODE_LINE_NUMBER_TYPE; [CODE_NAMESPACE]?: CODE_NAMESPACE_TYPE; + [CONNECTIONTYPE]?: CONNECTIONTYPE_TYPE; [CULTURE_CALENDAR]?: CULTURE_CALENDAR_TYPE; [CULTURE_DISPLAY_NAME]?: CULTURE_DISPLAY_NAME_TYPE; [CULTURE_IS_24_HOUR_FORMAT]?: CULTURE_IS_24_HOUR_FORMAT_TYPE; @@ -16706,6 +16796,7 @@ export type Attributes = { [NEL_REFERRER]?: NEL_REFERRER_TYPE; [NEL_SAMPLING_FUNCTION]?: NEL_SAMPLING_FUNCTION_TYPE; [NEL_TYPE]?: NEL_TYPE_TYPE; + [NETWORK_CONNECTION_TYPE]?: NETWORK_CONNECTION_TYPE_TYPE; [NETWORK_LOCAL_ADDRESS]?: NETWORK_LOCAL_ADDRESS_TYPE; [NETWORK_LOCAL_PORT]?: NETWORK_LOCAL_PORT_TYPE; [NETWORK_PEER_ADDRESS]?: NETWORK_PEER_ADDRESS_TYPE; diff --git a/model/attributes/connectionType.json b/model/attributes/connectionType.json index 1f52485d..fc9c3b0d 100644 --- a/model/attributes/connectionType.json +++ b/model/attributes/connectionType.json @@ -1,6 +1,6 @@ { "key": "connectionType", - "brief": "type of current connection (e.g. wifi, ethernet, cellular , etc).", + "brief": "Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", "type": "string", "pii": { "key": "maybe" @@ -11,12 +11,13 @@ "alias": ["network.connection.type"], "deprecation": { "replacement": "network.connection.type", - "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future" + "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future", + "_status": "backfill" }, "changelog": [ { "version": "next", - "prs": [278], + "prs": [279], "description": "Added and deprecated attribute to document JS SDK's current behaviour" } ] diff --git a/model/attributes/network/network__connection__type.json b/model/attributes/network/network__connection__type.json index 6d4935f2..b567d3e0 100644 --- a/model/attributes/network/network__connection__type.json +++ b/model/attributes/network/network__connection__type.json @@ -1,16 +1,19 @@ { "key": "network.connection.type", - "brief": "Specifies the type of the current connection", + "brief": "Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", "type": "string", "pii": { "key": "maybe" }, "is_in_otel": true, "example": "wifi", - "alias": [ - "connectionType" - ], - "sdks": [ - "javascript-browser" + "alias": ["connectionType"], + "sdks": ["javascript-browser"], + "changelog": [ + { + "version": "next", + "prs": [278], + "description": "Added attribute network.connection.type to be used instead of connectionType" + } ] } diff --git a/python/src/sentry_conventions/attributes.py b/python/src/sentry_conventions/attributes.py index ed893549..ab6354d2 100644 --- a/python/src/sentry_conventions/attributes.py +++ b/python/src/sentry_conventions/attributes.py @@ -142,6 +142,7 @@ class _AttributeNamesMeta(type): "CODE_FUNCTION", "CODE_LINENO", "CODE_NAMESPACE", + "CONNECTIONTYPE", "DB_NAME", "DB_OPERATION", "DB_SQL_BINDINGS", @@ -1106,6 +1107,18 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "http.handler" """ + # Path: model/attributes/connectionType.json + CONNECTIONTYPE: Literal["connectionType"] = "connectionType" + """Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc). + + Type: str + Contains PII: maybe + Defined in OTEL: No + Aliases: network.connection.type + DEPRECATED: Use network.connection.type instead - Old namespace-less attribute, to be replaced with network.connection.type with span-first future + Example: "wifi" + """ + # Path: model/attributes/culture/culture__calendar.json CULTURE_CALENDAR: Literal["culture.calendar"] = "culture.calendar" """The calendar system used by the culture. @@ -3638,6 +3651,19 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "tcp" """ + # Path: model/attributes/network/network__connection__type.json + NETWORK_CONNECTION_TYPE: Literal["network.connection.type"] = ( + "network.connection.type" + ) + """Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc). + + Type: str + Contains PII: maybe + Defined in OTEL: Yes + Aliases: connectionType + Example: "wifi" + """ + # Path: model/attributes/network/network__local__address.json NETWORK_LOCAL_ADDRESS: Literal["network.local.address"] = "network.local.address" """Local address of the network connection - IP address or Unix domain socket name. @@ -6387,6 +6413,27 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.0.0"), ], ), + "connectionType": AttributeMetadata( + brief="Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", + type=AttributeType.STRING, + pii=PiiInfo(isPii=IsPii.MAYBE), + is_in_otel=False, + example="wifi", + deprecation=DeprecationInfo( + replacement="network.connection.type", + reason="Old namespace-less attribute, to be replaced with network.connection.type with span-first future", + status=DeprecationStatus.BACKFILL, + ), + aliases=["network.connection.type"], + sdks=["javascript-browser"], + changelog=[ + ChangelogEntry( + version="next", + prs=[279], + description="Added and deprecated attribute to document JS SDK's current behaviour", + ), + ], + ), "culture.calendar": AttributeMetadata( brief="The calendar system used by the culture.", type=AttributeType.STRING, @@ -9118,6 +9165,22 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.0.0"), ], ), + "network.connection.type": AttributeMetadata( + brief="Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", + type=AttributeType.STRING, + pii=PiiInfo(isPii=IsPii.MAYBE), + is_in_otel=True, + example="wifi", + aliases=["connectionType"], + sdks=["javascript-browser"], + changelog=[ + ChangelogEntry( + version="next", + prs=[278], + description="Added attribute network.connection.type to be used instead of connectionType", + ), + ], + ), "network.local.address": AttributeMetadata( brief="Local address of the network connection - IP address or Unix domain socket name.", type=AttributeType.STRING, @@ -11059,6 +11122,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "code.line.number": int, "code.lineno": int, "code.namespace": str, + "connectionType": str, "culture.calendar": str, "culture.display_name": str, "culture.is_24_hour_format": bool, @@ -11283,6 +11347,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "net.sock.peer.name": str, "net.sock.peer.port": int, "net.transport": str, + "network.connection.type": str, "network.local.address": str, "network.local.port": int, "network.peer.address": str, diff --git a/shared/deprecated_attributes.json b/shared/deprecated_attributes.json index 9830d7fe..41c909cb 100644 --- a/shared/deprecated_attributes.json +++ b/shared/deprecated_attributes.json @@ -2,6 +2,7 @@ "_generated": "This file is generated. Do not modify it directly. See scripts/generate_deprecated_attributes_json.ts", "attributes": [ { +<<<<<<< HEAD "key": "cls", "brief": "The value of the recorded Cumulative Layout Shift (CLS) web vital", "type": "double", @@ -28,23 +29,40 @@ { "key": "deviceMemory", "brief": "The estimated total memory capacity of the device, only a rough estimation in gigabytes.", +======= + "key": "connectionType", + "brief": "Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", +>>>>>>> f93f9c6 (generate) "type": "string", "pii": { "key": "maybe" }, "is_in_otel": false, +<<<<<<< HEAD "example": "8 GB", "sdks": ["javascript-browser"], "alias": ["device.memory.estimated_capacity"], "deprecation": { "replacement": "device.memory.estimated_capacity", "reason": "Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future", +======= + "example": "wifi", + "sdks": ["javascript-browser"], + "alias": ["network.connection.type"], + "deprecation": { + "replacement": "network.connection.type", + "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future", +>>>>>>> f93f9c6 (generate) "_status": "backfill" }, "changelog": [ { "version": "next", +<<<<<<< HEAD "prs": [281], +======= + "prs": [279], +>>>>>>> f93f9c6 (generate) "description": "Added and deprecated attribute to document JS SDK's current behaviour" } ] From 007228ae11ca8831820610cff81b6ef285463c79 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 6 Mar 2026 11:45:01 +0100 Subject: [PATCH 3/5] . --- model/attributes/network/network__connection__type.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/attributes/network/network__connection__type.json b/model/attributes/network/network__connection__type.json index b567d3e0..aa317812 100644 --- a/model/attributes/network/network__connection__type.json +++ b/model/attributes/network/network__connection__type.json @@ -12,7 +12,7 @@ "changelog": [ { "version": "next", - "prs": [278], + "prs": [279], "description": "Added attribute network.connection.type to be used instead of connectionType" } ] From 04be27ab1a707b7e6d58804e2dcf233713743028 Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Fri, 6 Mar 2026 12:00:54 +0100 Subject: [PATCH 4/5] add attributes --- .../sentry-conventions/src/attributes.ts | 190 +++++++++++++++++- .../connection/connection__rtt.json | 24 +++ model/attributes/connectionType.json | 2 +- model/attributes/effectiveConnectionType.json | 24 +++ .../network__connection__effective_type.json | 19 ++ .../network/network__connection__rtt.json | 19 ++ python/src/sentry_conventions/attributes.py | 140 ++++++++++++- shared/deprecated_attributes.json | 52 +++++ 8 files changed, 463 insertions(+), 7 deletions(-) create mode 100644 model/attributes/connection/connection__rtt.json create mode 100644 model/attributes/effectiveConnectionType.json create mode 100644 model/attributes/network/network__connection__effective_type.json create mode 100644 model/attributes/network/network__connection__rtt.json diff --git a/javascript/sentry-conventions/src/attributes.ts b/javascript/sentry-conventions/src/attributes.ts index e72bb124..86756659 100644 --- a/javascript/sentry-conventions/src/attributes.ts +++ b/javascript/sentry-conventions/src/attributes.ts @@ -1646,7 +1646,7 @@ export type CODE_NAMESPACE_TYPE = string; * * Aliases: {@link NETWORK_CONNECTION_TYPE} `network.connection.type` * - * @deprecated Use {@link NETWORK_CONNECTION_TYPE} (network.connection.type) instead - Old namespace-less attribute, to be replaced with network.connection.type with span-first future + * @deprecated Use {@link NETWORK_CONNECTION_TYPE} (network.connection.type) instead - Old namespace-less attribute, to be replaced with network.connection.type for span-first future * @example "wifi" */ export const CONNECTIONTYPE = 'connectionType'; @@ -1656,6 +1656,29 @@ export const CONNECTIONTYPE = 'connectionType'; */ export type CONNECTIONTYPE_TYPE = string; +// Path: model/attributes/connection/connection__rtt.json + +/** + * Specifies the estimated effective round-trip time of the current connection, in milliseconds. `connection.rtt` + * + * Attribute Value Type: `number` {@link CONNECTION_RTT_TYPE} + * + * Contains PII: maybe + * + * Attribute defined in OTEL: No + * + * Aliases: {@link NETWORK_CONNECTION_RTT} `network.connection.rtt` + * + * @deprecated Use {@link NETWORK_CONNECTION_RTT} (network.connection.rtt) instead - Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future + * @example 100 + */ +export const CONNECTION_RTT = 'connection.rtt'; + +/** + * Type for {@link CONNECTION_RTT} connection.rtt + */ +export type CONNECTION_RTT_TYPE = number; + // Path: model/attributes/culture/culture__calendar.json /** @@ -2206,6 +2229,29 @@ export const DEVICE_MODEL = 'device.model'; */ export type DEVICE_MODEL_TYPE = string; +// Path: model/attributes/effectiveConnectionType.json + +/** + * Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g). `effectiveConnectionType` + * + * Attribute Value Type: `string` {@link EFFECTIVECONNECTIONTYPE_TYPE} + * + * Contains PII: maybe + * + * Attribute defined in OTEL: No + * + * Aliases: {@link NETWORK_CONNECTION_EFFECTIVE_TYPE} `network.connection.effective_type` + * + * @deprecated Use {@link NETWORK_CONNECTION_EFFECTIVE_TYPE} (network.connection.effective_type) instead - Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future + * @example "4g" + */ +export const EFFECTIVECONNECTIONTYPE = 'effectiveConnectionType'; + +/** + * Type for {@link EFFECTIVECONNECTIONTYPE} effectiveConnectionType + */ +export type EFFECTIVECONNECTIONTYPE_TYPE = string; + // Path: model/attributes/environment.json /** @@ -6030,6 +6076,50 @@ export const NEL_TYPE = 'nel.type'; */ export type NEL_TYPE_TYPE = string; +// Path: model/attributes/network/network__connection__effective_type.json + +/** + * Specifies the effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g). `network.connection.effective_type` + * + * Attribute Value Type: `string` {@link NETWORK_CONNECTION_EFFECTIVE_TYPE_TYPE} + * + * Contains PII: maybe + * + * Attribute defined in OTEL: No + * + * Aliases: {@link EFFECTIVECONNECTIONTYPE} `effectiveConnectionType` + * + * @example "4g" + */ +export const NETWORK_CONNECTION_EFFECTIVE_TYPE = 'network.connection.effective_type'; + +/** + * Type for {@link NETWORK_CONNECTION_EFFECTIVE_TYPE} network.connection.effective_type + */ +export type NETWORK_CONNECTION_EFFECTIVE_TYPE_TYPE = string; + +// Path: model/attributes/network/network__connection__rtt.json + +/** + * Specifies the estimated effective round-trip time of the current connection, in milliseconds. `network.connection.rtt` + * + * Attribute Value Type: `number` {@link NETWORK_CONNECTION_RTT_TYPE} + * + * Contains PII: maybe + * + * Attribute defined in OTEL: No + * + * Aliases: {@link CONNECTION_RTT} `connection.rtt` + * + * @example 100 + */ +export const NETWORK_CONNECTION_RTT = 'network.connection.rtt'; + +/** + * Type for {@link NETWORK_CONNECTION_RTT} network.connection.rtt + */ +export type NETWORK_CONNECTION_RTT_TYPE = number; + // Path: model/attributes/network/network__connection__type.json /** @@ -9963,6 +10053,7 @@ export const ATTRIBUTE_TYPE: Record = { [CODE_LINE_NUMBER]: 'integer', [CODE_NAMESPACE]: 'string', [CONNECTIONTYPE]: 'string', + [CONNECTION_RTT]: 'integer', [CULTURE_CALENDAR]: 'string', [CULTURE_DISPLAY_NAME]: 'string', [CULTURE_IS_24_HOUR_FORMAT]: 'boolean', @@ -9989,6 +10080,7 @@ export const ATTRIBUTE_TYPE: Record = { [DEVICE_FAMILY]: 'string', [DEVICE_MEMORY_ESTIMATED_CAPACITY]: 'integer', [DEVICE_MODEL]: 'string', + [EFFECTIVECONNECTIONTYPE]: 'string', [ENVIRONMENT]: 'string', [ERROR_TYPE]: 'string', [EVENT_ID]: 'integer', @@ -10172,6 +10264,8 @@ export const ATTRIBUTE_TYPE: Record = { [NEL_REFERRER]: 'string', [NEL_SAMPLING_FUNCTION]: 'double', [NEL_TYPE]: 'string', + [NETWORK_CONNECTION_EFFECTIVE_TYPE]: 'string', + [NETWORK_CONNECTION_RTT]: 'integer', [NETWORK_CONNECTION_TYPE]: 'string', [NETWORK_LOCAL_ADDRESS]: 'string', [NETWORK_LOCAL_PORT]: 'integer', @@ -10435,6 +10529,7 @@ export type AttributeName = | typeof CODE_LINE_NUMBER | typeof CODE_NAMESPACE | typeof CONNECTIONTYPE + | typeof CONNECTION_RTT | typeof CULTURE_CALENDAR | typeof CULTURE_DISPLAY_NAME | typeof CULTURE_IS_24_HOUR_FORMAT @@ -10461,6 +10556,7 @@ export type AttributeName = | typeof DEVICE_FAMILY | typeof DEVICE_MEMORY_ESTIMATED_CAPACITY | typeof DEVICE_MODEL + | typeof EFFECTIVECONNECTIONTYPE | typeof ENVIRONMENT | typeof ERROR_TYPE | typeof EVENT_ID @@ -10644,6 +10740,8 @@ export type AttributeName = | typeof NEL_REFERRER | typeof NEL_SAMPLING_FUNCTION | typeof NEL_TYPE + | typeof NETWORK_CONNECTION_EFFECTIVE_TYPE + | typeof NETWORK_CONNECTION_RTT | typeof NETWORK_CONNECTION_TYPE | typeof NETWORK_LOCAL_ADDRESS | typeof NETWORK_LOCAL_PORT @@ -11849,7 +11947,7 @@ export const ATTRIBUTE_METADATA: Record = { example: 'wifi', deprecation: { replacement: 'network.connection.type', - reason: 'Old namespace-less attribute, to be replaced with network.connection.type with span-first future', + reason: 'Old namespace-less attribute, to be replaced with network.connection.type for span-first future', }, aliases: [NETWORK_CONNECTION_TYPE], sdks: ['javascript-browser'], @@ -11861,6 +11959,29 @@ export const ATTRIBUTE_METADATA: Record = { }, ], }, + [CONNECTION_RTT]: { + brief: 'Specifies the estimated effective round-trip time of the current connection, in milliseconds.', + type: 'integer', + pii: { + isPii: 'maybe', + }, + isInOtel: false, + example: 100, + deprecation: { + replacement: 'network.connection.rtt', + reason: + 'Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future', + }, + aliases: [NETWORK_CONNECTION_RTT], + sdks: ['javascript-browser'], + changelog: [ + { + version: 'next', + prs: [279], + description: "Added and deprecated attribute to document JS SDK's current behaviour", + }, + ], + }, [CULTURE_CALENDAR]: { brief: 'The calendar system used by the culture.', type: 'string', @@ -12185,6 +12306,29 @@ export const ATTRIBUTE_METADATA: Record = { example: 'iPhone 15 Pro Max', changelog: [{ version: '0.1.0', prs: [116, 127] }], }, + [EFFECTIVECONNECTIONTYPE]: { + brief: 'Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).', + type: 'string', + pii: { + isPii: 'maybe', + }, + isInOtel: false, + example: '4g', + deprecation: { + replacement: 'network.connection.effective_type', + reason: + 'Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future', + }, + aliases: [NETWORK_CONNECTION_EFFECTIVE_TYPE], + sdks: ['javascript-browser'], + changelog: [ + { + version: 'next', + prs: [279], + description: "Added and deprecated attribute to document JS SDK's current behaviour", + }, + ], + }, [ENVIRONMENT]: { brief: 'The sentry environment.', type: 'string', @@ -14454,6 +14598,42 @@ export const ATTRIBUTE_METADATA: Record = { example: 'dns.unreachable', changelog: [{ version: '0.1.0', prs: [68, 127] }], }, + [NETWORK_CONNECTION_EFFECTIVE_TYPE]: { + brief: 'Specifies the effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).', + type: 'string', + pii: { + isPii: 'maybe', + }, + isInOtel: false, + example: '4g', + aliases: [EFFECTIVECONNECTIONTYPE], + sdks: ['javascript-browser'], + changelog: [ + { + version: 'next', + prs: [279], + description: 'Added attribute network.connection.effective_type to be used instead of effectiveConnectionType', + }, + ], + }, + [NETWORK_CONNECTION_RTT]: { + brief: 'Specifies the estimated effective round-trip time of the current connection, in milliseconds.', + type: 'integer', + pii: { + isPii: 'maybe', + }, + isInOtel: false, + example: 100, + aliases: [CONNECTION_RTT], + sdks: ['javascript-browser'], + changelog: [ + { + version: 'next', + prs: [279], + description: 'Added attribute network.connection.rtt to be used instead of connection.rtt', + }, + ], + }, [NETWORK_CONNECTION_TYPE]: { brief: 'Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).', type: 'string', @@ -14467,7 +14647,7 @@ export const ATTRIBUTE_METADATA: Record = { changelog: [ { version: 'next', - prs: [278], + prs: [279], description: 'Added attribute network.connection.type to be used instead of connectionType', }, ], @@ -16587,6 +16767,7 @@ export type Attributes = { [CODE_LINE_NUMBER]?: CODE_LINE_NUMBER_TYPE; [CODE_NAMESPACE]?: CODE_NAMESPACE_TYPE; [CONNECTIONTYPE]?: CONNECTIONTYPE_TYPE; + [CONNECTION_RTT]?: CONNECTION_RTT_TYPE; [CULTURE_CALENDAR]?: CULTURE_CALENDAR_TYPE; [CULTURE_DISPLAY_NAME]?: CULTURE_DISPLAY_NAME_TYPE; [CULTURE_IS_24_HOUR_FORMAT]?: CULTURE_IS_24_HOUR_FORMAT_TYPE; @@ -16613,6 +16794,7 @@ export type Attributes = { [DEVICE_FAMILY]?: DEVICE_FAMILY_TYPE; [DEVICE_MEMORY_ESTIMATED_CAPACITY]?: DEVICE_MEMORY_ESTIMATED_CAPACITY_TYPE; [DEVICE_MODEL]?: DEVICE_MODEL_TYPE; + [EFFECTIVECONNECTIONTYPE]?: EFFECTIVECONNECTIONTYPE_TYPE; [ENVIRONMENT]?: ENVIRONMENT_TYPE; [ERROR_TYPE]?: ERROR_TYPE_TYPE; [EVENT_ID]?: EVENT_ID_TYPE; @@ -16796,6 +16978,8 @@ export type Attributes = { [NEL_REFERRER]?: NEL_REFERRER_TYPE; [NEL_SAMPLING_FUNCTION]?: NEL_SAMPLING_FUNCTION_TYPE; [NEL_TYPE]?: NEL_TYPE_TYPE; + [NETWORK_CONNECTION_EFFECTIVE_TYPE]?: NETWORK_CONNECTION_EFFECTIVE_TYPE_TYPE; + [NETWORK_CONNECTION_RTT]?: NETWORK_CONNECTION_RTT_TYPE; [NETWORK_CONNECTION_TYPE]?: NETWORK_CONNECTION_TYPE_TYPE; [NETWORK_LOCAL_ADDRESS]?: NETWORK_LOCAL_ADDRESS_TYPE; [NETWORK_LOCAL_PORT]?: NETWORK_LOCAL_PORT_TYPE; diff --git a/model/attributes/connection/connection__rtt.json b/model/attributes/connection/connection__rtt.json new file mode 100644 index 00000000..9a2e1d9b --- /dev/null +++ b/model/attributes/connection/connection__rtt.json @@ -0,0 +1,24 @@ +{ + "key": "connection.rtt", + "brief": "Specifies the estimated effective round-trip time of the current connection, in milliseconds.", + "type": "integer", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": 100, + "sdks": ["javascript-browser"], + "alias": ["network.connection.rtt"], + "deprecation": { + "replacement": "network.connection.rtt", + "reason": "Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future", + "_status": "backfill" + }, + "changelog": [ + { + "version": "next", + "prs": [279], + "description": "Added and deprecated attribute to document JS SDK's current behaviour" + } + ] +} diff --git a/model/attributes/connectionType.json b/model/attributes/connectionType.json index fc9c3b0d..1a97a362 100644 --- a/model/attributes/connectionType.json +++ b/model/attributes/connectionType.json @@ -11,7 +11,7 @@ "alias": ["network.connection.type"], "deprecation": { "replacement": "network.connection.type", - "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future", + "reason": "Old namespace-less attribute, to be replaced with network.connection.type for span-first future", "_status": "backfill" }, "changelog": [ diff --git a/model/attributes/effectiveConnectionType.json b/model/attributes/effectiveConnectionType.json new file mode 100644 index 00000000..1b074e7c --- /dev/null +++ b/model/attributes/effectiveConnectionType.json @@ -0,0 +1,24 @@ +{ + "key": "effectiveConnectionType", + "brief": "Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", + "type": "string", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": "4g", + "sdks": ["javascript-browser"], + "alias": ["network.connection.effective_type"], + "deprecation": { + "replacement": "network.connection.effective_type", + "reason": "Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future", + "_status": "backfill" + }, + "changelog": [ + { + "version": "next", + "prs": [279], + "description": "Added and deprecated attribute to document JS SDK's current behaviour" + } + ] +} diff --git a/model/attributes/network/network__connection__effective_type.json b/model/attributes/network/network__connection__effective_type.json new file mode 100644 index 00000000..514dea94 --- /dev/null +++ b/model/attributes/network/network__connection__effective_type.json @@ -0,0 +1,19 @@ +{ + "key": "network.connection.effective_type", + "brief": "Specifies the effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", + "type": "string", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": "4g", + "alias": ["effectiveConnectionType"], + "sdks": ["javascript-browser"], + "changelog": [ + { + "version": "next", + "prs": [279], + "description": "Added attribute network.connection.effective_type to be used instead of effectiveConnectionType" + } + ] +} diff --git a/model/attributes/network/network__connection__rtt.json b/model/attributes/network/network__connection__rtt.json new file mode 100644 index 00000000..840a0f42 --- /dev/null +++ b/model/attributes/network/network__connection__rtt.json @@ -0,0 +1,19 @@ +{ + "key": "network.connection.rtt", + "brief": "Specifies the estimated effective round-trip time of the current connection, in milliseconds.", + "type": "integer", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": 100, + "alias": ["connection.rtt"], + "sdks": ["javascript-browser"], + "changelog": [ + { + "version": "next", + "prs": [279], + "description": "Added attribute network.connection.rtt to be used instead of connection.rtt" + } + ] +} diff --git a/python/src/sentry_conventions/attributes.py b/python/src/sentry_conventions/attributes.py index ab6354d2..429d1d4c 100644 --- a/python/src/sentry_conventions/attributes.py +++ b/python/src/sentry_conventions/attributes.py @@ -142,13 +142,18 @@ class _AttributeNamesMeta(type): "CODE_FUNCTION", "CODE_LINENO", "CODE_NAMESPACE", + "CONNECTION_RTT", "CONNECTIONTYPE", "DB_NAME", "DB_OPERATION", "DB_SQL_BINDINGS", "DB_STATEMENT", "DB_SYSTEM", +<<<<<<< HEAD "DEVICEMEMORY", +======= + "EFFECTIVECONNECTIONTYPE", +>>>>>>> 10d027e (add attributes) "ENVIRONMENT", "FCP", "FP", @@ -1107,6 +1112,18 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "http.handler" """ + # Path: model/attributes/connection/connection__rtt.json + CONNECTION_RTT: Literal["connection.rtt"] = "connection.rtt" + """Specifies the estimated effective round-trip time of the current connection, in milliseconds. + + Type: int + Contains PII: maybe + Defined in OTEL: No + Aliases: network.connection.rtt + DEPRECATED: Use network.connection.rtt instead - Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future + Example: 100 + """ + # Path: model/attributes/connectionType.json CONNECTIONTYPE: Literal["connectionType"] = "connectionType" """Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc). @@ -1115,7 +1132,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Contains PII: maybe Defined in OTEL: No Aliases: network.connection.type - DEPRECATED: Use network.connection.type instead - Old namespace-less attribute, to be replaced with network.connection.type with span-first future + DEPRECATED: Use network.connection.type instead - Old namespace-less attribute, to be replaced with network.connection.type for span-first future Example: "wifi" """ @@ -1393,16 +1410,30 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "iPhone 15 Pro Max" """ +<<<<<<< HEAD # Path: model/attributes/deviceMemory.json DEVICEMEMORY: Literal["deviceMemory"] = "deviceMemory" """The estimated total memory capacity of the device, only a rough estimation in gigabytes. +======= + # Path: model/attributes/effectiveConnectionType.json + EFFECTIVECONNECTIONTYPE: Literal["effectiveConnectionType"] = ( + "effectiveConnectionType" + ) + """Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g). +>>>>>>> 10d027e (add attributes) Type: str Contains PII: maybe Defined in OTEL: No +<<<<<<< HEAD Aliases: device.memory.estimated_capacity DEPRECATED: Use device.memory.estimated_capacity instead - Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future Example: "8 GB" +======= + Aliases: network.connection.effective_type + DEPRECATED: Use network.connection.effective_type instead - Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future + Example: "4g" +>>>>>>> 10d027e (add attributes) """ # Path: model/attributes/environment.json @@ -3651,6 +3682,30 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "tcp" """ + # Path: model/attributes/network/network__connection__effective_type.json + NETWORK_CONNECTION_EFFECTIVE_TYPE: Literal["network.connection.effective_type"] = ( + "network.connection.effective_type" + ) + """Specifies the effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g). + + Type: str + Contains PII: maybe + Defined in OTEL: No + Aliases: effectiveConnectionType + Example: "4g" + """ + + # Path: model/attributes/network/network__connection__rtt.json + NETWORK_CONNECTION_RTT: Literal["network.connection.rtt"] = "network.connection.rtt" + """Specifies the estimated effective round-trip time of the current connection, in milliseconds. + + Type: int + Contains PII: maybe + Defined in OTEL: No + Aliases: connection.rtt + Example: 100 + """ + # Path: model/attributes/network/network__connection__type.json NETWORK_CONNECTION_TYPE: Literal["network.connection.type"] = ( "network.connection.type" @@ -6413,6 +6468,27 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.0.0"), ], ), + "connection.rtt": AttributeMetadata( + brief="Specifies the estimated effective round-trip time of the current connection, in milliseconds.", + type=AttributeType.INTEGER, + pii=PiiInfo(isPii=IsPii.MAYBE), + is_in_otel=False, + example=100, + deprecation=DeprecationInfo( + replacement="network.connection.rtt", + reason="Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future", + status=DeprecationStatus.BACKFILL, + ), + aliases=["network.connection.rtt"], + sdks=["javascript-browser"], + changelog=[ + ChangelogEntry( + version="next", + prs=[279], + description="Added and deprecated attribute to document JS SDK's current behaviour", + ), + ], + ), "connectionType": AttributeMetadata( brief="Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", type=AttributeType.STRING, @@ -6421,7 +6497,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): example="wifi", deprecation=DeprecationInfo( replacement="network.connection.type", - reason="Old namespace-less attribute, to be replaced with network.connection.type with span-first future", + reason="Old namespace-less attribute, to be replaced with network.connection.type for span-first future", status=DeprecationStatus.BACKFILL, ), aliases=["network.connection.type"], @@ -6739,6 +6815,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.1.0", prs=[116, 127]), ], ), +<<<<<<< HEAD "deviceMemory": AttributeMetadata( brief="The estimated total memory capacity of the device, only a rough estimation in gigabytes.", type=AttributeType.STRING, @@ -6751,11 +6828,29 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): status=DeprecationStatus.BACKFILL, ), aliases=["device.memory.estimated_capacity"], +======= + "effectiveConnectionType": AttributeMetadata( + brief="Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", + type=AttributeType.STRING, + pii=PiiInfo(isPii=IsPii.MAYBE), + is_in_otel=False, + example="4g", + deprecation=DeprecationInfo( + replacement="network.connection.effective_type", + reason="Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future", + status=DeprecationStatus.BACKFILL, + ), + aliases=["network.connection.effective_type"], +>>>>>>> 10d027e (add attributes) sdks=["javascript-browser"], changelog=[ ChangelogEntry( version="next", +<<<<<<< HEAD prs=[281], +======= + prs=[279], +>>>>>>> 10d027e (add attributes) description="Added and deprecated attribute to document JS SDK's current behaviour", ), ], @@ -9165,6 +9260,38 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.0.0"), ], ), + "network.connection.effective_type": AttributeMetadata( + brief="Specifies the effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", + type=AttributeType.STRING, + pii=PiiInfo(isPii=IsPii.MAYBE), + is_in_otel=False, + example="4g", + aliases=["effectiveConnectionType"], + sdks=["javascript-browser"], + changelog=[ + ChangelogEntry( + version="next", + prs=[279], + description="Added attribute network.connection.effective_type to be used instead of effectiveConnectionType", + ), + ], + ), + "network.connection.rtt": AttributeMetadata( + brief="Specifies the estimated effective round-trip time of the current connection, in milliseconds.", + type=AttributeType.INTEGER, + pii=PiiInfo(isPii=IsPii.MAYBE), + is_in_otel=False, + example=100, + aliases=["connection.rtt"], + sdks=["javascript-browser"], + changelog=[ + ChangelogEntry( + version="next", + prs=[279], + description="Added attribute network.connection.rtt to be used instead of connection.rtt", + ), + ], + ), "network.connection.type": AttributeMetadata( brief="Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", type=AttributeType.STRING, @@ -9176,7 +9303,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): changelog=[ ChangelogEntry( version="next", - prs=[278], + prs=[279], description="Added attribute network.connection.type to be used instead of connectionType", ), ], @@ -11122,6 +11249,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "code.line.number": int, "code.lineno": int, "code.namespace": str, + "connection.rtt": int, "connectionType": str, "culture.calendar": str, "culture.display_name": str, @@ -11148,7 +11276,11 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "device.family": str, "device.memory.estimated_capacity": int, "device.model": str, +<<<<<<< HEAD "deviceMemory": str, +======= + "effectiveConnectionType": str, +>>>>>>> 10d027e (add attributes) "environment": str, "error.type": str, "event.id": int, @@ -11347,6 +11479,8 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "net.sock.peer.name": str, "net.sock.peer.port": int, "net.transport": str, + "network.connection.effective_type": str, + "network.connection.rtt": int, "network.connection.type": str, "network.local.address": str, "network.local.port": int, diff --git a/shared/deprecated_attributes.json b/shared/deprecated_attributes.json index 41c909cb..85a7da84 100644 --- a/shared/deprecated_attributes.json +++ b/shared/deprecated_attributes.json @@ -51,8 +51,36 @@ "alias": ["network.connection.type"], "deprecation": { "replacement": "network.connection.type", +<<<<<<< HEAD "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future", >>>>>>> f93f9c6 (generate) +======= + "reason": "Old namespace-less attribute, to be replaced with network.connection.type for span-first future", + "_status": "backfill" + }, + "changelog": [ + { + "version": "next", + "prs": [279], + "description": "Added and deprecated attribute to document JS SDK's current behaviour" + } + ] + }, + { + "key": "effectiveConnectionType", + "brief": "Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", + "type": "string", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": "4g", + "sdks": ["javascript-browser"], + "alias": ["network.connection.effective_type"], + "deprecation": { + "replacement": "network.connection.effective_type", + "reason": "Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future", +>>>>>>> 10d027e (add attributes) "_status": "backfill" }, "changelog": [ @@ -1318,6 +1346,30 @@ } ] }, + { + "key": "connection.rtt", + "brief": "Specifies the estimated effective round-trip time of the current connection, in milliseconds.", + "type": "integer", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": 100, + "sdks": ["javascript-browser"], + "alias": ["network.connection.rtt"], + "deprecation": { + "replacement": "network.connection.rtt", + "reason": "Old attribute name (no official namespace), to be replaced with network.connection.rtt for span-first future", + "_status": "backfill" + }, + "changelog": [ + { + "version": "next", + "prs": [279], + "description": "Added and deprecated attribute to document JS SDK's current behaviour" + } + ] + }, { "key": "db.name", "brief": "The name of the database being accessed.", From 8d239e798e7e5615ff7f54f0731ff6c6f6ae003c Mon Sep 17 00:00:00 2001 From: Lukas Stracke Date: Tue, 17 Mar 2026 11:16:39 +0100 Subject: [PATCH 5/5] regenerate after rebase --- python/src/sentry_conventions/attributes.py | 40 ++++++++---------- shared/deprecated_attributes.json | 46 +++++++++++---------- 2 files changed, 42 insertions(+), 44 deletions(-) diff --git a/python/src/sentry_conventions/attributes.py b/python/src/sentry_conventions/attributes.py index 429d1d4c..01ebb425 100644 --- a/python/src/sentry_conventions/attributes.py +++ b/python/src/sentry_conventions/attributes.py @@ -149,11 +149,8 @@ class _AttributeNamesMeta(type): "DB_SQL_BINDINGS", "DB_STATEMENT", "DB_SYSTEM", -<<<<<<< HEAD "DEVICEMEMORY", -======= "EFFECTIVECONNECTIONTYPE", ->>>>>>> 10d027e (add attributes) "ENVIRONMENT", "FCP", "FP", @@ -1410,30 +1407,30 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "iPhone 15 Pro Max" """ -<<<<<<< HEAD # Path: model/attributes/deviceMemory.json DEVICEMEMORY: Literal["deviceMemory"] = "deviceMemory" """The estimated total memory capacity of the device, only a rough estimation in gigabytes. -======= + + Type: str + Contains PII: maybe + Defined in OTEL: No + Aliases: device.memory.estimated_capacity + DEPRECATED: Use device.memory.estimated_capacity instead - Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future + Example: "8 GB" + """ + # Path: model/attributes/effectiveConnectionType.json EFFECTIVECONNECTIONTYPE: Literal["effectiveConnectionType"] = ( "effectiveConnectionType" ) """Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g). ->>>>>>> 10d027e (add attributes) Type: str Contains PII: maybe Defined in OTEL: No -<<<<<<< HEAD - Aliases: device.memory.estimated_capacity - DEPRECATED: Use device.memory.estimated_capacity instead - Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future - Example: "8 GB" -======= Aliases: network.connection.effective_type DEPRECATED: Use network.connection.effective_type instead - Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future Example: "4g" ->>>>>>> 10d027e (add attributes) """ # Path: model/attributes/environment.json @@ -6815,7 +6812,6 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.1.0", prs=[116, 127]), ], ), -<<<<<<< HEAD "deviceMemory": AttributeMetadata( brief="The estimated total memory capacity of the device, only a rough estimation in gigabytes.", type=AttributeType.STRING, @@ -6828,7 +6824,15 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): status=DeprecationStatus.BACKFILL, ), aliases=["device.memory.estimated_capacity"], -======= + sdks=["javascript-browser"], + changelog=[ + ChangelogEntry( + version="next", + prs=[281], + description="Added and deprecated attribute to document JS SDK's current behaviour", + ), + ], + ), "effectiveConnectionType": AttributeMetadata( brief="Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", type=AttributeType.STRING, @@ -6841,16 +6845,11 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): status=DeprecationStatus.BACKFILL, ), aliases=["network.connection.effective_type"], ->>>>>>> 10d027e (add attributes) sdks=["javascript-browser"], changelog=[ ChangelogEntry( version="next", -<<<<<<< HEAD - prs=[281], -======= prs=[279], ->>>>>>> 10d027e (add attributes) description="Added and deprecated attribute to document JS SDK's current behaviour", ), ], @@ -11276,11 +11275,8 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "device.family": str, "device.memory.estimated_capacity": int, "device.model": str, -<<<<<<< HEAD "deviceMemory": str, -======= "effectiveConnectionType": str, ->>>>>>> 10d027e (add attributes) "environment": str, "error.type": str, "event.id": int, diff --git a/shared/deprecated_attributes.json b/shared/deprecated_attributes.json index 85a7da84..fba3c9a4 100644 --- a/shared/deprecated_attributes.json +++ b/shared/deprecated_attributes.json @@ -2,7 +2,6 @@ "_generated": "This file is generated. Do not modify it directly. See scripts/generate_deprecated_attributes_json.ts", "attributes": [ { -<<<<<<< HEAD "key": "cls", "brief": "The value of the recorded Cumulative Layout Shift (CLS) web vital", "type": "double", @@ -27,34 +26,18 @@ ] }, { - "key": "deviceMemory", - "brief": "The estimated total memory capacity of the device, only a rough estimation in gigabytes.", -======= "key": "connectionType", "brief": "Specifies the type of the current connection (e.g. wifi, ethernet, cellular , etc).", ->>>>>>> f93f9c6 (generate) "type": "string", "pii": { "key": "maybe" }, "is_in_otel": false, -<<<<<<< HEAD - "example": "8 GB", - "sdks": ["javascript-browser"], - "alias": ["device.memory.estimated_capacity"], - "deprecation": { - "replacement": "device.memory.estimated_capacity", - "reason": "Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future", -======= "example": "wifi", "sdks": ["javascript-browser"], "alias": ["network.connection.type"], "deprecation": { "replacement": "network.connection.type", -<<<<<<< HEAD - "reason": "Old namespace-less attribute, to be replaced with network.connection.type with span-first future", ->>>>>>> f93f9c6 (generate) -======= "reason": "Old namespace-less attribute, to be replaced with network.connection.type for span-first future", "_status": "backfill" }, @@ -66,6 +49,30 @@ } ] }, + { + "key": "deviceMemory", + "brief": "The estimated total memory capacity of the device, only a rough estimation in gigabytes.", + "type": "string", + "pii": { + "key": "maybe" + }, + "is_in_otel": false, + "example": "8 GB", + "sdks": ["javascript-browser"], + "alias": ["device.memory.estimated_capacity"], + "deprecation": { + "replacement": "device.memory.estimated_capacity", + "reason": "Old namespace-less attribute, to be replaced with device.memory.estimated_capacity for span-first future", + "_status": "backfill" + }, + "changelog": [ + { + "version": "next", + "prs": [281], + "description": "Added and deprecated attribute to document JS SDK's current behaviour" + } + ] + }, { "key": "effectiveConnectionType", "brief": "Specifies the estimated effective type of the current connection (e.g. slow-2g, 2g, 3g, 4g).", @@ -80,17 +87,12 @@ "deprecation": { "replacement": "network.connection.effective_type", "reason": "Old namespace-less attribute, to be replaced with network.connection.effective_type for span-first future", ->>>>>>> 10d027e (add attributes) "_status": "backfill" }, "changelog": [ { "version": "next", -<<<<<<< HEAD - "prs": [281], -======= "prs": [279], ->>>>>>> f93f9c6 (generate) "description": "Added and deprecated attribute to document JS SDK's current behaviour" } ]