chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andreiborza wants to merge 11 commits into from
Closed

chore: Bump otel 2.x #15518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b9df6c
chore: Bump otel 2.0.0
andreiborza Feb 26, 2025
2638189
Replace sdk-trace-base with sdk-trace-node
andreiborza Feb 27, 2025
5450f1c
Update spanUtils to take parent_span_id from parentSpanContext
andreiborza Feb 27, 2025
006234a
Remove `addSpanProcessor` call
andreiborza Feb 27, 2025
7939d9f
Bump to 2.0.0-rc.1/0.200-rc.1
andreiborza Mar 17, 2025
73efda3
Merge default otel resource when creating new provider
andreiborza Mar 17, 2025
d070c0c
Bump to 2.0.0/0.200.0
andreiborza Mar 18, 2025
5e422d1
Update spanTypes tests
andreiborza Mar 18, 2025
498a2ae
Switch back to BasicTracerProvider in otel test helper
andreiborza Mar 19, 2025
7cc0006
Remove leftover NodeTracerProvider
andreiborza Mar 19, 2025
f2314d4
Replace SpanClass with isSpan helper
andreiborza Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/sdk-trace-node": "^1.25.1",
"@opentelemetry/sdk-trace-node": "^2.0.0",
"@sentry/node": "latest || *",
"@sentry/opentelemetry": "latest || *",
"@types/express": "4.17.17",
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.52.1",
"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
"@opentelemetry/sdk-node": "0.200.0",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0",
"@sentry/core": "latest || *",
"@sentry/node": "latest || *",
"@sentry/opentelemetry": "latest || *",
Expand Down
8 changes: 4 additions & 4 deletions dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/sdk-trace-node": "1.26.0",
"@opentelemetry/exporter-trace-otlp-http": "0.53.0",
"@opentelemetry/sdk-trace-node": "2.0.0",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0",
"@opentelemetry/instrumentation-undici": "0.6.0",
"@opentelemetry/instrumentation-http": "0.53.0",
"@opentelemetry/instrumentation": "0.53.0",
"@opentelemetry/instrumentation-http": "0.200.0",
"@opentelemetry/instrumentation": "0.200.0",
"@sentry/core": "latest || *",
"@sentry/node": "latest || *",
"@sentry/opentelemetry": "latest || *",
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/node-otel/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
"test:assert": "pnpm test"
},
"dependencies": {
"@opentelemetry/sdk-node": "0.52.1",
"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
"@opentelemetry/sdk-node": "0.200.0",
"@opentelemetry/exporter-trace-otlp-http": "0.200.0",
"@sentry/core": "latest || *",
"@sentry/node": "latest || *",
"@sentry/opentelemetry": "latest || *",
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/instrumentation": "^0.57.2",
"@opentelemetry/instrumentation": "^0.200.0",
"@opentelemetry/instrumentation-aws-lambda": "0.50.3",
"@opentelemetry/instrumentation-aws-sdk": "0.49.1",
"@sentry/core": "9.10.1",
Expand Down
8 changes: 5 additions & 3 deletions packages/core/src/utils/spanUtils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
SpanOrigin,
SpanStatus,
SpanTimeInput,
SpanContextData,
TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

// Handle a span from @opentelemetry/sdk-base-trace's `Span` class
if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
const { attributes, startTime, name, endTime, status, links } = span;
const parent_span_id = span.parentSpanContext?.spanId;

return {
span_id,
trace_id,
data: attributes,
description: name,
parent_span_id: parentSpanId,
parent_span_id,
start_timestamp: spanTimeInputToSeconds(startTime),
// This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
name: string;
status: SpanStatus;
endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
links?: SpanLink[];
}

Expand Down
4 changes: 2 additions & 2 deletions packages/nestjs/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/instrumentation": "0.57.2",
"@opentelemetry/core": "^2.0.0",
"@opentelemetry/instrumentation": "0.200.0",
"@opentelemetry/instrumentation-nestjs-core": "0.44.1",
"@opentelemetry/semantic-conventions": "^1.30.0",
"@sentry/core": "9.10.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
InstrumentationBase,
InstrumentationNodeModuleDefinition,
InstrumentationNodeModuleFile,
isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down
2 changes: 1 addition & 1 deletion packages/nestjs/src/integrations/sentry-nest-instrumentation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
InstrumentationBase,
InstrumentationNodeModuleDefinition,
InstrumentationNodeModuleFile,
isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down
12 changes: 6 additions & 6 deletions packages/node/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^1.30.1",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/instrumentation": "^0.57.2",
"@opentelemetry/context-async-hooks": "^2.0.0",
"@opentelemetry/core": "^2.0.0",
"@opentelemetry/instrumentation": "^0.200.0",
"@opentelemetry/instrumentation-amqplib": "^0.46.1",
"@opentelemetry/instrumentation-connect": "0.43.1",
"@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
"@opentelemetry/instrumentation-generic-pool": "0.43.1",
"@opentelemetry/instrumentation-graphql": "0.47.1",
"@opentelemetry/instrumentation-hapi": "0.45.2",
"@opentelemetry/instrumentation-http": "0.57.2",
"@opentelemetry/instrumentation-http": "0.200.0",
"@opentelemetry/instrumentation-ioredis": "0.47.1",
"@opentelemetry/instrumentation-kafkajs": "0.7.1",
"@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
"@opentelemetry/instrumentation-redis-4": "0.46.1",
"@opentelemetry/instrumentation-tedious": "0.18.1",
"@opentelemetry/instrumentation-undici": "0.10.1",
"@opentelemetry/resources": "^1.30.1",
"@opentelemetry/sdk-trace-base": "^1.30.1",
"@opentelemetry/resources": "^2.0.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/semantic-conventions": "^1.30.0",
"@prisma/instrumentation": "6.5.0",
"@sentry/core": "9.10.1",
Expand Down
3 changes: 1 addition & 2 deletions packages/node/src/integrations/http/SentryHttpInstrumentation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
*/
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
public constructor(config: SentryHttpInstrumentationOptions = {}) {
super('@sentry/instrumentation-http', VERSION, config);
super('@sentry/instrumentation-http', '2.0.0', config);
}

/** @inheritdoc */
Expand Down
3 changes: 1 addition & 2 deletions packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
private _propagationDecisionMap: LRUMap<string, boolean>;

public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
super('@sentry/instrumentation-node-fetch', VERSION, config);
super('@sentry/instrumentation-node-fetch', '2.0.0', config);
this._channelSubs = [];
this._propagationDecisionMap = new LRUMap<string, boolean>(100);
}
Expand Down
5 changes: 2 additions & 3 deletions packages/node/src/sdk/client.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
// eslint-disable-next-line jsdoc/require-jsdoc
public async flush(timeout?: number): Promise<boolean> {
const provider = this.traceProvider;
const spanProcessor = provider?.activeSpanProcessor;

if (spanProcessor) {
await spanProcessor.forceFlush();
if (provider) {
await provider.forceFlush();
}

if (this.getOptions().sendClientReports) {
Expand Down
16 changes: 9 additions & 7 deletions packages/node/src/sdk/initOtel.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
// Create and configure NodeTracerProvider
const provider = new BasicTracerProvider({
sampler: new SentrySampler(client),
resource: new Resource({
[ATTR_SERVICE_NAME]: 'node',
// eslint-disable-next-line deprecation/deprecation
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
[ATTR_SERVICE_VERSION]: SDK_VERSION,
}),
resource: defaultResource().merge(
resourceFromAttributes({
[ATTR_SERVICE_NAME]: 'node',
// eslint-disable-next-line deprecation/deprecation
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
[ATTR_SERVICE_VERSION]: SDK_VERSION,
}),
),
forceFlushTimeoutMillis: 500,
spanProcessors: [
new SentrySpanProcessor({
Expand Down
2 changes: 1 addition & 1 deletion packages/node/src/utils/ensureIsWrapped.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down
16 changes: 8 additions & 8 deletions packages/opentelemetry/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
},
"peerDependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^1.30.1",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/instrumentation": "^0.57.1",
"@opentelemetry/sdk-trace-base": "^1.30.1",
"@opentelemetry/context-async-hooks": "^2.0.0",
"@opentelemetry/core": "^2.0.0",
"@opentelemetry/instrumentation": "^0.200.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/semantic-conventions": "^1.28.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/context-async-hooks": "^1.30.1",
"@opentelemetry/core": "^1.30.1",
"@opentelemetry/instrumentation": "^0.57.2",
"@opentelemetry/sdk-trace-base": "^1.30.1",
"@opentelemetry/context-async-hooks": "^2.0.0",
"@opentelemetry/core": "^2.0.0",
"@opentelemetry/instrumentation": "^0.200.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/semantic-conventions": "^1.30.0"
},
"scripts": {
Expand Down
7 changes: 3 additions & 4 deletions packages/opentelemetry/src/custom/client.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
* Wrap an Client class with things we need for OpenTelemetry support.
* Wrap a Client class with things we need for OpenTelemetry support.
* Make sure that the Client class passed in is non-abstract!
*
* Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
*/
public async flush(timeout?: number): Promise<boolean> {
const provider = this.traceProvider;
const spanProcessor = provider?.activeSpanProcessor;

if (spanProcessor) {
await spanProcessor.forceFlush();
if (provider) {
await provider.forceFlush();
}

return super.flush(timeout);
Expand Down
7 changes: 4 additions & 3 deletions packages/opentelemetry/src/spanExporter.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
// even if `span.parentSpanId` is set
// this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
// We only want to continue the traceId in this case, but ignore the parent span
const parent_span_id = span.parentSpanId;
const parent_span_id = span.parentSpanContext?.spanId;

const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

const span_id = span.spanContext().spanId;
const trace_id = span.spanContext().traceId;
const parent_span_id = span.parentSpanContext?.spanId;

const { attributes, startTime, endTime, parentSpanId, links } = span;
const { attributes, startTime, endTime, links } = span;

const { op, description, data, origin = 'manual' } = getSpanData(span);
const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
trace_id,
data: allData,
description,
parent_span_id: parentSpanId,
parent_span_id,
start_timestamp: spanTimeInputToSeconds(startTime),
// This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down
2 changes: 1 addition & 1 deletion packages/opentelemetry/src/utils/groupSpansWithParents.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
// If the parentId is the trace parent ID, we pretend it's undefined
// As this means the parent exists somewhere else
return !parentIsRemote ? span.parentSpanId : undefined;
return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down
6 changes: 2 additions & 4 deletions packages/opentelemetry/src/utils/spanTypes.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
* This is necessary because the base `Span` type does not have a kind,
* so in places where we are passed a generic span, we need to check if we want to access it.
*/
export function spanHasParentId<SpanType extends AbstractSpan>(
span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
const castSpan = span as ReadableSpan;
return !!castSpan.parentSpanId;
return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down
16 changes: 9 additions & 7 deletions packages/opentelemetry/test/helpers/initOtel.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
// Create and configure NodeTracerProvider
const provider = new BasicTracerProvider({
sampler: new SentrySampler(client),
resource: new Resource({
[ATTR_SERVICE_NAME]: 'opentelemetry-test',
// eslint-disable-next-line deprecation/deprecation
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
[ATTR_SERVICE_VERSION]: SDK_VERSION,
}),
resource: defaultResource().merge(
resourceFromAttributes({
[ATTR_SERVICE_NAME]: 'opentelemetry-test',
// eslint-disable-next-line deprecation/deprecation
[SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
[ATTR_SERVICE_VERSION]: SDK_VERSION,
}),
),
forceFlushTimeoutMillis: 500,
spanProcessors: [new SentrySpanProcessor()],
});
Expand Down
12 changes: 12 additions & 0 deletions packages/opentelemetry/test/helpers/isSpan.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
return (
typeof value === 'object' &&
value !== null &&
'spanContext' in value &&
(value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
(value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
);
};
4 changes: 2 additions & 2 deletions packages/opentelemetry/test/helpers/mockSdkInit.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

if (provider instanceof ProxyTracerProvider) {
provider = provider.getDelegate();
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
chore: Bump otel 2.x#15518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

andreiborza
wants to merge
11
commits into

from

 Closed


chore: Bump otel 2.x
#15518
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


11 commits


Select commit
Hold shift + click to select a range
8b9df6c

chore: Bump otel 2.0.0


andreiborza Feb 26, 2025
2638189

Replace sdk-trace-base with sdk-trace-node


andreiborza Feb 27, 2025
5450f1c

Update spanUtils to take parent_span_id from parentSpanContext


andreiborza Feb 27, 2025
006234a

Remove `addSpanProcessor` call


andreiborza Feb 27, 2025
7939d9f

Bump to 2.0.0-rc.1/0.200-rc.1


andreiborza Mar 17, 2025
73efda3

Merge default otel resource when creating new provider


andreiborza Mar 17, 2025
d070c0c

Bump to 2.0.0/0.200.0


andreiborza Mar 18, 2025
5e422d1

Update spanTypes tests


andreiborza Mar 18, 2025
498a2ae

Switch back to BasicTracerProvider in otel test helper


andreiborza Mar 19, 2025
7cc0006

Remove leftover NodeTracerProvider


andreiborza Mar 19, 2025
f2314d4

Replace SpanClass with isSpan helper


andreiborza Mar 19, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
dev-packages/e2e-tests/test-applications/node-otel-custom-sampler/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/sdk-trace-node": "^1.25.1",
 "@opentelemetry/sdk-trace-node": "^2.0.0",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
 "@types/express": "4.17.17",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

8 changes: 4 additions & 4 deletions
dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,11 +11,11 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-trace-node": "1.26.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.53.0",
 "@opentelemetry/sdk-trace-node": "2.0.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@opentelemetry/instrumentation-undici": "0.6.0",
 "@opentelemetry/instrumentation-http": "0.53.0",
 "@opentelemetry/instrumentation": "0.53.0",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

4 changes: 2 additions & 2 deletions
dev-packages/e2e-tests/test-applications/node-otel/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,8 @@
 "test:assert": "pnpm test"
 },
 "dependencies": {
 "@opentelemetry/sdk-node": "0.52.1",
 "@opentelemetry/exporter-trace-otlp-http": "0.52.1",
 "@opentelemetry/sdk-node": "0.200.0",
 "@opentelemetry/exporter-trace-otlp-http": "0.200.0",
 "@sentry/core": "latest || *",
 "@sentry/node": "latest || *",
 "@sentry/opentelemetry": "latest || *",
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
 "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
 "@sentry/core": "9.10.1",
Expand Down

8 changes: 5 additions & 3 deletions
packages/core/src/utils/spanUtils.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ import type {
 SpanOrigin,
 SpanStatus,
 SpanTimeInput,
 SpanContextData,
 TraceContext,
} from '../types-hoist';
import type { SpanLink, SpanLinkJSON } from '../types-hoist/link';
Expand DownExpand Up@@ -145,14 +146,15 @@ export function spanToJSON(span: Span): SpanJSON {

 // Handle a span from @opentelemetry/sdk-base-trace's `Span` class
 if (spanIsOpenTelemetrySdkTraceBaseSpan(span)) {
 const { attributes, startTime, name, endTime, parentSpanId, status, links } = span;
 const { attributes, startTime, name, endTime, status, links } = span;
 const parent_span_id = span.parentSpanContext?.spanId;

 return {
 span_id,
 trace_id,
 data: attributes,
 description: name,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand DownExpand Up@@ -185,7 +187,7 @@ export interface OpenTelemetrySdkTraceBaseSpan extends Span {
 name: string;
 status: SpanStatus;
 endTime: SpanTimeInput;
parentSpanId?: string;
parentSpanContext?: SpanContextData;
 links?: SpanLink[];
}

Expand Down

4 changes: 2 additions & 2 deletions
packages/nestjs/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,8 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "0.57.2",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "0.200.0",
 "@opentelemetry/instrumentation-nestjs-core": "0.44.1",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@sentry/core": "9.10.1",
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-event-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import { SDK_VERSION, captureException, startSpan } from '@sentry/core';
import { getEventSpanOptions } from './helpers';
Expand Down

2 changes: 1 addition & 1 deletion
packages/nestjs/src/integrations/sentry-nest-instrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
import { isWrapped } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import {
 InstrumentationBase,
 InstrumentationNodeModuleDefinition,
 InstrumentationNodeModuleFile,
 isWrapped,
} from '@opentelemetry/instrumentation';
import type { Span } from '@sentry/core';
import {
Expand Down

12 changes: 6 additions & 6 deletions
packages/node/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -66,9 +66,9 @@
 },
 "dependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/instrumentation-amqplib": "^0.46.1",
 "@opentelemetry/instrumentation-connect": "0.43.1",
 "@opentelemetry/instrumentation-dataloader": "0.16.1",
Expand All@@ -78,7 +78,7 @@
 "@opentelemetry/instrumentation-generic-pool": "0.43.1",
 "@opentelemetry/instrumentation-graphql": "0.47.1",
 "@opentelemetry/instrumentation-hapi": "0.45.2",
 "@opentelemetry/instrumentation-http": "0.57.2",
 "@opentelemetry/instrumentation-http": "0.200.0",
 "@opentelemetry/instrumentation-ioredis": "0.47.1",
 "@opentelemetry/instrumentation-kafkajs": "0.7.1",
 "@opentelemetry/instrumentation-knex": "0.44.1",
Expand All@@ -92,8 +92,8 @@
 "@opentelemetry/instrumentation-redis-4": "0.46.1",
 "@opentelemetry/instrumentation-tedious": "0.18.1",
 "@opentelemetry/instrumentation-undici": "0.10.1",
 "@opentelemetry/resources": "^1.30.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/resources": "^2.0.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0",
 "@prisma/instrumentation": "6.5.0",
 "@sentry/core": "9.10.1",
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/http/SentryHttpInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import { context, propagation } from '@opentelemetry/api';
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
import type { AggregationCounts, Client, RequestEventData, SanitizedRequestData, Scope } from '@sentry/core';
Expand DownExpand Up@@ -92,7 +91,7 @@ const MAX_BODY_BYTE_LENGTH = 1024 * 1024;
 */
export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpInstrumentationOptions> {
 public constructor(config: SentryHttpInstrumentationOptions = {}) {
 super('@sentry/instrumentation-http', VERSION, config);
 super('@sentry/instrumentation-http', '2.0.0', config);
 }

 /** @inheritdoc */
Expand Down

3 changes: 1 addition & 2 deletions
packages/node/src/integrations/node-fetch/SentryNodeFetchInstrumentation.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
import { VERSION } from '@opentelemetry/core';
import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
import { InstrumentationBase } from '@opentelemetry/instrumentation';
import type { SanitizedRequestData } from '@sentry/core';
Expand DownExpand Up@@ -56,7 +55,7 @@ export class SentryNodeFetchInstrumentation extends InstrumentationBase<SentryNo
 private _propagationDecisionMap: LRUMap<string, boolean>;

 public constructor(config: SentryNodeFetchInstrumentationOptions = {}) {
 super('@sentry/instrumentation-node-fetch', VERSION, config);
 super('@sentry/instrumentation-node-fetch', '2.0.0', config);
 this._channelSubs = [];
 this._propagationDecisionMap = new LRUMap<string, boolean>(100);
 }
Expand Down

5 changes: 2 additions & 3 deletions
packages/node/src/sdk/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,10 +60,9 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
 // eslint-disable-next-line jsdoc/require-jsdoc
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 if (this.getOptions().sendClientReports) {
Expand Down

16 changes: 9 additions & 7 deletions
packages/node/src/sdk/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import moduleModule from 'module';
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
Expand DownExpand Up@@ -112,12 +112,14 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'node',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [
 new SentrySpanProcessor({
Expand Down

2 changes: 1 addition & 1 deletion
packages/node/src/utils/ensureIsWrapped.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { isWrapped } from '@opentelemetry/core';
import { isWrapped } from '@opentelemetry/instrumentation';
import { consoleSandbox, getClient, getGlobalScope, hasSpansEnabled, isEnabled } from '@sentry/core';
import type { NodeClient } from '../sdk/client';
import { isCjs } from './commonjs';
Expand Down

16 changes: 8 additions & 8 deletions
packages/opentelemetry/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -43,18 +43,18 @@
 },
 "peerDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.1",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.28.0"
 },
 "devDependencies": {
 "@opentelemetry/api": "^1.9.0",
 "@opentelemetry/context-async-hooks": "^1.30.1",
 "@opentelemetry/core": "^1.30.1",
 "@opentelemetry/instrumentation": "^0.57.2",
 "@opentelemetry/sdk-trace-base": "^1.30.1",
 "@opentelemetry/context-async-hooks": "^2.0.0",
 "@opentelemetry/core": "^2.0.0",
 "@opentelemetry/instrumentation": "^0.200.0",
 "@opentelemetry/sdk-trace-base": "^2.0.0",
 "@opentelemetry/semantic-conventions": "^1.30.0"
 },
 "scripts": {
Expand Down

7 changes: 3 additions & 4 deletions
packages/opentelemetry/src/custom/client.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ import type { OpenTelemetryClient as OpenTelemetryClientInterface } from '../typ
/* eslint-disable @typescript-eslint/no-explicit-any */

/**
 * Wrap an Client class with things we need for OpenTelemetry support.
 * Wrap a Client class with things we need for OpenTelemetry support.
 * Make sure that the Client class passed in is non-abstract!
 *
 * Usage:
Expand DownExpand Up@@ -49,10 +49,9 @@ export function wrapClientClass<
 */
 public async flush(timeout?: number): Promise<boolean> {
 const provider = this.traceProvider;
 const spanProcessor = provider?.activeSpanProcessor;

 if (spanProcessor) {
 await spanProcessor.forceFlush();
 if (provider) {
 await provider.forceFlush();
 }

 return super.flush(timeout);
Expand Down

7 changes: 4 additions & 3 deletions
packages/opentelemetry/src/spanExporter.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -255,7 +255,7 @@ export function createTransactionForOtelSpan(span: ReadableSpan): TransactionEve
 // even if `span.parentSpanId` is set
 // this is the case when we are starting a new trace, where we have a virtual span based on the propagationContext
 // We only want to continue the traceId in this case, but ignore the parent span
 const parent_span_id = span.parentSpanId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const status = mapStatus(span);

Expand DownExpand Up@@ -321,8 +321,9 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS

 const span_id = span.spanContext().spanId;
 const trace_id = span.spanContext().traceId;
 const parent_span_id = span.parentSpanContext?.spanId;

 const { attributes, startTime, endTime, parentSpanId, links } = span;
 const { attributes, startTime, endTime, links } = span;

 const { op, description, data, origin = 'manual' } = getSpanData(span);
 const allData = {
Expand All@@ -339,7 +340,7 @@ function createAndFinishSpanForOtelSpan(node: SpanNode, spans: SpanJSON[], sentS
 trace_id,
 data: allData,
 description,
 parent_span_id: parentSpanId,
 parent_span_id,
 start_timestamp: spanTimeInputToSeconds(startTime),
 // This is [0,0] by default in OTEL, in which case we want to interpret this as no end time
 timestamp: spanTimeInputToSeconds(endTime) || undefined,
Expand Down

2 changes: 1 addition & 1 deletion
packages/opentelemetry/src/utils/groupSpansWithParents.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ export function getLocalParentId(span: ReadableSpan): string | undefined {
 const parentIsRemote = span.attributes[SEMANTIC_ATTRIBUTE_SENTRY_PARENT_IS_REMOTE] === true;
 // If the parentId is the trace parent ID, we pretend it's undefined
 // As this means the parent exists somewhere else
 return !parentIsRemote ? span.parentSpanId : undefined;
 return !parentIsRemote ? span.parentSpanContext?.spanId : undefined;
}

function createOrUpdateSpanNodeAndRefs(nodeMap: SpanMap, span: ReadableSpan): void {
Expand Down

6 changes: 2 additions & 4 deletions
packages/opentelemetry/src/utils/spanTypes.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,11 +52,9 @@ export function spanHasName<SpanType extends AbstractSpan>(span: SpanType): span
 * This is necessary because the base `Span` type does not have a kind,
 * so in places where we are passed a generic span, we need to check if we want to access it.
 */
export function spanHasParentId<SpanType extends AbstractSpan>(
 span: SpanType,
): span is SpanType & { parentSpanId: string } {
export function spanHasParentId<SpanType extends AbstractSpan>(span: SpanType): span is SpanType {
 const castSpan = span as ReadableSpan;
 return !!castSpan.parentSpanId;
 return !!castSpan.parentSpanContext?.spanId;
}

/**
Expand Down

16 changes: 9 additions & 7 deletions
packages/opentelemetry/test/helpers/initOtel.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { DiagLogLevel, context, diag, propagation, trace } from '@opentelemetry/api';
import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks';
import { Resource } from '@opentelemetry/resources';
import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
import { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
import {
 ATTR_SERVICE_NAME,
Expand DownExpand Up@@ -56,12 +56,14 @@ export function setupOtel(client: TestClientInterface): BasicTracerProvider {
 // Create and configure NodeTracerProvider
 const provider = new BasicTracerProvider({
 sampler: new SentrySampler(client),
 resource: new Resource({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 resource: defaultResource().merge(
 resourceFromAttributes({
 [ATTR_SERVICE_NAME]: 'opentelemetry-test',
 // eslint-disable-next-line deprecation/deprecation
 [SEMRESATTRS_SERVICE_NAMESPACE]: 'sentry',
 [ATTR_SERVICE_VERSION]: SDK_VERSION,
 }),
 ),
 forceFlushTimeoutMillis: 500,
 spanProcessors: [new SentrySpanProcessor()],
 });
Expand Down

12 changes: 12 additions & 0 deletions
packages/opentelemetry/test/helpers/isSpan.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
import type { Span } from '@opentelemetry/api';
import { INVALID_TRACEID, INVALID_SPANID, type SpanContext } from '@opentelemetry/api';

export const isSpan = (value: unknown): value is Span => {
 return (
 typeof value === 'object' &&
 value !== null &&
 'spanContext' in value &&
 (value.spanContext as () => SpanContext)().traceId !== INVALID_TRACEID &&
 (value.spanContext as () => SpanContext)().spanId !== INVALID_SPANID
 );
};

4 changes: 2 additions & 2 deletions
packages/opentelemetry/test/helpers/mockSdkInit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,8 +7,8 @@ import { getCurrentScope, getGlobalScope, getIsolationScope, flush } from '@sent
import { setOpenTelemetryContextAsyncContextStrategy } from '../../src/asyncContextStrategy';
import { clearOpenTelemetrySetupCheck } from '../../src/utils/setupCheck';
import { init as initTestClient } from './TestClient';
import type { TestClientInterface } from './TestClient';
import { initOtel } from './initOtel';
import type { OpenTelemetryClient } from '../../src/types';

const PUBLIC_DSN = 'https://username@domain/123';

Expand DownExpand Up@@ -54,7 +54,7 @@ export async function cleanupOtel(_provider?: BasicTracerProvider): Promise<void
}

export function getProvider(_provider?: BasicTracerProvider): BasicTracerProvider | undefined {
 let provider = _provider || getClient<OpenTelemetryClient>()?.traceProvider || trace.getTracerProvider();
 let provider = _provider || getClient<TestClientInterface>()?.traceProvider || trace.getTracerProvider();

 if (provider instanceof ProxyTracerProvider) {
 provider = provider.getDelegate();
Expand Down
Loading