Skip to content

Commit 35cb4c3

Browse files
committed
simplify otel implementation
1 parent 3ce020d commit 35cb4c3

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/server.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ const Sentry = require('@sentry/node');
44
Sentry.init({
55
dsn: 'https://public@dsn.ingest.sentry.io/1337',
66
transport: loggingTransport,
7-
debug: true,
87
});
98

109
// express must be required after Sentry is initialized
@@ -30,5 +29,4 @@ app.get('/test', (_req, res) => {
3029

3130
Sentry.setupExpressErrorHandler(app);
3231

33-
// TODO: remove port again
34-
startExpressServerAndSendPortToRunner(app, 3000);
32+
startExpressServerAndSendPortToRunner(app);

dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/test.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ describe('getTraceMetaTags', () => {
1313
// @ts-ignore - response is defined, types just don't reflect it
1414
const html = response?.response as unknown as string;
1515

16-
console.log(html);
17-
18-
const [_, traceId, spanId] = html.match(/<meta name="sentry-trace" content="([a-f0-9]{32})-([a-f0-9]{16})"\/>/) || [
16+
const [, traceId, spanId] = html.match(/<meta name="sentry-trace" content="([a-f0-9]{32})-([a-f0-9]{16})"\/>/) || [
1917
undefined,
2018
undefined,
2119
undefined,
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,29 @@
11
import * as api from '@opentelemetry/api';
2-
import { getCurrentScope } from '@sentry/core';
32
import type { SerializedTraceData } from '@sentry/types';
4-
import { getPropagationContextFromSpan } from '../propagator';
5-
import { generateSpanContextForPropagationContext } from './generateSpanContextForPropagationContext';
3+
import { dropUndefinedKeys } from '@sentry/utils';
64

75
/**
86
* Otel-specific implementation of `getTraceData`.
97
* @see `@sentry/core` version of `getTraceData` for more information
108
*/
119
export function getTraceData(): SerializedTraceData {
12-
const ctx = api.context.active();
13-
const spanToUse = api.trace.getSpan(ctx);
10+
const context = api.context.active();
1411

1512
// This should never happen, given we always create an ambient non-recording span if there's no active span.
16-
if (!spanToUse) {
13+
if (!context) {
1714
return {};
1815
}
19-
const headersObject: Record<string, string> = {};
20-
21-
const propagationContext = spanToUse
22-
? getPropagationContextFromSpan(spanToUse)
23-
: getCurrentScope().getPropagationContext();
2416

25-
const spanContext = generateSpanContextForPropagationContext(propagationContext);
26-
27-
const context = api.trace.setSpanContext(ctx, spanContext);
17+
const headersObject: Record<string, string> = {};
2818

2919
api.propagation.inject(context, headersObject);
3020

3121
if (!headersObject['sentry-trace']) {
3222
return {};
3323
}
3424

35-
return {
25+
return dropUndefinedKeys({
3626
'sentry-trace': headersObject['sentry-trace'],
37-
baggage: headersObject['baggage'],
38-
};
27+
baggage: headersObject.baggage,
28+
});
3929
}

0 commit comments

Comments
 (0)