review suggestions

Author: Lms24

packages/google-cloud-serverless/src/gcpfunction/events.ts

@@ -7,14 +7,14 @@ import {
   GCP_FUNCTION_CONTEXT_EVENT_ID,
   GCP_FUNCTION_CONTEXT_RESOURCE,
   GCP_FUNCTION_CONTEXT_TIMESTAMP,
+  SENTRY_ORIGIN,
 } from '@sentry/conventions/attributes';
 import { FUNCTION_GCP } from '@sentry/conventions/op';
 import {
   debug,
   getClient,
   handleCallbackErrors,
   hasSpanStreamingEnabled,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SERVERLESS_FUNCTION_SPAN_NAME_FALLBACK,
 } from '@sentry/core';
 import { captureException, flush, getCurrentScope, startSpanManual } from '@sentry/node';
@@ -66,8 +66,7 @@ function _wrapEventFunction<F extends EventFunction | EventFunctionWithCallback>
           [FAAS_NAME]: functionName,
           [FAAS_TRIGGER]: 'event',
           [SENTRY_SEGMENT_NAME_SOURCE]: 'component',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
-          // not yet in conventions but this attribute will also determine the span description
+          [SENTRY_ORIGIN]: 'auto.function.serverless.gcp_event',
           [GCP_FUNCTION_CONTEXT_EVENT_TYPE]: context.eventType,
           [GCP_FUNCTION_CONTEXT_EVENT_ID]: context.eventId,
           [GCP_FUNCTION_CONTEXT_RESOURCE]: context.resource,

packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts

@@ -312,7 +312,7 @@ describe('wrapCloudEventFunction', () => {
       const wrappedHandler = wrapCloudEventFunction(handler);
       await expect(handleCloudEvent(wrappedHandler)).rejects.toThrowError(error);
 
-      const expectedStartSapanOptions = {
+      const expectedStartSpanOptions = {
         name: 'google.cloud.pubsub.topic.v1.messagePublished',
         attributes: {
           [SENTRY_OP]: FUNCTION_GCP,
@@ -328,7 +328,7 @@ describe('wrapCloudEventFunction', () => {
         },
       };
 
-      expect(mockStartSpanManual).toBeCalledWith(expectedStartSapanOptions, expect.any(Function));
+      expect(mockStartSpanManual).toBeCalledWith(expectedStartSpanOptions, expect.any(Function));
       expect(mockCaptureException).toBeCalledWith(error, expect.any(Function));
 
       const scopeFunction = mockCaptureException.mock.calls[0][1];