ref(opentelemetry): Drop OTel resource and contexts.otel.resource

MIGRATION.md

@@ -482,7 +482,8 @@ Sentry.init({
 - `getTraceContextForScope` was removed. Scope-to-trace-context resolution now goes through the shared core implementation.
 - `OpenTelemetryServerRuntimeOptions` was removed.
 - The `@opentelemetry/core` peer dependency was removed; its APIs are now vendored internally.
-- OpenTelemetry resources are no longer collected, and `contexts.otel.resource` was dropped from events.
+- `getSentryResource` was removed.
+- OpenTelemetry resources are no longer collected, and `contexts.otel.resource` was dropped from events. As a result, the `OTEL_SERVICE_NAME` and `OTEL_RESOURCE_ATTRIBUTES` environment variables are no longer read by the SDK.
 
 ### `@sentry/core` span attributes
 

dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts

@@ -70,7 +70,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
         culture: expect.any(Object),
         device: expect.any(Object),
         os: expect.any(Object),
-        otel: expect.any(Object),
         runtime: expect.any(Object),
         trace: {
           data: {

dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

@@ -71,7 +71,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
         culture: expect.any(Object),
         device: expect.any(Object),
         os: expect.any(Object),
-        otel: expect.any(Object),
         runtime: expect.any(Object),
         trace: {
           data: {

dev-packages/e2e-tests/test-applications/astro-6/tests/tracing.dynamic.test.ts

@@ -71,7 +71,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
         culture: expect.any(Object),
         device: expect.any(Object),
         os: expect.any(Object),
-        otel: expect.any(Object),
         runtime: expect.any(Object),
         trace: {
           data: {

dev-packages/e2e-tests/test-applications/astro-7/tests/tracing.dynamic.test.ts

@@ -68,7 +68,6 @@ test.describe('tracing in dynamically rendered (ssr) routes', () => {
         culture: expect.any(Object),
         device: expect.any(Object),
         os: expect.any(Object),
-        otel: expect.any(Object),
         runtime: expect.any(Object),
         trace: {
           data: {

packages/node/src/sdk/initOtel.ts

@@ -6,7 +6,6 @@ import type { NodeClient } from './client';
 import {
   applyOtelSpanData,
   backfillStreamedSpanDataFromOtel,
-  getSentryResource,
   SentryPropagator,
   SentryTracerProvider,
 } from '@sentry/opentelemetry';
@@ -123,7 +122,7 @@ function getPreloadMethods(integrationNames?: string[]): ((() => void) & { id: s
 
 /** Just exported for tests. */
 export function setupOtel(client: NodeClient): SentryTracerProvider | undefined {
-  const provider = new SentryTracerProvider({ resource: getSentryResource('node') });
+  const provider = new SentryTracerProvider();
 
   if (!registerGlobalTracerProvider(provider)) {
     DEBUG_BUILD &&
@@ -143,19 +142,5 @@ export function setupOtel(client: NodeClient): SentryTracerProvider | undefined
     client.on('preprocessSpan', backfillStreamedSpanDataFromOtel);
   }
 
-  client.on('preprocessEvent', event => {
-    if (event.type !== 'transaction') {
-      return;
-    }
-
-    event.contexts = {
-      ...event.contexts,
-      otel: {
-        resource: provider.resource?.attributes,
-        ...event.contexts?.otel,
-      },
-    };
-  });
-
   return provider;
 }

packages/node/test/integration/transactions.test.ts

@@ -72,17 +72,6 @@ describe('Integration | Transactions', () => {
       { message: 'test breadcrumb 3', timestamp: 123456 },
     ]);
 
-    expect(transaction.contexts?.otel).toEqual({
-      resource: {
-        'service.name': 'node',
-        'service.namespace': 'sentry',
-        'service.version': expect.any(String),
-        'telemetry.sdk.language': 'nodejs',
-        'telemetry.sdk.name': 'opentelemetry',
-        'telemetry.sdk.version': expect.any(String),
-      },
-    });
-
     expect(transaction.contexts?.trace).toEqual({
       data: {
         'sentry.op': 'test op',

packages/opentelemetry/src/index.ts

@@ -7,8 +7,6 @@ export { applyOtelSpanData } from './applyOtelSpanData';
 export { backfillStreamedSpanDataFromOtel } from './utils/backfillStreamedSpanData';
 export { SentryTracerProvider } from './tracerProvider';
 
-export { getSentryResource } from './resource';
-
 export { type AsyncLocalStorageLookup } from './asyncLocalStorageContextManager';
 
 export { setOpenTelemetryContextAsyncContextStrategy } from './asyncContextStrategy';

packages/opentelemetry/src/tracerProvider.ts

@@ -1,19 +1,12 @@
 import type { Tracer, TracerOptions, TracerProvider } from '@opentelemetry/api';
-import type { SpanAttributes } from '@sentry/core';
 import { SentryTracer } from './tracer';
 
 /**
  * A minimal OpenTelemetry TracerProvider which creates native Sentry spans.
  */
 export class SentryTracerProvider implements TracerProvider {
-  public readonly resource?: { attributes: SpanAttributes };
-
   private readonly _tracers = new Map<string, SentryTracer>();
 
-  public constructor(options: { resource?: { attributes: SpanAttributes } } = {}) {
-    this.resource = options.resource;
-  }
-
   /** @inheritdoc */
   public getTracer(name: string, version?: string, options?: TracerOptions): Tracer {
     const key = JSON.stringify([name, version, options]);

packages/opentelemetry/test/helpers/initOtel.ts

@@ -2,7 +2,6 @@ import { diag, DiagLogLevel, propagation, trace } from '@opentelemetry/api';
 import { debug, getClient } from '@sentry/core';
 import { DEBUG_BUILD } from '../../src/debug-build';
 import { SentryPropagator } from '../../src/propagator';
-import { getSentryResource } from '../../src/resource';
 import { setupEventContextTrace } from '../../src/setupEventContextTrace';
 import type { TestClient } from './TestClient';
 import { SentryTracerProvider } from '../../src/tracerProvider';
@@ -38,7 +37,7 @@ export function initOtel(): void {
 
   setupEventContextTrace(client);
 
-  const provider = new SentryTracerProvider({ resource: getSentryResource('node') });
+  const provider = new SentryTracerProvider();
 
   trace.setGlobalTracerProvider(provider);
   propagation.setGlobalPropagator(new SentryPropagator());

packages/vercel-edge/src/sdk.ts

@@ -17,7 +17,6 @@ import {
   stackParserFromStackParserOptions,
 } from '@sentry/core';
 import {
-  getSentryResource,
   SentryPropagator,
   SentryTracerProvider,
   setOpenTelemetryContextAsyncContextStrategy,
@@ -114,7 +113,7 @@ export function setupOtel(client: VercelEdgeClient): void {
     setupOpenTelemetryLogger();
   }
 
-  const provider = new SentryTracerProvider({ resource: getSentryResource('edge') });
+  const provider = new SentryTracerProvider();
 
   trace.setGlobalTracerProvider(provider);
   propagation.setGlobalPropagator(new SentryPropagator());