clean up use of regexes

Author: lobsterkatie

packages/tracing/src/utils.ts

@@ -1,6 +1,5 @@
 import { getCurrentHub, Hub } from '@sentry/hub';
 import { Options, TraceparentData, Transaction } from '@sentry/types';
-import { BASE64_REGEX_PATTERN } from '@sentry/utils';
 
 export const TRACEPARENT_REGEXP = new RegExp(
   '^[ \\t]*' + // whitespace
@@ -10,11 +9,6 @@ export const TRACEPARENT_REGEXP = new RegExp(
     '[ \\t]*$', // whitespace
 );
 
-export const TRACESTATE_HEADER_REGEX = new RegExp(
-  `sentry=(${BASE64_REGEX_PATTERN})` +  // our part of the header - should be the only part or at least the first part
-    `(,\\w+=\\w+)*`, // any number of copies of a comma followed by `name=value`
-);
-
 /**
  * Determines if tracing is currently enabled.
  *

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

@@ -13,6 +13,14 @@ import {
 import { addExtensionMethods } from '../../src/hubextensions';
 import * as tracingUtils from '../../src/utils';
 
+// This is a normal base64 regex, modified to reflect that fact that we strip the trailing = or == off
+const BASE64_MISSING_EQUALS = '([a-zA-Z0-9+/]{4})*(|[a-zA-Z0-9+/]{2,3})';
+
+const TRACESTATE_HEADER_REGEX = new RegExp(
+  `sentry=(${BASE64_MISSING_EQUALS})` +  // our part of the header - should be the only part or at least the first part
+    `(,\\w+=\\w+)*`, // any number of copies of a comma followed by `name=value`
+);
+
 beforeAll(() => {
   addExtensionMethods();
   // @ts-ignore need to override global Request because it's not in the jest environment (even with an
@@ -235,10 +243,7 @@ describe('callbacks', () => {
         'sentry-trace',
         expect.stringMatching(tracingUtils.TRACEPARENT_REGEXP),
       );
-      expect(setRequestHeader).toHaveBeenCalledWith(
-        'tracestate',
-        expect.stringMatching(tracingUtils.TRACESTATE_HEADER_REGEX),
-      );
+      expect(setRequestHeader).toHaveBeenCalledWith('tracestate', expect.stringMatching(TRACESTATE_HEADER_REGEX));
     });
 
     it('creates and finishes XHR span on active transaction', () => {

packages/utils/src/string.ts

@@ -2,12 +2,6 @@ import { getGlobalObject } from './compat';
 import { SentryError } from './error';
 import { isRegExp, isString } from './is';
 
-// The regex is constructed this way because then it's possible to include the base64 pattern as part of other regexes
-// See https://tools.ietf.org/html/rfc4648#section-4 for base64 spec
-// eslint-disable-next-line no-useless-escape
-export const BASE64_REGEX_PATTERN = '(?:[a-zA-Z0-9+/]{4})*(?:|(?:[a-zA-Z0-9+/]{3}=)|(?:[a-zA-Z0-9+/]{2}==))';
-export const BASE64_REGEX = new RegExp(BASE64_REGEX_PATTERN);
-
 /**
  * Truncates given string to the maximum characters count
  *

packages/utils/test/string.test.ts

@@ -1,4 +1,8 @@
-import { BASE64_REGEX, base64ToUnicode, isMatchingPattern, truncate, unicodeToBase64 } from '../src/string';
+import { base64ToUnicode, isMatchingPattern, truncate, unicodeToBase64 } from '../src/string';
+
+// See https://tools.ietf.org/html/rfc4648#section-4 for base64 spec
+// eslint-disable-next-line no-useless-escape
+const BASE64_REGEX = /([a-zA-Z0-9+/]{4})*(|([a-zA-Z0-9+/]{3}=)|([a-zA-Z0-9+/]{2}==))/;
 
 describe('truncate()', () => {
   test('it works as expected', () => {