more renaming

Author: lobsterkatie

packages/node/test/integrations/http.test.ts

@@ -1,7 +1,7 @@
 import * as sentryCore from '@sentry/core';
 import { Hub } from '@sentry/hub';
 import * as hubModule from '@sentry/hub';
-import { addExtensionMethods, Span, TRACEPARENT_REGEXP, Transaction } from '@sentry/tracing';
+import { addExtensionMethods, SENTRY_TRACE_REGEX, Span, Transaction } from '@sentry/tracing';
 import * as http from 'http';
 import * as nock from 'nock';
 
@@ -77,7 +77,7 @@ describe('tracing', () => {
 
     expect(sentryTraceHeader).toBeDefined();
     expect(tracestateHeader).toBeDefined();
-    expect(TRACEPARENT_REGEXP.test(sentryTraceHeader as string)).toBe(true);
+    expect(SENTRY_TRACE_REGEX.test(sentryTraceHeader as string)).toBe(true);
   });
 
   it("doesn't attach tracing headers to outgoing sentry requests", () => {

packages/tracing/src/span.ts

@@ -380,11 +380,11 @@ export class Span implements SpanInterface {
     // `dsn.publicKey` required and remove the `!`.
 
     return `sentry=${computeTracestateValue({
-      trace_id: this.traceId,
+      traceId: this.traceId,
       environment,
       release,
       // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      public_key: dsn.publicKey!,
+      publicKey: dsn.publicKey!,
     })}`;
   }
 }

packages/tracing/src/utils.ts

@@ -147,10 +147,10 @@ export function secToMs(time: number): number {
 export { stripUrlQueryAndFragment } from '@sentry/utils';
 
 type SentryTracestateData = {
-  trace_id: string;
+  traceId: string;
   environment: string | undefined | null;
   release: string | undefined | null;
-  public_key: string;
+  publicKey: string;
 };
 
 /**

packages/tracing/test/browser/request.test.ts

@@ -241,7 +241,7 @@ describe('callbacks', () => {
 
       expect(setRequestHeader).toHaveBeenCalledWith(
         'sentry-trace',
-        expect.stringMatching(tracingUtils.TRACEPARENT_REGEXP),
+        expect.stringMatching(tracingUtils.SENTRY_TRACE_REGEX),
       );
       expect(setRequestHeader).toHaveBeenCalledWith('tracestate', expect.stringMatching(TRACESTATE_HEADER_REGEX));
     });

packages/tracing/test/hub.test.ts

@@ -9,7 +9,7 @@ import { logger } from '@sentry/utils';
 import { BrowserTracing } from '../src/browser/browsertracing';
 import { addExtensionMethods } from '../src/hubextensions';
 import { Transaction } from '../src/transaction';
-import { computeTracestateValue, extractSentrytraceData, TRACEPARENT_REGEXP } from '../src/utils';
+import { computeTracestateValue, extractSentrytraceData, SENTRY_TRACE_REGEX } from '../src/utils';
 import { addDOMPropertiesToGlobal, getSymbolObjectKeyByName, testOnlyIfNodeVersionAtLeast } from './testutils';
 
 addExtensionMethods();
@@ -63,10 +63,10 @@ describe('Hub', () => {
       const transaction = hub.startTransaction({ name: 'FETCH /ball' });
 
       const b64Value = computeTracestateValue({
-        trace_id: transaction.traceId,
+        traceId: transaction.traceId,
         environment,
         release,
-        public_key: 'dogsarebadatkeepingsecrets',
+        publicKey: 'dogsarebadatkeepingsecrets',
       });
 
       expect(transaction.metadata?.tracestate?.sentry).toEqual(`sentry=${b64Value}`);
@@ -81,10 +81,10 @@ describe('Hub', () => {
       const transaction = getCurrentHub().startTransaction({ name: 'FETCH /ball' });
 
       const b64Value = computeTracestateValue({
-        trace_id: transaction.traceId,
+        traceId: transaction.traceId,
         environment: 'production',
         release,
-        public_key: 'dogsarebadatkeepingsecrets',
+        publicKey: 'dogsarebadatkeepingsecrets',
       });
 
       expect(transaction.metadata?.tracestate?.sentry).toEqual(`sentry=${b64Value}`);
@@ -404,7 +404,7 @@ describe('Hub', () => {
 
           // check that sentry-trace header is added to request
           expect(headers).toEqual(
-            expect.objectContaining({ 'sentry-trace': expect.stringMatching(TRACEPARENT_REGEXP) }),
+            expect.objectContaining({ 'sentry-trace': expect.stringMatching(SENTRY_TRACE_REGEX) }),
           );
 
           // check that sampling decision is passed down correctly
@@ -446,7 +446,7 @@ describe('Hub', () => {
 
           // check that sentry-trace header is added to request
           expect(headers).toEqual(
-            expect.objectContaining({ 'sentry-trace': expect.stringMatching(TRACEPARENT_REGEXP) }),
+            expect.objectContaining({ 'sentry-trace': expect.stringMatching(SENTRY_TRACE_REGEX) }),
           );
 
           // check that sampling decision is passed down correctly

packages/tracing/test/span.test.ts

@@ -2,7 +2,7 @@ import { BrowserClient } from '@sentry/browser';
 import { Hub, Scope } from '@sentry/hub';
 
 import { Span, SpanStatus, Transaction } from '../src';
-import { TRACEPARENT_REGEXP } from '../src/utils';
+import { SENTRY_TRACE_REGEX } from '../src/utils';
 
 describe('Span', () => {
   let hub: Hub;
@@ -94,10 +94,10 @@ describe('Span', () => {
 
   describe('toTraceparent', () => {
     test('simple', () => {
-      expect(new Span().toTraceparent()).toMatch(TRACEPARENT_REGEXP);
+      expect(new Span().toTraceparent()).toMatch(SENTRY_TRACE_REGEX);
     });
     test('with sample', () => {
-      expect(new Span({ sampled: true }).toTraceparent()).toMatch(TRACEPARENT_REGEXP);
+      expect(new Span({ sampled: true }).toTraceparent()).toMatch(SENTRY_TRACE_REGEX);
     });
   });