Merge branch 'master' into abhi-reset-idletimeout

Author: AbhiPrasad

.github/workflows/build.yml

@@ -203,6 +203,39 @@ jobs:
       - name: Compute test coverage
         uses: codecov/codecov-action@v1
 
+  job_nextjs_integration_test:
+    name: Test @sentry/nextjs on (Node ${{ matrix.node }})
+    needs: job_build
+    continue-on-error: true
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node: [10, 12, 14, 16]
+    steps:
+      - name: Check out current commit (${{ github.sha }})
+        uses: actions/checkout@v2
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+      - name: Check dependency cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Run tests
+        env:
+          NODE_VERSION: ${{ matrix.node }}
+        run: |
+          cd packages/nextjs
+          yarn test:integration
+
   # Ember tests are separate from the rest because they are the slowest part of the test suite, and making them a
   # separate job allows them to run in parallel with the other tests.
   job_ember_tests:

package.json

@@ -63,6 +63,7 @@
     "@types/sinon": "^7.0.11",
     "chai": "^4.1.2",
     "codecov": "^3.6.5",
+    "deepmerge": "^4.2.2",
     "eslint": "7.32.0",
     "jest": "^24.9.0",
     "karma-browserstack-launcher": "^1.5.1",

packages/browser/test/unit/jest.config.js

@@ -2,6 +2,8 @@ module.exports = {
   transform: {
     '^.+\\.ts$': 'ts-jest',
   },
+  collectCoverage: true,
+  coverageDirectory: '../../coverage',
   moduleFileExtensions: ['js', 'ts'],
   testEnvironment: 'jsdom',
   testMatch: ['**/*.test.ts'],

packages/integrations/rollup.config.js

@@ -1,67 +1,45 @@
 import * as fs from 'fs';
 
-import { terser } from 'rollup-plugin-terser';
 import commonjs from '@rollup/plugin-commonjs';
 
-import {
-  addOnBundleConfig,
-  baseBundleConfig,
-  markAsBrowserBuild,
-  nodeResolvePlugin,
-  typescriptPluginES5,
-} from '../../rollup.config';
-
-const terserInstance = terser({
-  mangle: {
-    // captureExceptions and captureMessage are public API methods and they don't need to be listed here
-    // as mangler doesn't touch user-facing thing, however sentryWrapped is not, and it would be mangled into a minified version.
-    // We need those full names to correctly detect our internal frames for stripping.
-    // I listed all of them here just for the clarity sake, as they are all used in the frames manipulation process.
-    reserved: ['captureException', 'captureMessage', 'sentryWrapped'],
-    properties: false,
-  },
-  output: {
-    comments: false,
-  },
-});
-
-const plugins = [
-  typescriptPluginES5,
-  // replace `__SENTRY_BROWSER_BUNDLE__` with `true` to enable treeshaking of non-browser code
-  markAsBrowserBuild,
-  nodeResolvePlugin,
-  commonjs(),
-];
+import { makeBaseBundleConfig, terserPlugin } from '../../rollup.config';
 
 function allIntegrations() {
   return fs.readdirSync('./src').filter(file => file != 'index.ts');
 }
 
 function loadAllIntegrations() {
   const builds = [];
-  [
-    {
-      extension: '.js',
-      plugins,
-    },
-    {
-      extension: '.min.js',
-      plugins: [...plugins, terserInstance],
-    },
-  ].forEach(build => {
-    builds.push(
-      ...allIntegrations().map(file => ({
+
+  allIntegrations().forEach(file => {
+    const baseBundleConfig = makeBaseBundleConfig({
+      input: `src/${file}`,
+      isAddOn: true,
+      jsVersion: 'es5',
+      outputFileBase: `build/${file.replace('.ts', '')}`,
+    });
+
+    [
+      {
+        extension: '.js',
+        plugins: [...baseBundleConfig.plugins, commonjs()],
+      },
+      {
+        extension: '.min.js',
+        plugins: [...baseBundleConfig.plugins, commonjs(), terserPlugin],
+      },
+    ].forEach(build => {
+      builds.push({
         ...baseBundleConfig,
-        input: `src/${file}`,
         output: {
           ...baseBundleConfig.output,
-          ...addOnBundleConfig.output,
-          file: `build/${file.replace('.ts', build.extension)}`,
+          file: `${baseBundleConfig.output.file}${build.extension}`,
         },
         plugins: build.plugins,
-      })),
-    );
+      });
+    });
   });
+
   return builds;
 }
 

packages/nextjs/package.json

@@ -63,7 +63,8 @@
     "lint:eslint": "eslint . --cache --cache-location '../../eslintcache/' --format stylish",
     "lint:prettier": "prettier --check \"{src,test}/**/*.ts\"",
     "pack": "npm pack",
-    "test": "run-s test:unit test:integration",
+    "test": "run-s test:unit",
+    "test:all": "run-s test:unit test:integration",
     "test:unit": "jest",
     "test:integration": "test/run-integration-tests.sh",
     "test:watch": "jest --watch",

packages/node/package.json

@@ -18,7 +18,6 @@
   "dependencies": {
     "@sentry/core": "6.18.1",
     "@sentry/hub": "6.18.1",
-    "@sentry/tracing": "6.18.1",
     "@sentry/types": "6.18.1",
     "@sentry/utils": "6.18.1",
     "cookie": "^0.4.1",

packages/node/src/handlers.ts

@@ -1,9 +1,15 @@
 /* eslint-disable max-lines */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { captureException, getCurrentHub, startTransaction, withScope } from '@sentry/core';
-import { extractTraceparentData, Span } from '@sentry/tracing';
-import { Event, ExtractedNodeRequestData, Transaction } from '@sentry/types';
-import { isPlainObject, isString, logger, normalize, stripUrlQueryAndFragment } from '@sentry/utils';
+import { Event, ExtractedNodeRequestData, Span, Transaction } from '@sentry/types';
+import {
+  extractTraceparentData,
+  isPlainObject,
+  isString,
+  logger,
+  normalize,
+  stripUrlQueryAndFragment,
+} from '@sentry/utils';
 import * as cookie from 'cookie';
 import * as domain from 'domain';
 import * as http from 'http';

packages/tracing/rollup.config.js

@@ -1,53 +1,30 @@
-import {
-  baseBundleConfig,
-  makeLicensePlugin,
-  markAsBrowserBuild,
-  nodeResolvePlugin,
-  terserPlugin,
-  typescriptPluginES5,
-} from '../../rollup.config';
+import { makeBaseBundleConfig, makeLicensePlugin, terserPlugin } from '../../rollup.config';
 
 const licensePlugin = makeLicensePlugin('@sentry/tracing & @sentry/browser');
 
-const plugins = [
-  typescriptPluginES5,
-  // replace `__SENTRY_BROWSER_BUNDLE__` with `true` to enable treeshaking of non-browser code
-  markAsBrowserBuild,
-  nodeResolvePlugin,
-  licensePlugin,
-];
-
-const bundleConfig = {
-  ...baseBundleConfig,
-  input: 'src/index.ts',
-  output: {
-    ...baseBundleConfig.output,
-    format: 'iife',
-    name: 'Sentry',
-  },
-  context: 'window',
-  plugins,
-};
+const baseBundleConfig = makeBaseBundleConfig({
+  input: 'src/index.bundle.ts',
+  isAddOn: false,
+  jsVersion: 'es5',
+  outputFileBase: 'build/bundle.tracing',
+});
 
 export default [
   // ES5 Browser Tracing Bundle
   {
-    ...bundleConfig,
-    input: 'src/index.bundle.ts',
+    ...baseBundleConfig,
     output: {
-      ...bundleConfig.output,
-      file: 'build/bundle.tracing.js',
+      ...baseBundleConfig.output,
+      file: `${baseBundleConfig.output.file}.js`,
     },
-    plugins: bundleConfig.plugins,
+    plugins: [...baseBundleConfig.plugins, licensePlugin],
   },
   {
-    ...bundleConfig,
-    input: 'src/index.bundle.ts',
+    ...baseBundleConfig,
     output: {
-      ...bundleConfig.output,
-      file: 'build/bundle.tracing.min.js',
+      ...baseBundleConfig.output,
+      file: `${baseBundleConfig.output.file}.min.js`,
     },
-    // Uglify has to be at the end of compilation, BUT before the license banner
-    plugins: bundleConfig.plugins.slice(0, -1).concat(terserPlugin).concat(bundleConfig.plugins.slice(-1)),
+    plugins: [...baseBundleConfig.plugins, terserPlugin, licensePlugin],
   },
 ];

packages/tracing/src/utils.ts

@@ -1,13 +1,19 @@
 import { getCurrentHub, Hub } from '@sentry/hub';
-import { Options, TraceparentData, Transaction } from '@sentry/types';
+import { Options, Transaction } from '@sentry/types';
 
-export const TRACEPARENT_REGEXP = new RegExp(
-  '^[ \\t]*' + // whitespace
-    '([0-9a-f]{32})?' + // trace_id
-    '-?([0-9a-f]{16})?' + // span_id
-    '-?([01])?' + // sampled
-    '[ \\t]*$', // whitespace
-);
+/**
+ * The `extractTraceparentData` function and `TRACEPARENT_REGEXP` constant used
+ * to be declared in this file. It was later moved into `@sentry/utils` as part of a
+ * move to remove `@sentry/tracing` dependencies from `@sentry/node` (`extractTraceparentData`
+ * is the only tracing function used by `@sentry/node`).
+ *
+ * These exports are kept here for backwards compatability's sake.
+ *
+ * TODO(v7): Reorganize these exports
+ *
+ * See https://github.com/getsentry/sentry-javascript/issues/4642 for more details.
+ */
+export { TRACEPARENT_REGEXP, extractTraceparentData } from '@sentry/utils';
 
 /**
  * Determines if tracing is currently enabled.
@@ -20,31 +26,6 @@ export function hasTracingEnabled(maybeOptions?: Options | undefined): boolean {
   return !!options && ('tracesSampleRate' in options || 'tracesSampler' in options);
 }
 
-/**
- * Extract transaction context data from a `sentry-trace` header.
- *
- * @param traceparent Traceparent string
- *
- * @returns Object containing data from the header, or undefined if traceparent string is malformed
- */
-export function extractTraceparentData(traceparent: string): TraceparentData | undefined {
-  const matches = traceparent.match(TRACEPARENT_REGEXP);
-  if (matches) {
-    let parentSampled: boolean | undefined;
-    if (matches[3] === '1') {
-      parentSampled = true;
-    } else if (matches[3] === '0') {
-      parentSampled = false;
-    }
-    return {
-      traceId: matches[1],
-      parentSampled,
-      parentSpanId: matches[2],
-    };
-  }
-  return undefined;
-}
-
 /** Grabs active transaction off scope, if any */
 export function getActiveTransaction<T extends Transaction>(maybeHub?: Hub): T | undefined {
   const hub = maybeHub || getCurrentHub();

packages/utils/src/index.ts

@@ -20,6 +20,7 @@ export * from './string';
 export * from './supports';
 export * from './syncpromise';
 export * from './time';
+export * from './tracing';
 export * from './env';
 export * from './envelope';
 export * from './clientreport';

packages/utils/src/tracing.ts

@@ -0,0 +1,34 @@
+import { TraceparentData } from '@sentry/types';
+
+export const TRACEPARENT_REGEXP = new RegExp(
+  '^[ \\t]*' + // whitespace
+    '([0-9a-f]{32})?' + // trace_id
+    '-?([0-9a-f]{16})?' + // span_id
+    '-?([01])?' + // sampled
+    '[ \\t]*$', // whitespace
+);
+
+/**
+ * Extract transaction context data from a `sentry-trace` header.
+ *
+ * @param traceparent Traceparent string
+ *
+ * @returns Object containing data from the header, or undefined if traceparent string is malformed
+ */
+export function extractTraceparentData(traceparent: string): TraceparentData | undefined {
+  const matches = traceparent.match(TRACEPARENT_REGEXP);
+  if (matches) {
+    let parentSampled: boolean | undefined;
+    if (matches[3] === '1') {
+      parentSampled = true;
+    } else if (matches[3] === '0') {
+      parentSampled = false;
+    }
+    return {
+      traceId: matches[1],
+      parentSampled,
+      parentSpanId: matches[2],
+    };
+  }
+  return undefined;
+}