ref(core): Use HTTP method constant from conventions

Co-Authored-By: GPT-6 <codex@openai.com>

Author: nicohrubec

packages/astro/src/server/middleware.ts

@@ -2,6 +2,7 @@
 import {
   SENTRY_SEGMENT_NAME_SOURCE,
   HTTP_ROUTE,
+  HTTP_REQUEST_METHOD,
   SENTRY_OP,
   URL_FRAGMENT,
   URL_FULL,
@@ -19,7 +20,6 @@ import {
   hasSpanStreamingEnabled,
   HTTP_SPAN_NAME_FALLBACK,
   objectify,
-  SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,
   spanToJSON,
   winterCGRequestToRequestData,
   filterCollectedUrl,
@@ -222,7 +222,7 @@ async function instrumentRequestStartHttpServerSpan(
             [SENTRY_OP]: HTTP_SERVER,
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.astro',
             [SENTRY_SEGMENT_NAME_SOURCE]: source,
-            [SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: method,
+            [HTTP_REQUEST_METHOD]: method,
             // This is here for backwards compatibility, we used to set this here before
             method,
             [URL_FULL]: filterCollectedUrl(ctx.url.href),

packages/astro/test/server/middleware.test.ts

@@ -1,4 +1,4 @@
-import { SENTRY_SEGMENT_NAME_SOURCE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
+import { HTTP_REQUEST_METHOD, SENTRY_SEGMENT_NAME_SOURCE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';
 import type { Client, Span } from '@sentry/core';
 
 import * as SentryCore from '@sentry/core';
@@ -128,7 +128,7 @@ describe('sentryMiddleware', () => {
           [URL_FULL]: 'https://mydomain.io/users/123/details',
           [URL_PATH]: '/users/123/details',
           [SENTRY_SEGMENT_NAME_SOURCE]: 'route',
-          [SentryCore.SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: 'GET',
+          [HTTP_REQUEST_METHOD]: 'GET',
           'http.route': '/users/[id]/details',
         },
         name: 'GET /users/[id]/details',
@@ -230,7 +230,7 @@ describe('sentryMiddleware', () => {
           [URL_FULL]: 'http://localhost:1234/a%xx',
           [URL_PATH]: 'a%xx',
           [SENTRY_SEGMENT_NAME_SOURCE]: 'url',
-          [SentryCore.SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: 'GET',
+          [HTTP_REQUEST_METHOD]: 'GET',
         },
         name: 'GET a%xx',
       },

packages/browser/src/integrations/graphqlClient.ts

@@ -4,7 +4,6 @@ import {
   hasSpanStreamingEnabled,
   isObjectLike,
   isString,
-  SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,
   spanToJSON,
   stringMatchesSomePattern,
 } from '@sentry/core';
@@ -15,6 +14,7 @@ import {
   GRAPHQL_OPERATION_NAME,
   GRAPHQL_OPERATION_TYPE,
   HTTP_METHOD,
+  HTTP_REQUEST_METHOD,
   SENTRY_OP,
   URL_FULL,
 } from '@sentry/conventions/attributes';
@@ -77,7 +77,7 @@ function _updateSpanWithGraphQLData(client: Client, options: GraphQLClientOption
 
     const httpUrl = spanAttributes[URL_FULL];
     // oxlint-disable-next-line typescript/no-deprecated
-    const httpMethod = spanAttributes[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD] || spanAttributes[HTTP_METHOD];
+    const httpMethod = spanAttributes[HTTP_REQUEST_METHOD] || spanAttributes[HTTP_METHOD];
 
     if (!isString(httpUrl) || !isString(httpMethod)) {
       return;

packages/bun/src/integrations/bunserver.ts

@@ -12,7 +12,6 @@ import {
   HTTP_SPAN_NAME_FALLBACK,
   isURLObjectRelative,
   parseStringToURLObject,
-  SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   setHttpStatus,
   startSpan,
@@ -26,6 +25,7 @@ import type { Server, ServeOptions } from 'bun';
 import {
   CLIENT_ADDRESS,
   CLIENT_PORT,
+  HTTP_REQUEST_METHOD,
   NETWORK_PROTOCOL_NAME,
   SENTRY_OP,
   SENTRY_SEGMENT_NAME_SOURCE,
@@ -356,7 +356,7 @@ function getSpanAttributesFromParsedUrl(
 ): SpanAttributes {
   const attributes: SpanAttributes = {
     [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.bun.serve',
-    [SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD]: request.method || 'GET',
+    [HTTP_REQUEST_METHOD]: request.method || 'GET',
     [SENTRY_SEGMENT_NAME_SOURCE]: 'url',
   };
 

packages/core/src/semanticAttributes.ts

@@ -105,7 +105,9 @@ export const SEMANTIC_ATTRIBUTE_CACHE_KEY = 'cache.key';
 
 export const SEMANTIC_ATTRIBUTE_CACHE_ITEM_SIZE = 'cache.item_size';
 
-/** TODO: Remove these once we update to latest semantic conventions */
+/**
+ * @deprecated Use `HTTP_REQUEST_METHOD` from `@sentry/conventions/attributes` instead.
+ */
 export const SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD = 'http.request.method';
 /**
  * @deprecated Use `URL_FULL` `@sentry/conventions/attributes` instead.

packages/core/src/utils/url.ts

@@ -1,4 +1,5 @@
 import {
+  HTTP_REQUEST_METHOD,
   HTTP_ROUTE,
   SERVER_ADDRESS,
   URL_DOMAIN,
@@ -11,7 +12,7 @@ import {
   URL_SCHEME,
   URL_TEMPLATE,
 } from '@sentry/conventions/attributes';
-import { SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
+import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../semanticAttributes';
 import type { Client } from '../client';
 import type { SpanAttributes } from '../types/span';
 import type { TransactionSource } from '../types/transaction';
@@ -221,7 +222,7 @@ export function getHttpSpanDetailsFromUrlObject(
   }
 
   if (request?.method) {
-    attributes[SEMANTIC_ATTRIBUTE_HTTP_REQUEST_METHOD] = request.method.toUpperCase();
+    attributes[HTTP_REQUEST_METHOD] = request.method.toUpperCase();
   }
 
   if (urlObject) {