diff --git a/javascript/sentry-conventions/src/attributes.ts b/javascript/sentry-conventions/src/attributes.ts index 55c0f29b..cb0e12e9 100644 --- a/javascript/sentry-conventions/src/attributes.ts +++ b/javascript/sentry-conventions/src/attributes.ts @@ -14056,7 +14056,7 @@ export type MESSAGING_CONVERSATION_ID_TYPE = string; * Attribute defined in OTEL: No * Visibility: public * - * Aliases: {@link MESSAGING_DESTINATION_NAME} `messaging.destination.name` + * Aliases: {@link MESSAGING_DESTINATION_NAME} `messaging.destination.name`, {@link SENTRY_MESSAGING_DESTINATION_NAME} `sentry.messaging.destination.name` * * @deprecated Use {@link MESSAGING_DESTINATION_NAME} (messaging.destination.name) instead - This attribute is being deprecated in favor of messaging.destination.name, which is the OTel-aligned replacement. * @example "BestTopic" @@ -14123,7 +14123,7 @@ export type MESSAGING_DESTINATION_KIND_TYPE = string; * Attribute defined in OTEL: Yes * Visibility: public * - * Aliases: {@link MESSAGING_DESTINATION} `messaging.destination` + * Aliases: {@link MESSAGING_DESTINATION} `messaging.destination`, {@link SENTRY_MESSAGING_DESTINATION_NAME} `sentry.messaging.destination.name` * * @example "BestTopic" */ @@ -17967,6 +17967,30 @@ export const SENTRY_MESSAGE_TEMPLATE = 'sentry.message.template'; */ export type SENTRY_MESSAGE_TEMPLATE_TYPE = string; +// Path: model/attributes/sentry/sentry__messaging__destination__name.json + +/** + * The message destination name. `sentry.messaging.destination.name` + * + * Attribute Value Type: `string` {@link SENTRY_MESSAGING_DESTINATION_NAME_TYPE} + * + * Apply Scrubbing: manual + * + * Attribute defined in OTEL: No + * Visibility: public + * + * Aliases: {@link MESSAGING_DESTINATION_NAME} `messaging.destination.name`, {@link MESSAGING_DESTINATION} `messaging.destination` + * + * @deprecated Use {@link MESSAGING_DESTINATION_NAME} (messaging.destination.name) instead + * @example "BestTopic" + */ +export const SENTRY_MESSAGING_DESTINATION_NAME = 'sentry.messaging.destination.name'; + +/** + * Type for {@link SENTRY_MESSAGING_DESTINATION_NAME} sentry.messaging.destination.name + */ +export type SENTRY_MESSAGING_DESTINATION_NAME_TYPE = string; + // Path: model/attributes/sentry/sentry__metric__source.json /** @@ -22748,6 +22772,7 @@ export const ATTRIBUTE_TYPE: Record = { 'sentry.main_thread': 'boolean', 'sentry.message.parameter.': 'string', 'sentry.message.template': 'string', + 'sentry.messaging.destination.name': 'string', 'sentry.metric.source': 'string', 'sentry.mobile': 'boolean', 'sentry.module.': 'string', @@ -23722,6 +23747,7 @@ export type AttributeName = | typeof SENTRY_MAIN_THREAD | typeof SENTRY_MESSAGE_PARAMETER_KEY | typeof SENTRY_MESSAGE_TEMPLATE + | typeof SENTRY_MESSAGING_DESTINATION_NAME | typeof SENTRY_METRIC_SOURCE | typeof SENTRY_MOBILE | typeof SENTRY_MODULE_KEY @@ -34428,7 +34454,7 @@ export const ATTRIBUTE_METADATA: Record = { 'messaging.destination': { brief: 'The message destination name.', type: 'string', - keys: ['messaging.destination.name', 'messaging.destination'], + keys: ['messaging.destination.name', 'messaging.destination', 'sentry.messaging.destination.name'], applyScrubbing: { key: 'manual', }, @@ -34441,8 +34467,9 @@ export const ATTRIBUTE_METADATA: Record = { 'This attribute is being deprecated in favor of messaging.destination.name, which is the OTel-aligned replacement.', status: 'backfill', }, - aliases: ['messaging.destination.name'], + aliases: ['messaging.destination.name', 'sentry.messaging.destination.name'], changelog: [ + { version: 'next', description: 'Added sentry.messaging.destination.name as an alias' }, { version: '0.16.0', prs: [482], @@ -34488,15 +34515,16 @@ export const ATTRIBUTE_METADATA: Record = { 'messaging.destination.name': { brief: 'The message destination name.', type: 'string', - keys: ['messaging.destination.name', 'messaging.destination'], + keys: ['messaging.destination.name', 'messaging.destination', 'sentry.messaging.destination.name'], applyScrubbing: { key: 'manual', }, isInOtel: true, visibility: 'public', example: 'BestTopic', - aliases: ['messaging.destination'], + aliases: ['messaging.destination', 'sentry.messaging.destination.name'], changelog: [ + { version: 'next', description: 'Added sentry.messaging.destination.name as an alias' }, { version: '0.16.0', prs: [482], description: 'Added messaging.destination as an alias' }, { version: '0.1.0', prs: [127] }, { version: '0.0.0' }, @@ -37218,6 +37246,29 @@ export const ATTRIBUTE_METADATA: Record = { example: 'Hello, {name}!', changelog: [{ version: '0.1.0', prs: [116] }], }, + 'sentry.messaging.destination.name': { + brief: 'The message destination name.', + type: 'string', + keys: ['messaging.destination.name', 'messaging.destination', 'sentry.messaging.destination.name'], + applyScrubbing: { + key: 'manual', + }, + isInOtel: false, + visibility: 'public', + example: 'BestTopic', + deprecation: { + replacement: 'messaging.destination.name', + status: 'backfill', + }, + aliases: ['messaging.destination.name', 'messaging.destination'], + changelog: [ + { + version: 'next', + description: + 'Added sentry.messaging.destination.name attribute, deprecated in favor of messaging.destination.name', + }, + ], + }, 'sentry.metric.source': { brief: 'The provenance of a metric. For example, this can be set to indicate if a metric was generated by Relay from a span.', @@ -40816,6 +40867,7 @@ export type Attributes = { [SENTRY_MAIN_THREAD]?: SENTRY_MAIN_THREAD_TYPE; [SENTRY_MESSAGE_PARAMETER_KEY]?: SENTRY_MESSAGE_PARAMETER_KEY_TYPE; [SENTRY_MESSAGE_TEMPLATE]?: SENTRY_MESSAGE_TEMPLATE_TYPE; + [SENTRY_MESSAGING_DESTINATION_NAME]?: SENTRY_MESSAGING_DESTINATION_NAME_TYPE; [SENTRY_METRIC_SOURCE]?: SENTRY_METRIC_SOURCE_TYPE; [SENTRY_MOBILE]?: SENTRY_MOBILE_TYPE; [SENTRY_MODULE_KEY]?: SENTRY_MODULE_KEY_TYPE; diff --git a/javascript/sentry-conventions/src/search.ts b/javascript/sentry-conventions/src/search.ts index c041c517..dfeeb904 100644 --- a/javascript/sentry-conventions/src/search.ts +++ b/javascript/sentry-conventions/src/search.ts @@ -4571,6 +4571,13 @@ export const SEARCH_SENTRY__MESSAGE__PARAMETER__KEY = 'sentry.message.parameter. */ export const SEARCH_SENTRY__MESSAGE__TEMPLATE = 'sentry.message.template'; +/** + * Search name for {@link attributes.SENTRY_MESSAGING_DESTINATION_NAME}. `sentry.messaging.destination.name` + * + * @deprecated Use {@link SEARCH_MESSAGING__DESTINATION__NAME} (`messaging.destination.name`) instead + */ +export const SEARCH_SENTRY__MESSAGING__DESTINATION__NAME = 'sentry.messaging.destination.name'; + /** * Search name for {@link attributes.SENTRY_METRIC_SOURCE}. `sentry.metric.source` */ @@ -6392,6 +6399,7 @@ export type AttributeSearchName = | typeof SEARCH_SENTRY__MAIN_THREAD | typeof SEARCH_SENTRY__MESSAGE__PARAMETER__KEY | typeof SEARCH_SENTRY__MESSAGE__TEMPLATE + | typeof SEARCH_SENTRY__MESSAGING__DESTINATION__NAME | typeof SEARCH_SENTRY__METRIC__SOURCE | typeof SEARCH_SENTRY__MOBILE | typeof SEARCH_SENTRY__MODULE__KEY @@ -10740,7 +10748,7 @@ export const ATTRIBUTE_SEARCH_METADATA: Record canonicalName: 'messaging.destination.name', type: 'string', brief: 'The message destination name.', - deprecationChain: ['messaging.destination.name', 'messaging.destination'], + deprecationChain: ['messaging.destination.name', 'messaging.destination', 'sentry.messaging.destination.name'], }, 'messaging.destination.connection': { canonicalName: 'messaging.destination.connection', @@ -10752,7 +10760,7 @@ export const ATTRIBUTE_SEARCH_METADATA: Record canonicalName: 'messaging.destination.name', type: 'string', brief: 'The message destination name.', - deprecationChain: ['messaging.destination.name', 'messaging.destination'], + deprecationChain: ['messaging.destination.name', 'messaging.destination', 'sentry.messaging.destination.name'], }, 'messaging.destination.partition.id': { canonicalName: 'messaging.destination.partition.id', @@ -11884,6 +11892,12 @@ export const ATTRIBUTE_SEARCH_METADATA: Record brief: 'The parameterized template string.', deprecationChain: ['sentry.message.template'], }, + 'sentry.messaging.destination.name': { + canonicalName: 'messaging.destination.name', + type: 'string', + brief: 'The message destination name.', + deprecationChain: ['messaging.destination.name', 'messaging.destination', 'sentry.messaging.destination.name'], + }, 'sentry.metric.source': { canonicalName: 'sentry.metric.source', type: 'string', diff --git a/model/attributes/messaging/messaging__destination.json b/model/attributes/messaging/messaging__destination.json index 15854b59..04097a52 100644 --- a/model/attributes/messaging/messaging__destination.json +++ b/model/attributes/messaging/messaging__destination.json @@ -7,7 +7,7 @@ }, "is_in_otel": false, "example": "BestTopic", - "alias": ["messaging.destination.name"], + "alias": ["messaging.destination.name", "sentry.messaging.destination.name"], "deprecation": { "_status": "backfill", "replacement": "messaging.destination.name", @@ -15,6 +15,10 @@ }, "visibility": "public", "changelog": [ + { + "version": "next", + "description": "Added sentry.messaging.destination.name as an alias" + }, { "version": "0.16.0", "prs": [482], diff --git a/model/attributes/messaging/messaging__destination__name.json b/model/attributes/messaging/messaging__destination__name.json index 634a3879..ace7c2d1 100644 --- a/model/attributes/messaging/messaging__destination__name.json +++ b/model/attributes/messaging/messaging__destination__name.json @@ -7,9 +7,13 @@ }, "is_in_otel": true, "example": "BestTopic", - "alias": ["messaging.destination"], + "alias": ["messaging.destination", "sentry.messaging.destination.name"], "visibility": "public", "changelog": [ + { + "version": "next", + "description": "Added sentry.messaging.destination.name as an alias" + }, { "version": "0.16.0", "prs": [482], diff --git a/model/attributes/sentry/sentry__messaging__destination__name.json b/model/attributes/sentry/sentry__messaging__destination__name.json new file mode 100644 index 00000000..051219ae --- /dev/null +++ b/model/attributes/sentry/sentry__messaging__destination__name.json @@ -0,0 +1,22 @@ +{ + "key": "sentry.messaging.destination.name", + "brief": "The message destination name.", + "type": "string", + "apply_scrubbing": { + "key": "manual" + }, + "is_in_otel": false, + "example": "BestTopic", + "alias": ["messaging.destination.name", "messaging.destination"], + "deprecation": { + "_status": "backfill", + "replacement": "messaging.destination.name" + }, + "visibility": "public", + "changelog": [ + { + "version": "next", + "description": "Added sentry.messaging.destination.name attribute, deprecated in favor of messaging.destination.name" + } + ] +} diff --git a/python/src/sentry_conventions/attributes.py b/python/src/sentry_conventions/attributes.py index 54076e0c..c4aa71b5 100644 --- a/python/src/sentry_conventions/attributes.py +++ b/python/src/sentry_conventions/attributes.py @@ -395,6 +395,7 @@ class _AttributeNamesMeta(type): "SENTRY_FRAMES_FROZEN", "SENTRY_FRAMES_SLOW", "SENTRY_FRAMES_TOTAL", + "SENTRY_MESSAGING_DESTINATION_NAME", "SENTRY_REPORT_EVENT", "_SENTRY_SEGMENT_ID", "SENTRY_SOURCE", @@ -8477,7 +8478,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Apply Scrubbing: manual Defined in OTEL: No Visibility: public - Aliases: messaging.destination.name + Aliases: messaging.destination.name, sentry.messaging.destination.name DEPRECATED: Use messaging.destination.name instead - This attribute is being deprecated in favor of messaging.destination.name, which is the OTel-aligned replacement. Example: "BestTopic" """ @@ -8505,7 +8506,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Apply Scrubbing: manual Defined in OTEL: Yes Visibility: public - Aliases: messaging.destination + Aliases: messaging.destination, sentry.messaging.destination.name Example: "BestTopic" """ @@ -10675,6 +10676,21 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): Example: "Hello, {name}!" """ + # Path: model/attributes/sentry/sentry__messaging__destination__name.json + SENTRY_MESSAGING_DESTINATION_NAME: Literal["sentry.messaging.destination.name"] = ( + "sentry.messaging.destination.name" + ) + """The message destination name. + + Type: str + Apply Scrubbing: manual + Defined in OTEL: No + Visibility: public + Aliases: messaging.destination.name, messaging.destination + DEPRECATED: Use messaging.destination.name instead + Example: "BestTopic" + """ + # Path: model/attributes/sentry/sentry__metric__source.json SENTRY_METRIC_SOURCE: Literal["sentry.metric.source"] = "sentry.metric.source" """The provenance of a metric. For example, this can be set to indicate if a metric was generated by Relay from a span. @@ -25163,6 +25179,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): keys=( "messaging.destination.name", "messaging.destination", + "sentry.messaging.destination.name", ), apply_scrubbing=ApplyScrubbingInfo(key=ApplyScrubbing.MANUAL), is_in_otel=False, @@ -25173,8 +25190,12 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): reason="This attribute is being deprecated in favor of messaging.destination.name, which is the OTel-aligned replacement.", status=DeprecationStatus.BACKFILL, ), - aliases=["messaging.destination.name"], + aliases=["messaging.destination.name", "sentry.messaging.destination.name"], changelog=[ + ChangelogEntry( + version="next", + description="Added sentry.messaging.destination.name as an alias", + ), ChangelogEntry( version="0.16.0", prs=[482], @@ -25201,13 +25222,18 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): keys=( "messaging.destination.name", "messaging.destination", + "sentry.messaging.destination.name", ), apply_scrubbing=ApplyScrubbingInfo(key=ApplyScrubbing.MANUAL), is_in_otel=True, visibility=Visibility.PUBLIC, example="BestTopic", - aliases=["messaging.destination"], + aliases=["messaging.destination", "sentry.messaging.destination.name"], changelog=[ + ChangelogEntry( + version="next", + description="Added sentry.messaging.destination.name as an alias", + ), ChangelogEntry( version="0.16.0", prs=[482], @@ -28486,6 +28512,29 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): ChangelogEntry(version="0.1.0", prs=[116]), ], ), + "sentry.messaging.destination.name": AttributeMetadata( + brief="The message destination name.", + type=AttributeType.STRING, + keys=( + "messaging.destination.name", + "messaging.destination", + "sentry.messaging.destination.name", + ), + apply_scrubbing=ApplyScrubbingInfo(key=ApplyScrubbing.MANUAL), + is_in_otel=False, + visibility=Visibility.PUBLIC, + example="BestTopic", + deprecation=DeprecationInfo( + replacement="messaging.destination.name", status=DeprecationStatus.BACKFILL + ), + aliases=["messaging.destination.name", "messaging.destination"], + changelog=[ + ChangelogEntry( + version="next", + description="Added sentry.messaging.destination.name attribute, deprecated in favor of messaging.destination.name", + ), + ], + ), "sentry.metric.source": AttributeMetadata( brief="The provenance of a metric. For example, this can be set to indicate if a metric was generated by Relay from a span.", type=AttributeType.STRING, @@ -32403,6 +32452,7 @@ class ATTRIBUTE_NAMES(metaclass=_AttributeNamesMeta): "sentry.main_thread": bool, "sentry.message.parameter.": str, "sentry.message.template": str, + "sentry.messaging.destination.name": str, "sentry.metric.source": str, "sentry.mobile": bool, "sentry.module.": str,