Import SNS and Lambda attributes from @sentry/conventions

Author: andreiborza

packages/server-utils/src/integrations/tracing-channel/aws-sdk/constants.ts

@@ -1,7 +1,8 @@
 /**
  * AWS-specific span constants used by the aws-sdk channel integration that are NOT covered by
  * `@sentry/conventions/attributes` (attribute names that exist there are imported from there
- * directly). Per-service files append their own such constants below.
+ * directly). These are either Sentry-specific (the span origin), attribute *values* (not keys), or
+ * obsolete OTel conventions with no `@sentry/conventions` export.
  */
 
 /** The span origin every aws-sdk channel span carries, mirroring the uniform OTel `auto.otel.aws`. */
@@ -10,16 +11,6 @@ export const AWS_SDK_ORIGIN = 'auto.aws.orchestrion.aws_sdk';
 /** DynamoDB `db.system` value (an attribute value, not a key, so not covered by conventions). */
 export const DB_SYSTEM_VALUE_DYNAMODB = 'dynamodb';
 
-// SNS
-export const ATTR_AWS_SNS_TOPIC_ARN = 'aws.sns.topic.arn';
-
-// Lambda (faas)
-export const ATTR_FAAS_INVOKED_NAME = 'faas.invoked_name';
-export const ATTR_FAAS_INVOKED_PROVIDER = 'faas.invoked_provider';
-export const ATTR_FAAS_INVOKED_REGION = 'faas.invoked_region';
-export const ATTR_FAAS_EXECUTION = 'faas.execution';
-
-// Messaging (obsolete OTel conventions kept for parity with the OTel integration)
-export const ATTR_MESSAGING_DESTINATION = 'messaging.destination';
+// Messaging (obsolete OTel convention with no `@sentry/conventions` export, kept for parity)
 export const ATTR_MESSAGING_DESTINATION_KIND = 'messaging.destination_kind';
 export const MESSAGING_DESTINATION_KIND_VALUE_TOPIC = 'topic';

packages/server-utils/src/integrations/tracing-channel/aws-sdk/services/lambda.ts

@@ -1,12 +1,12 @@
 import type { Span } from '@sentry/core';
 import { debug, getTraceData, SPAN_KIND } from '@sentry/core';
-import { DEBUG_BUILD } from '../../../../debug-build';
 import {
-  ATTR_FAAS_EXECUTION,
-  ATTR_FAAS_INVOKED_NAME,
-  ATTR_FAAS_INVOKED_PROVIDER,
-  ATTR_FAAS_INVOKED_REGION,
-} from '../constants';
+  FAAS_EXECUTION as ATTR_FAAS_EXECUTION,
+  FAAS_INVOKED_NAME as ATTR_FAAS_INVOKED_NAME,
+  FAAS_INVOKED_PROVIDER as ATTR_FAAS_INVOKED_PROVIDER,
+  FAAS_INVOKED_REGION as ATTR_FAAS_INVOKED_REGION,
+} from '@sentry/conventions/attributes';
+import { DEBUG_BUILD } from '../../../../debug-build';
 import type { NormalizedRequest, NormalizedResponse } from '../types';
 import type { RequestMetadata, ServiceExtension } from './ServiceExtension';
 
@@ -43,6 +43,7 @@ export class LambdaServiceExtension implements ServiceExtension {
 
   public responseHook(response: NormalizedResponse, span: Span): void {
     if (response.request.commandName === INVOKE_COMMAND) {
+      // oxlint-disable-next-line typescript/no-deprecated -- old-semconv faas.execution, matched to the OTel aws-sdk integration
       span.setAttribute(ATTR_FAAS_EXECUTION, response.requestId);
       // Region resolves asynchronously after `requestPreSpanHook`, so it's backfilled onto the
       // normalized request and read here (same timing as `cloud.region`).

packages/server-utils/src/integrations/tracing-channel/aws-sdk/services/sns.ts

@@ -1,12 +1,12 @@
 import type { Span, SpanKindValue } from '@sentry/core';
 import { getTraceData, SPAN_KIND } from '@sentry/core';
-import { MESSAGING_DESTINATION_NAME, MESSAGING_SYSTEM } from '@sentry/conventions/attributes';
 import {
-  ATTR_AWS_SNS_TOPIC_ARN,
-  ATTR_MESSAGING_DESTINATION,
-  ATTR_MESSAGING_DESTINATION_KIND,
-  MESSAGING_DESTINATION_KIND_VALUE_TOPIC,
-} from '../constants';
+  AWS_SNS_TOPIC_ARN as ATTR_AWS_SNS_TOPIC_ARN,
+  MESSAGING_DESTINATION as ATTR_MESSAGING_DESTINATION,
+  MESSAGING_DESTINATION_NAME,
+  MESSAGING_SYSTEM,
+} from '@sentry/conventions/attributes';
+import { ATTR_MESSAGING_DESTINATION_KIND, MESSAGING_DESTINATION_KIND_VALUE_TOPIC } from '../constants';
 import type { NormalizedRequest, NormalizedResponse } from '../types';
 import { injectPropagationContext } from './MessageAttributes';
 import type { RequestMetadata, ServiceExtension } from './ServiceExtension';
@@ -25,6 +25,7 @@ export class SnsServiceExtension implements ServiceExtension {
       spanAttributes[ATTR_MESSAGING_DESTINATION_KIND] = MESSAGING_DESTINATION_KIND_VALUE_TOPIC;
       const { TopicArn, TargetArn, PhoneNumber } = request.commandInput;
       const destinationName = extractDestinationName(TopicArn, TargetArn, PhoneNumber);
+      // oxlint-disable-next-line typescript/no-deprecated -- old-semconv messaging.destination, matched to the OTel aws-sdk integration
       spanAttributes[ATTR_MESSAGING_DESTINATION] = destinationName;
       spanAttributes[MESSAGING_DESTINATION_NAME] = TopicArn || TargetArn || PhoneNumber || 'unknown';