feat(plugin-aws-sdk): add span name to request hook

Author: Amir Blum

packages/plugin-aws-sdk/src/aws-sdk.ts

@@ -72,12 +72,14 @@ class AwsPlugin extends BasePlugin<typeof AWS> {
   private _startAwsSpan(
     request: AWS.Request<any, any>,
     additionalAttributes?: Attributes,
-    spanKind?: SpanKind
+    spanKind?: SpanKind,
+    spanName?: string
   ): Span {
     const operation = (request as any).operation;
     const service = (request as any).service;
+    const name = spanName ?? this._getSpanName(request);
 
-    const newSpan = this._tracer.startSpan(this._getSpanName(request), {
+    const newSpan = this._tracer.startSpan(name, {
       kind: spanKind,
       attributes: {
         [AttributeNames.COMPONENT]: this.moduleName,
@@ -150,7 +152,8 @@ class AwsPlugin extends BasePlugin<typeof AWS> {
       const span = thisPlugin._startAwsSpan(
         awsRequest,
         requestMetadata.spanAttributes,
-        requestMetadata.spanKind
+        requestMetadata.spanKind,
+        requestMetadata.spanName
       );
       thisPlugin._callPreRequestHooks(span, awsRequest);
       thisPlugin._registerCompletedEvent(span, awsRequest);
@@ -183,7 +186,8 @@ class AwsPlugin extends BasePlugin<typeof AWS> {
       const span = thisPlugin._startAwsSpan(
         awsRequest,
         requestMetadata.spanAttributes,
-        requestMetadata.spanKind
+        requestMetadata.spanKind,
+        requestMetadata.spanName
       );
       thisPlugin._callPreRequestHooks(span, awsRequest);
       thisPlugin._registerCompletedEvent(span, awsRequest);

packages/plugin-aws-sdk/src/services/ServiceExtension.ts

@@ -7,6 +7,7 @@ export interface RequestMetadata {
   isIncoming: boolean;
   spanAttributes?: Attributes;
   spanKind?: SpanKind;
+  spanName?: string;
 }
 
 export interface ServiceExtension {

packages/plugin-aws-sdk/src/services/sqs.ts

@@ -31,6 +31,7 @@ export class SqsServiceExtension implements ServiceExtension {
     const queueUrl = this.extractQueueUrl(request);
     const queueName = this.extractQueueNameFromUrl(queueUrl);
     let spanKind: SpanKind = SpanKind.CLIENT;
+    let spanName: string;
 
     const spanAttributes = {
       [SqsAttributeNames.MESSAGING_SYSTEM]: "aws.sqs",
@@ -46,19 +47,22 @@ export class SqsServiceExtension implements ServiceExtension {
       case "receiveMessage":
         isIncoming = true;
         spanKind = SpanKind.CONSUMER;
+        spanName = queueName;
         spanAttributes[SqsAttributeNames.MESSAGING_OPERATION] = "receive";
         break;
 
       case "sendMessage":
       case "sendMessageBatch":
         spanKind = SpanKind.PRODUCER;
+        spanName = queueName;
         break;
     }
 
     return {
       isIncoming,
       spanAttributes,
       spanKind,
+      spanName,
     };
   }