add parseArn helper function; address minor comments

Author: blairhyy-amazon

aws-distro-opentelemetry-node-autoinstrumentation/src/patches/instrumentation-patch.ts

@@ -414,11 +414,7 @@ function patchAwsSdkInstrumentation(instrumentation: Instrumentation): void {
                   }
                 }
               } catch (err) {
-                diag.debug(
-                  `Failed to get auth account access key and region: ${
-                    err instanceof Error ? err.message : String(err)
-                  }`
-                );
+                diag.debug('Failed to get auth account access key and region:', err);
               }
             }
 

aws-distro-opentelemetry-node-autoinstrumentation/src/regional-resource-arn-parser.ts

@@ -5,18 +5,18 @@ import { AttributeValue } from '@opentelemetry/api';
 import { isAccountId } from './utils';
 
 export class RegionalResourceArnParser {
+  private static parseArn(arn: AttributeValue | undefined): string[] | undefined {
+    if (typeof arn !== 'string') return undefined;
+    const parts = arn.split(':');
+    return parts.length >= 6 && parts[0] === 'arn' && isAccountId(parts[4]) ? parts : undefined;
+  }
+
   public static getAccountId(arn: AttributeValue | undefined): string | undefined {
-    if (typeof arn == 'string' && this.isArn(arn)) {
-      return arn.split(':')[4];
-    }
-    return undefined;
+    return this.parseArn(arn)?.[4];
   }
 
   public static getRegion(arn: AttributeValue | undefined): string | undefined {
-    if (typeof arn == 'string' && this.isArn(arn)) {
-      return arn.split(':')[3];
-    }
-    return undefined;
+    return this.parseArn(arn)?.[3];
   }
 
   public static extractDynamoDbTableNameFromArn(arn: AttributeValue | undefined): string | undefined {
@@ -27,21 +27,8 @@ export class RegionalResourceArnParser {
     return this.extractResourceNameFromArn(arn)?.replace('stream/', '');
   }
 
-  // Extracts the name of the resource from an arn
   public static extractResourceNameFromArn(arn: AttributeValue | undefined): string | undefined {
-    if (typeof arn === 'string' && this.isArn(arn)) {
-      const split = arn.split(':');
-      return split[split.length - 1];
-    }
-
-    return undefined;
-  }
-
-  public static isArn(arn: string): boolean {
-    // Check if arn follows the format:
-    // arn:partition:service:region:account-id:resource-type/resource-id or
-    // arn:partition:service:region:account-id:resource-type:resource-id
-    const arnParts = arn.split(':');
-    return arnParts.length >= 6 && arnParts[0] === 'arn' && isAccountId(arnParts[4]);
+    const parts = this.parseArn(arn);
+    return parts?.[parts.length - 1];
   }
 }

aws-distro-opentelemetry-node-autoinstrumentation/test/aws-metric-attribute-generator.test.ts

@@ -1427,21 +1427,21 @@ describe('AwsMetricAttributeGeneratorTest', () => {
       if (region !== undefined) {
         expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_REGION]).toEqual(region);
       } else {
-        expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_REGION]).toEqual(undefined);
+        expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_REGION);
       }
 
       if (accountId !== undefined) {
         expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID]).toEqual(accountId);
-        expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY]).toEqual(undefined);
+        expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY);
       } else {
-        expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID]).toEqual(undefined);
+        expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID);
       }
 
       if (accessKey !== undefined) {
         expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY]).toEqual(accessKey);
-        expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID]).toEqual(undefined);
+        expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID);
       } else {
-        expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY]).toEqual(undefined);
+        expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY);
       }
     }
 
@@ -1451,9 +1451,9 @@ describe('AwsMetricAttributeGeneratorTest', () => {
     expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_TYPE]).toEqual(undefined);
     expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_IDENTIFIER]).toEqual(undefined);
     expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_CLOUDFORMATION_PRIMARY_IDENTIFIER]).toEqual(undefined);
-    expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_REGION]).toEqual(undefined);
-    expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID]).toEqual(undefined);
-    expect(actualAttributes[AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY]).toEqual(undefined);
+    expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_REGION);
+    expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ID);
+    expect(actualAttributes).not.toHaveProperty(AWS_ATTRIBUTE_KEYS.AWS_REMOTE_RESOURCE_ACCOUNT_ACCESS_KEY);
   }
 
   it('testDBUserAttribute', () => {