test fixes

Author: mydea

dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/tests/basic.test.ts

@@ -33,6 +33,7 @@ test('Lambda layer SDK bundle sends events', async ({ request }) => {
       'sentry.op': 'function.aws.lambda',
       'cloud.account.id': '123453789012',
       'faas.id': 'arn:aws:lambda:us-east-1:123453789012:function:my-lambda',
+      "faas.coldstart": true,
       'otel.kind': 'SERVER',
     },
     op: 'function.aws.lambda',

dev-packages/e2e-tests/test-applications/aws-serverless-esm/tests/basic.test.ts

@@ -28,12 +28,16 @@ test('AWS Serverless SDK sends events in ESM mode', async ({ request }) => {
   expect(transactionEvent.contexts?.trace).toEqual({
     data: {
       'sentry.sample_rate': 1,
-      'sentry.source': 'component',
-      'sentry.origin': 'auto.function.serverless',
+      'sentry.source': 'custom',
+      'sentry.origin': 'auto.otel.aws-lambda',
       'sentry.op': 'function.aws.lambda',
+      'cloud.account.id': '123453789012',
+      'faas.id': 'arn:aws:lambda:us-east-1:123453789012:function:my-lambda',
+      "faas.coldstart": true,
+      'otel.kind': 'SERVER',
     },
     op: 'function.aws.lambda',
-    origin: 'auto.function.serverless',
+    origin: 'auto.otel.aws-lambda',
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     status: 'ok',
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),

packages/aws-serverless/src/sdk.ts

@@ -336,6 +336,7 @@ export function wrapHandler<TEvent, TResult>(
     // Only start a trace and root span if the handler is not already wrapped by Otel instrumentation
     // Otherwise, we create two root spans (one from otel, one from our wrapper).
     // If Otel instrumentation didn't work or was filtered by users, we still want to trace the handler.
+    // TODO(v9): Since bumping the OTEL Instrumentation, this is likely not needed anymore, we can possibly remove this
     if (options.startTrace && !isWrappedByOtel(handler)) {
       const traceData = getAwsTraceData(event as { headers?: Record<string, string> }, context);
 

packages/node/test/integration/transactions.test.ts

@@ -680,7 +680,7 @@ describe('Integration | Transactions', () => {
 
     expect(spans).toHaveLength(2);
 
-    expect(spans[0]!.description).toEqual('inner span 1');
-    expect(spans[1]!.description).toEqual('inner span 2');
+    expect(spans).toContainEqual(expect.objectContaining({ description: 'inner span 1' }));
+    expect(spans).toContainEqual(expect.objectContaining({ description: 'inner span 2' }));
   });
 });