Revert "avoid using otel tracer"

This reverts commit 6c01021.

Author: mydea

packages/node-core/src/integrations/http/incoming-requests.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-lines */
 import type { Span } from '@opentelemetry/api';
-import { context, createContextKey, propagation, trace } from '@opentelemetry/api';
+import { context, createContextKey, propagation, SpanKind, trace } from '@opentelemetry/api';
 import type { RPCMetadata } from '@opentelemetry/core';
 import { getRPCMetadata, isTracingSuppressed, RPCType, setRPCMetadata } from '@opentelemetry/core';
 import {
@@ -24,7 +24,6 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SPAN_STATUS_ERROR,
-  startInactiveSpan,
   stripUrlQueryAndFragment,
   withIsolationScope,
 } from '@sentry/core';
@@ -189,12 +188,13 @@ export function instrumentServer(
           const host = headers.host;
           const hostname = host?.replace(/^(.*)(:[0-9]{1,5})/, '$1') || 'localhost';
 
+          const tracer = client.tracer;
           const scheme = fullUrl.startsWith('https') ? 'https' : 'http';
 
-          const span = startInactiveSpan({
-            name: bestEffortTransactionName,
+          // We use the plain tracer.startSpan here so we can pass the span kind
+          const span = tracer.startSpan(bestEffortTransactionName, {
+            kind: SpanKind.SERVER,
             attributes: {
-              'otel.kind': 'SERVER',
               // Sentry specific attributes
               [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.otel.http',

packages/opentelemetry/src/utils/getSpanKind.ts

@@ -1,6 +1,6 @@
 import { SpanKind } from '@opentelemetry/api';
 import type { AbstractSpan } from '../types';
-import { spanHasAttributes, spanHasKind } from './spanTypes';
+import { spanHasKind } from './spanTypes';
 
 /**
  * Get the span kind from a span.
@@ -13,12 +13,5 @@ export function getSpanKind(span: AbstractSpan): SpanKind {
     return span.kind;
   }
 
-  if (spanHasAttributes(span)) {
-    const kind = span.attributes['otel.kind'];
-    if (typeof kind === 'string' && SpanKind[kind as keyof typeof SpanKind]) {
-      return SpanKind[kind as keyof typeof SpanKind];
-    }
-  }
-
   return SpanKind.INTERNAL;
 }

packages/opentelemetry/test/utils/getSpanKind.test.ts

@@ -8,10 +8,4 @@ describe('getSpanKind', () => {
     expect(getSpanKind({} as Span)).toBe(SpanKind.INTERNAL);
     expect(getSpanKind({ kind: SpanKind.CLIENT } as unknown as Span)).toBe(SpanKind.CLIENT);
   });
-
-  it('works with attributes', () => {
-    expect(getSpanKind({ attributes: { 'otel.kind': 'CLIENT' } } as unknown as Span)).toBe(SpanKind.CLIENT);
-    expect(getSpanKind({ attributes: { 'otel.kind': 'SERVER' } } as unknown as Span)).toBe(SpanKind.SERVER);
-    expect(getSpanKind({ attributes: { 'otel.kind': 'TEST' } } as unknown as Span)).toBe(SpanKind.INTERNAL);
-  });
 });