Cleanup exception context building

Author: kddejong

src/telemetry/TelemetryDecorator.ts

@@ -57,13 +57,17 @@ function createTelemetryMethodDecorator(methodNames: MethodNames) {
                 // Extract Context attributes from arguments if enabled
                 let enhancedConfig = decoratorOptions;
                 if (decoratorOptions.extractContextAttributes) {
-                    const contextArg = args.find((arg) => arg?.constructor?.name === 'Context');
+                    const contextArg = args.find(
+                        (arg) =>
+                            arg?.constructor?.name === 'Context' ||
+                            arg?.constructor?.name === 'ContextWithRelatedEntities',
+                    );
                     if (contextArg) {
                         const contextAttributes: Record<string, string> = {};
                         try {
+                            contextAttributes['entity.type'] = contextArg.getEntityType();
                             contextAttributes['resource.type'] = contextArg.getResourceEntity()?.Type ?? 'unknown';
                             contextAttributes['property.path'] = contextArg.propertyPath?.join('.') ?? 'unknown';
-                            contextAttributes['section'] = contextArg.section ?? 'unknown';
                         } catch {
                             // Ignore errors extracting context attributes
                         }

tst/unit/telemetry/TelemetryDecorator.test.ts

@@ -266,9 +266,9 @@ describe('TelemetryDecorator', () => {
         it('should extract context attributes when enabled', () => {
             const mockContext = {
                 constructor: { name: 'Context' },
+                getEntityType: () => 'Resource',
                 getResourceEntity: () => ({ Type: 'AWS::S3::Bucket' }),
                 propertyPath: ['Resources', 'MyBucket', 'Properties'],
-                section: 'Properties',
             };
 
             class TestClass {
@@ -284,9 +284,9 @@ describe('TelemetryDecorator', () => {
                 name: 'method',
                 extractContextAttributes: true,
                 attributes: {
+                    'entity.type': 'Resource',
                     'resource.type': 'AWS::S3::Bucket',
                     'property.path': 'Resources.MyBucket.Properties',
-                    section: 'Properties',
                 },
             });
         });