fix source when streaming

Author: Lms24

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

@@ -59,13 +59,11 @@ function _wrapHttpFunction(fn: HttpFunction, options: Partial<WrapperOptions>):
       const normalizedRequest = httpRequestToRequestData(req);
       getCurrentScope().setSDKProcessingMetadata({ normalizedRequest });
 
-      const client = getClient();
-
       const functionName = getFunctionName();
-      const name =
-        client && hasSpanStreamingEnabled(client)
-          ? functionName || SERVERLESS_FUNCTION_SPAN_NAME_FALLBACK
-          : `${reqMethod} ${reqUrl}`;
+
+      const client = getClient();
+      const hasSpanStreaming = client && hasSpanStreamingEnabled(client);
+      const name = hasSpanStreaming ? functionName || SERVERLESS_FUNCTION_SPAN_NAME_FALLBACK : `${reqMethod} ${reqUrl}`;
 
       return startSpanManual(
         {
@@ -74,7 +72,7 @@ function _wrapHttpFunction(fn: HttpFunction, options: Partial<WrapperOptions>):
             [SENTRY_OP]: FUNCTION_GCP,
             [FAAS_NAME]: functionName,
             [FAAS_TRIGGER]: 'http',
-            [SENTRY_SEGMENT_NAME_SOURCE]: 'route',
+            [SENTRY_SEGMENT_NAME_SOURCE]: hasSpanStreaming ? 'component' : 'route',
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.serverless.gcp_http',
             // The method and path used to be the span name; they stay on the span so that
             // information survives the low-cardinality rename.

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

@@ -215,6 +215,7 @@ describe('GCPFunction', () => {
             // The method and path stay on the span even though they are no longer the name.
             [HTTP_REQUEST_METHOD]: 'POST',
             [URL_PATH]: '/path',
+            [SENTRY_SEGMENT_NAME_SOURCE]: 'component',
           }),
         }),
         expect.any(Function),
@@ -233,7 +234,10 @@ describe('GCPFunction', () => {
       expect(mockStartSpanManual).toBeCalledWith(
         expect.objectContaining({
           name: 'my-cloud-run-service',
-          attributes: expect.objectContaining({ [FAAS_NAME]: 'my-cloud-run-service' }),
+          attributes: expect.objectContaining({
+            [FAAS_NAME]: 'my-cloud-run-service',
+            [SENTRY_SEGMENT_NAME_SOURCE]: 'component',
+          }),
         }),
         expect.any(Function),
       );
@@ -251,7 +255,7 @@ describe('GCPFunction', () => {
       expect(mockStartSpanManual).toBeCalledWith(
         expect.objectContaining({
           name: SERVERLESS_FUNCTION_SPAN_NAME_FALLBACK,
-          attributes: expect.objectContaining({ [FAAS_NAME]: undefined }),
+          attributes: expect.objectContaining({ [FAAS_NAME]: undefined, [SENTRY_SEGMENT_NAME_SOURCE]: 'component' }),
         }),
         expect.any(Function),
       );
@@ -283,7 +287,10 @@ describe('GCPFunction', () => {
       expect(mockStartSpanManual).toBeCalledWith(
         expect.objectContaining({
           name: 'POST /path',
-          attributes: expect.objectContaining({ [FAAS_NAME]: 'myCloudFunction' }),
+          attributes: expect.objectContaining({
+            [FAAS_NAME]: 'myCloudFunction',
+            [SENTRY_SEGMENT_NAME_SOURCE]: 'route',
+          }),
         }),
         expect.any(Function),
       );