feat(google-cloud-serverless)!: Use http.client span op for GCP HTTP requests

The endpoint-derived suffix fragmented grouping and was unbounded for
non-`googleapis.com` endpoints. Service identity moves to the
`server.address` attribute; `http.request.method` is now set as well.

Ref: JS-3105

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: msonnb

MIGRATION.md

@@ -261,6 +261,7 @@ Affected SDKs: All SDKs.
 Span operations (`sentry.op`) were aligned with the values defined in `@sentry/conventions`:
 
 - `@sentry/node`: Firebase Functions spans now use `function.gcp` instead of `http.request`. The wrapper instruments all function trigger types (HTTP, Firestore, scheduler, storage), so a fixed HTTP op was wrong. The trigger type remains available on the `faas.trigger` attribute.
+- `@sentry/google-cloud-serverless`: `googleCloudHttpIntegration` spans now use `http.client` instead of `http.client.<service>`. The service is now identified by the new `server.address` attribute.
 
 If you reference these operations in dashboards, alerts, or `beforeSendSpan`, update them to the new values.
 

packages/google-cloud-serverless/package.json

@@ -41,6 +41,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@sentry/conventions": "^0.16.0",
     "@sentry/core": "10.67.0",
     "@sentry/node": "10.67.0"
   },

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

@@ -1,10 +1,13 @@
 import type * as common from '@google-cloud/common';
+import { HTTP_REQUEST_METHOD, SENTRY_ORIGIN, SERVER_ADDRESS } from '@sentry/conventions/attributes';
+import { WEB_SERVER_HTTP_CLIENT_SPAN_OP } from '@sentry/conventions/op';
 import type { Client, IntegrationFn } from '@sentry/core';
 import {
   defineIntegration,
   fill,
   getClient,
-  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  isURLObjectRelative,
+  parseStringToURLObject,
   SentryNonRecordingSpan,
 } from '@sentry/core';
 import { startInactiveSpan } from '@sentry/node';
@@ -54,9 +57,11 @@ function wrapRequestFunction(orig: RequestFunction): RequestFunction {
       ? startInactiveSpan({
           name: `${httpMethod} ${reqOpts.uri}`,
           onlyIfParent: true,
-          op: `http.client.${identifyService(this.apiEndpoint)}`,
+          op: WEB_SERVER_HTTP_CLIENT_SPAN_OP,
           attributes: {
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.serverless',
+            [SENTRY_ORIGIN]: 'auto.http.serverless',
+            [HTTP_REQUEST_METHOD]: httpMethod,
+            [SERVER_ADDRESS]: getServerAddress(this.apiEndpoint),
           },
         })
       : new SentryNonRecordingSpan();
@@ -67,8 +72,8 @@ function wrapRequestFunction(orig: RequestFunction): RequestFunction {
   };
 }
 
-/** Identifies service by its base url */
-function identifyService(apiEndpoint: string): string {
-  const match = apiEndpoint.match(/^https:\/\/(\w+)\.googleapis.com$/);
-  return match?.[1] || apiEndpoint.replace(/^(http|https)?:\/\//, '');
+/** Extracts the host of the API endpoint the request is sent to */
+function getServerAddress(apiEndpoint: string): string {
+  const url = parseStringToURLObject(apiEndpoint);
+  return url && !isURLObjectRelative(url) ? url.host : apiEndpoint;
 }

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

@@ -76,19 +76,23 @@ describe('GoogleCloudHttp tracing', () => {
       const resp = await bigquery.query('SELECT true AS foo');
       expect(resp).toEqual([[{ foo: true }]]);
       expect(mockStartInactiveSpan).toBeCalledWith({
-        op: 'http.client.bigquery',
+        op: 'http.client',
         name: 'POST /jobs',
         onlyIfParent: true,
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.serverless',
+          'http.request.method': 'POST',
+          'server.address': 'bigquery.googleapis.com',
         },
       });
       expect(mockStartInactiveSpan).toBeCalledWith({
-        op: 'http.client.bigquery',
+        op: 'http.client',
         name: expect.stringMatching(/^GET \/queries\/.+/),
         onlyIfParent: true,
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.serverless',
+          'http.request.method': 'GET',
+          'server.address': 'bigquery.googleapis.com',
         },
       });
     });