Skip to content

Commit da073dc

Browse files
lobsterkatielobsterkatie
committed
s/extractTraceparentData/extractSentrytraceData
1 parent f49e957 commit da073dc

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎packages/nextjs/src/utils/instrumentServer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { captureException, deepReadDirSync, getCurrentHub, Handlers, startTransaction } from '@sentry/node';
2-
import { extractTraceparentData, getActiveTransaction, hasTracingEnabled } from '@sentry/tracing';
2+
import { extractSentrytraceData, getActiveTransaction, hasTracingEnabled } from '@sentry/tracing';
33
import { fill, isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
44
import * as domain from 'domain';
55
import * as http from 'http';
@@ -201,7 +201,7 @@ function makeWrappedReqHandler(origReqHandler: ReqHandler): WrappedReqHandler {
201201
// If there is a trace header set, extract the data from it (parentSpanId, traceId, and sampling decision)
202202
let traceparentData;
203203
if (req.headers && isString(req.headers['sentry-trace'])) {
204-
traceparentData = extractTraceparentData(req.headers['sentry-trace'] as string);
204+
traceparentData = extractSentrytraceData(req.headers['sentry-trace'] as string);
205205
logger.log(`[Tracing] Continuing trace ${traceparentData?.traceId}.`);
206206
}
207207

‎packages/nextjs/src/utils/withSentry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { captureException, flush, getCurrentHub, Handlers, startTransaction } from '@sentry/node';
2-
import { extractTraceparentData, hasTracingEnabled } from '@sentry/tracing';
2+
import { extractSentrytraceData, hasTracingEnabled } from '@sentry/tracing';
33
import { Transaction } from '@sentry/types';
44
import { addExceptionMechanism, isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
55
import * as domain from 'domain';
@@ -39,7 +39,7 @@ export const withSentry = (handler: NextApiHandler): WrappedNextApiHandler => {
3939
// If there is a trace header set, extract the data from it (parentSpanId, traceId, and sampling decision)
4040
let traceparentData;
4141
if (req.headers && isString(req.headers['sentry-trace'])) {
42-
traceparentData = extractTraceparentData(req.headers['sentry-trace'] as string);
42+
traceparentData = extractSentrytraceData(req.headers['sentry-trace'] as string);
4343
logger.log(`[Tracing] Continuing trace ${traceparentData?.traceId}.`);
4444
}
4545

‎packages/node/src/handlers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable max-lines */
22
/* eslint-disable @typescript-eslint/no-explicit-any */
33
import { captureException, getCurrentHub, startTransaction, withScope } from '@sentry/core';
4-
import { extractTraceparentData, Span } from '@sentry/tracing';
4+
import { extractSentrytraceData, Span } from '@sentry/tracing';
55
import { Event, ExtractedNodeRequestData, RequestSessionStatus, Transaction } from '@sentry/types';
66
import { isPlainObject, isString, logger, normalize, stripUrlQueryAndFragment } from '@sentry/utils';
77
import * as cookie from 'cookie';
@@ -56,7 +56,7 @@ export function tracingHandler(): (
5656
// If there is a trace header set, we extract the data from it (parentSpanId, traceId, and sampling decision)
5757
let traceparentData;
5858
if (req.headers && isString(req.headers['sentry-trace'])) {
59-
traceparentData = extractTraceparentData(req.headers['sentry-trace'] as string);
59+
traceparentData = extractSentrytraceData(req.headers['sentry-trace'] as string);
6060
}
6161

6262
const transaction = startTransaction(

‎packages/serverless/src/awslambda.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
withScope,
1010
} from '@sentry/node';
1111
import * as Sentry from '@sentry/node';
12-
import { extractTraceparentData } from '@sentry/tracing';
12+
import { extractSentrytraceData } from '@sentry/tracing';
1313
import { Integration } from '@sentry/types';
1414
import { isString, logger } from '@sentry/utils';
1515
// NOTE: I have no idea how to fix this right now, and don't want to waste more time, as it builds just fine — Kamil
@@ -256,7 +256,7 @@ export function wrapHandler<TEvent, TResult>(
256256
let traceparentData;
257257
const eventWithHeaders = event as { headers?: { [key: string]: string } };
258258
if (eventWithHeaders.headers && isString(eventWithHeaders.headers['sentry-trace'])) {
259-
traceparentData = extractTraceparentData(eventWithHeaders.headers['sentry-trace'] as string);
259+
traceparentData = extractSentrytraceData(eventWithHeaders.headers['sentry-trace'] as string);
260260
}
261261
const transaction = startTransaction({
262262
name: context.functionName,

‎packages/serverless/src/gcpfunction/http.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { captureException, flush, getCurrentHub, Handlers, startTransaction } from '@sentry/node';
2-
import { extractTraceparentData } from '@sentry/tracing';
2+
import { extractSentrytraceData } from '@sentry/tracing';
33
import { isString, logger, stripUrlQueryAndFragment } from '@sentry/utils';
44

55
import { domainify, getActiveDomain, proxyFunction } from './../utils';
@@ -53,7 +53,7 @@ function _wrapHttpFunction(fn: HttpFunction, wrapOptions: Partial<HttpFunctionWr
5353
let traceparentData;
5454
const reqWithHeaders = req as { headers?: { [key: string]: string } };
5555
if (reqWithHeaders.headers && isString(reqWithHeaders.headers['sentry-trace'])) {
56-
traceparentData = extractTraceparentData(reqWithHeaders.headers['sentry-trace'] as string);
56+
traceparentData = extractSentrytraceData(reqWithHeaders.headers['sentry-trace'] as string);
5757
}
5858
const transaction = startTransaction({
5959
name: `${reqMethod} ${reqUrl}`,

‎packages/tracing/src/browser/browsertracing.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { getGlobalObject, logger } from '@sentry/utils';
55
import { startIdleTransaction } from '../hubextensions';
66
import { DEFAULT_IDLE_TIMEOUT, IdleTransaction } from '../idletransaction';
77
import { SpanStatus } from '../spanstatus';
8-
import { extractTraceparentData, secToMs } from '../utils';
8+
import { extractSentrytraceData, secToMs } from '../utils';
99
import { registerBackgroundTabDetection } from './backgroundtab';
1010
import { MetricsInstrumentation } from './metrics';
1111
import {
@@ -237,7 +237,7 @@ export class BrowserTracing implements Integration {
237237
export function getHeaderContext(): Partial<TransactionContext> | undefined {
238238
const header = getMetaContent('sentry-trace');
239239
if (header) {
240-
return extractTraceparentData(header);
240+
return extractSentrytraceData(header);
241241
}
242242

243243
return undefined;

‎packages/tracing/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ addExtensionMethods();
2323
export { addExtensionMethods };
2424

2525
export {
26-
extractTraceparentData,
26+
extractSentrytraceData,
2727
getActiveTransaction,
2828
hasTracingEnabled,
2929
SENTRY_TRACE_REGEX,

‎packages/tracing/src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function hasTracingEnabled(
3232
*
3333
* @returns Object containing data from the header, or undefined if traceparent string is malformed
3434
*/
35-
export function extractTraceparentData(traceparent: string): TraceparentData | undefined {
35+
export function extractSentrytraceData(traceparent: string): TraceparentData | undefined {
3636
const matches = traceparent.match(SENTRY_TRACE_REGEX);
3737
if (matches) {
3838
let parentSampled: boolean | undefined;

‎packages/tracing/test/hub.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { logger } from '@sentry/utils';
88
import { BrowserTracing } from '../src/browser/browsertracing';
99
import { addExtensionMethods } from '../src/hubextensions';
1010
import { Transaction } from '../src/transaction';
11-
import { extractTraceparentData, SENTRY_TRACE_REGEX } from '../src/utils';
11+
import { extractSentrytraceData, SENTRY_TRACE_REGEX } from '../src/utils';
1212
import { addDOMPropertiesToGlobal, getSymbolObjectKeyByName, testOnlyIfNodeVersionAtLeast } from './testutils';
1313

1414
addExtensionMethods();
@@ -376,7 +376,7 @@ describe('Hub', () => {
376376

377377
// check that sampling decision is passed down correctly
378378
expect(transaction.sampled).toBe(true);
379-
expect(extractTraceparentData(headers['sentry-trace'])!.parentSampled).toBe(true);
379+
expect(extractSentrytraceData(headers['sentry-trace'])!.parentSampled).toBe(true);
380380
},
381381
);
382382

@@ -418,7 +418,7 @@ describe('Hub', () => {
418418

419419
// check that sampling decision is passed down correctly
420420
expect(transaction.sampled).toBe(false);
421-
expect(extractTraceparentData(headers['sentry-trace'])!.parentSampled).toBe(false);
421+
expect(extractSentrytraceData(headers['sentry-trace'])!.parentSampled).toBe(false);
422422
},
423423
);
424424

‎packages/tracing/test/utils.test.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { extractTraceparentData } from '../src/utils';
1+
import { extractSentrytraceData } from '../src/utils';
22

3-
describe('extractTraceparentData', () => {
3+
describe('extractSentrytraceData', () => {
44
test('no sample', () => {
5-
const data = extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb') as any;
5+
const data = extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb') as any;
66

77
expect(data).toBeDefined();
88
expect(data.parentSpanId).toEqual('bbbbbbbbbbbbbbbb');
@@ -11,21 +11,21 @@ describe('extractTraceparentData', () => {
1111
});
1212

1313
test('sample true', () => {
14-
const data = extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-1') as any;
14+
const data = extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-1') as any;
1515

1616
expect(data).toBeDefined();
1717
expect(data.parentSampled).toBeTruthy();
1818
});
1919

2020
test('sample false', () => {
21-
const data = extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-0') as any;
21+
const data = extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-0') as any;
2222

2323
expect(data).toBeDefined();
2424
expect(data.parentSampled).toBeFalsy();
2525
});
2626

2727
test('just sample decision - false', () => {
28-
const data = extractTraceparentData('0') as any;
28+
const data = extractSentrytraceData('0') as any;
2929

3030
expect(data).toBeDefined();
3131
expect(data.traceId).toBeUndefined();
@@ -34,7 +34,7 @@ describe('extractTraceparentData', () => {
3434
});
3535

3636
test('just sample decision - true', () => {
37-
const data = extractTraceparentData('1') as any;
37+
const data = extractSentrytraceData('1') as any;
3838

3939
expect(data).toBeDefined();
4040
expect(data.traceId).toBeUndefined();
@@ -44,21 +44,21 @@ describe('extractTraceparentData', () => {
4444

4545
test('invalid', () => {
4646
// trace id wrong length
47-
expect(extractTraceparentData('a-bbbbbbbbbbbbbbbb-1')).toBeUndefined();
47+
expect(extractSentrytraceData('a-bbbbbbbbbbbbbbbb-1')).toBeUndefined();
4848

4949
// parent span id wrong length
50-
expect(extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-b-1')).toBeUndefined();
50+
expect(extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-b-1')).toBeUndefined();
5151

5252
// parent sampling decision wrong length
53-
expect(extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-11')).toBeUndefined();
53+
expect(extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-11')).toBeUndefined();
5454

5555
// trace id invalid hex value
56-
expect(extractTraceparentData('someStuffHereWhichIsNotAtAllHexy-bbbbbbbbbbbbbbbb-1')).toBeUndefined();
56+
expect(extractSentrytraceData('someStuffHereWhichIsNotAtAllHexy-bbbbbbbbbbbbbbbb-1')).toBeUndefined();
5757

5858
// parent span id invalid hex value
59-
expect(extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsoNotSuperHexy-1')).toBeUndefined();
59+
expect(extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsoNotSuperHexy-1')).toBeUndefined();
6060

6161
// bogus sampling decision
62-
expect(extractTraceparentData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-x')).toBeUndefined();
62+
expect(extractSentrytraceData('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-x')).toBeUndefined();
6363
});
6464
});

0 commit comments

Comments
 (0)