Merge remote-tracking branch 'origin/master' into feat/ember-add-render-and-initial-load

k-fish · k-fish · commit 0267d38b7f81 · 2020-09-15T10:20:24.000-07:00
diff --git a/.size-limit.js b/.size-limit.js
@@ -21,6 +21,6 @@ module.exports = [
     name: '@sentry/browser + @sentry/tracing - CDN Bundle (gzipped)',
     path: 'packages/tracing/build/bundle.tracing.min.js',
     gzip: true,
-    limit: '23 KB',
+    limit: '25 KB',
   },
 ];
diff --git a/README.md b/README.md
@@ -82,8 +82,8 @@ Besides the high-level SDKs, this repository contains shared packages, helpers a
 development. If you're thinking about contributing to or creating a JavaScript-based SDK, have a look at the resources
 below:
 
-- [`@sentry/apm`](https://github.com/getsentry/sentry-javascript/tree/master/packages/apm): Provides Integrations and
-extensions for APM
+- [`@sentry/tracing`](https://github.com/getsentry/sentry-javascript/tree/master/packages/tracing): Provides Integrations and
+extensions for Perfromance Monitoring / Tracing
 - [`@sentry/hub`](https://github.com/getsentry/sentry-javascript/tree/master/packages/hub): Global state management of
   SDKs
 - [`@sentry/minimal`](https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal): Minimal SDK for
diff --git a/packages/integrations/src/vue.ts b/packages/integrations/src/vue.ts
@@ -151,7 +151,9 @@ export class Vue implements Integration {
   /**
    * @inheritDoc
    */
-  public constructor(options: Partial<IntegrationOptions>) {
+  public constructor(
+    options: Partial<Omit<IntegrationOptions, 'tracingOptions'> & { tracingOptions: Partial<TracingOptions> }>,
+  ) {
     this._options = {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       Vue: getGlobalObject<any>().Vue,
@@ -313,7 +315,7 @@ export class Vue implements Integration {
       }
     };
 
-    // Each compomnent has it's own scope, so all activities are only related to one of them
+    // Each component has it's own scope, so all activities are only related to one of them
     this._options.tracingOptions.hooks.forEach(operation => {
       // Retrieve corresponding hooks from Vue lifecycle.
       // eg. mount => ['beforeMount', 'mounted']
diff --git a/packages/serverless/.eslintrc.js b/packages/serverless/.eslintrc.js
@@ -16,6 +16,15 @@ module.exports = {
         project: './tsconfig.json',
       },
     },
+    {
+      files: ['test/**'],
+      rules: {
+        'no-empty': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-non-null-assertion': 'off',
+      },
+    },
   ],
   rules: {
     '@typescript-eslint/no-var-requires': 'off',
diff --git a/packages/serverless/package.json b/packages/serverless/package.json
@@ -20,13 +20,14 @@
     "@sentry/node": "5.23.0",
     "@sentry/types": "5.23.0",
     "@sentry/utils": "5.23.0",
-    "@types/aws-lambda": "^8.10.62",
-    "@types/node": "^14.6.4",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@sentry-internal/eslint-config-sdk": "5.23.0",
+    "@types/aws-lambda": "^8.10.62",
+    "@types/node": "^14.6.4",
     "eslint": "7.6.0",
+    "jest": "^24.7.1",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",
     "rimraf": "^2.6.3",
@@ -51,5 +52,25 @@
     "test:watch": "jest --watch --passWithNoTests",
     "pack": "npm pack"
   },
-  "sideEffects": false
+  "sideEffects": false,
+  "jest": {
+    "collectCoverage": true,
+    "transform": {
+      "^.+\\.ts$": "ts-jest"
+    },
+    "moduleFileExtensions": [
+      "js",
+      "ts"
+    ],
+    "testEnvironment": "node",
+    "testMatch": [
+      "**/*.test.ts"
+    ],
+    "globals": {
+      "ts-jest": {
+        "tsConfig": "./tsconfig.json",
+        "diagnostics": false
+      }
+    }
+  }
 }
diff --git a/packages/serverless/src/awslambda.ts b/packages/serverless/src/awslambda.ts
@@ -165,10 +165,7 @@ export const wrapHandler = <TEvent = any, TResult = any>(
         if (args[0] === null || args[0] === undefined) {
           resolve(callback(...args));
         } else {
-          captureExceptionAsync(args[0], context, options).then(
-            () => reject(callback(...args)),
-            () => reject(callback(...args)),
-          );
+          captureExceptionAsync(args[0], context, options).finally(() => reject(callback(...args)));
         }
       };
     };
diff --git a/packages/serverless/test/.gitkeep b/packages/serverless/test/.gitkeep
diff --git a/packages/serverless/test/__mocks__/@sentry/node.ts b/packages/serverless/test/__mocks__/@sentry/node.ts
@@ -0,0 +1,26 @@
+export const SDK_VERSION = '6.6.6';
+export const Severity = {
+  Warning: 'warning',
+};
+export const fakeScope = {
+  addEventProcessor: jest.fn(),
+  setTransactionName: jest.fn(),
+  setTag: jest.fn(),
+  setContext: jest.fn(),
+};
+export const captureException = jest.fn();
+export const captureMessage = jest.fn();
+export const withScope = jest.fn(cb => cb(fakeScope));
+export const flush = jest.fn(() => Promise.resolve());
+
+export const resetMocks = (): void => {
+  fakeScope.addEventProcessor.mockClear();
+  fakeScope.setTransactionName.mockClear();
+  fakeScope.setTag.mockClear();
+  fakeScope.setContext.mockClear();
+
+  captureException.mockClear();
+  captureMessage.mockClear();
+  withScope.mockClear();
+  flush.mockClear();
+};
diff --git a/packages/serverless/test/awslambda.test.ts b/packages/serverless/test/awslambda.test.ts
diff --git a/packages/serverless/tsconfig.json b/packages/serverless/tsconfig.json
