Merge remote-tracking branch 'origin/master' into lforst-standard-react-application-transaction-session-tests

Author: lforst

.github/workflows/build.yml

@@ -11,6 +11,12 @@ on:
         description: If the commit you want to test isn't the head of a branch, provide its SHA here
         required: false
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
   # We pin the exact version to enforce reproducable builds with node + npm.
   DEFAULT_NODE_VERSION: '16.15.1'
@@ -643,6 +649,7 @@ jobs:
         env:
           E2E_TEST_PUBLISH_SCRIPT_NODE_VERSION: ${{ env.DEFAULT_NODE_VERSION }}
           E2E_TEST_AUTH_TOKEN: ${{ secrets.E2E_TEST_AUTH_TOKEN }}
+          E2E_TEST_DSN: ${{ secrets.E2E_TEST_DSN }}
         run: |
           cd packages/e2e-tests
           yarn test:e2e

.github/workflows/codeql-analysis.yml

@@ -13,13 +13,19 @@ name: 'CodeQL'
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [master]
   schedule:
     - cron: '40 3 * * 0'
 
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

CHANGELOG.md

@@ -4,6 +4,34 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 7.15.0
+
+This release deprecates `@sentry/hub` and all of it's exports. All of the `@sentry/hub` exports have moved to `@sentry/core`. `@sentry/hub` will be removed in the next major release.
+
+- feat(ember): Add ember-engine-router support (#5905)
+- feat(nextjs): Enable `autoInstrumentServerFunctions` per default (#5919)
+- feat(tracing): Make BrowserTracing heartbeat interval configurable (#5867)
+- fix(node): Remove Cookie header from requestdata.headers if cookies should not be sent to Sentry (#5898)
+- fix(remix): Rework dynamic imports of `react-router-dom` (#5897)
+- fix(utils): Accept DSN URLs with empty password (#5902)
+- fix(vue): Finish spans in component tracking before starting new ones for same operation (#5918)
+- ref(hub): Move `@sentry/hub` code to `@sentry/core` (#5823)
+
+Work in this release contributed by @outsideris and @JonasKruckenberg. Thank you for your contributions!
+
+## 7.14.2
+
+- fix(ember): Align span operations to new operations (#5883)
+- fix(nextjs): Consider pageExtensions option in auto instrumentation (#5881)
+- fix(remix): Align span operations to new operations (#5889)
+- fix(serverless): Align span operations to new operations (#5890)
+- fix(tracing): Align span operations to new operations (#5891)
+- fix(vue): Align span operations to new operations (#5892)
+- ref(hub): Remove hard cap from maxBreadcrumbs (#5873)
+- ref(nextjs): Make build-phase check more robust (#5857)
+
+Work in this release contributed by @outsideris. Thank you for your contributions!
+
 ## 7.14.1
 
 - fix(nextjs): Handle CJS API route exports (#5865)
@@ -22,7 +50,7 @@
 - fix(nextjs): Handle `pathname` being passed in object in `instrumentServer` (#5782)
 - fix(nextjs): Pass request in sampling context of data fetchers wrapper transaction (#5784)
 - fix(nextjs): Reverse order of checks for instrumenting server (#5828)
-- fix(nextjs): Rename `nextjs.data.server` ops (#5830) 
+- fix(nextjs): Rename `nextjs.data.server` ops (#5830)
 - fix(remix): Do not skip error handling if tracing is not enabled. (#5811)
 - fix(remix): Use import() to get `react-router-dom` in Express wrapper. (#5810)
 - fix(tracing): Remove `connection.downlink` measurement (#5794)

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "7.14.1",
+  "version": "7.15.0",
   "packages": "packages/*",
   "npmClient": "yarn",
   "useWorkspaces": true

packages/angular/.eslintrc.js

@@ -3,4 +3,5 @@ module.exports = {
     browser: true,
   },
   extends: ['../../.eslintrc.js'],
+  ignorePatterns: ['setup-jest.ts'],
 };

packages/angular/jest.config.js

@@ -3,4 +3,5 @@ const baseConfig = require('../../jest/jest.config.js');
 module.exports = {
   ...baseConfig,
   testEnvironment: 'jsdom',
+  setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
 };

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "7.14.1",
+  "version": "7.15.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,9 +21,9 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "7.14.1",
-    "@sentry/types": "7.14.1",
-    "@sentry/utils": "7.14.1",
+    "@sentry/browser": "7.15.0",
+    "@sentry/types": "7.15.0",
+    "@sentry/utils": "7.15.0",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
@@ -33,9 +33,12 @@
     "@angular/compiler": "^10.2.5",
     "@angular/compiler-cli": "~10.2.5",
     "@angular/core": "~10.2.5",
+    "@angular/platform-browser": "~10.2.5",
+    "@angular/platform-browser-dynamic": "~10.2.5",
     "@angular/router": "~10.2.5",
     "ng-packagr": "^10.1.0",
-    "typescript": "~4.0.2"
+    "typescript": "~4.0.2",
+    "zone.js": "^0.11.8"
   },
   "scripts": {
     "build": "yarn build:ngc",

packages/angular/setup-jest.ts

@@ -0,0 +1,7 @@
+import 'zone.js';
+
+import { TestBed } from '@angular/core/testing';
+import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
+
+TestBed.resetTestEnvironment();
+TestBed.initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());

packages/angular/test/errorhandler.test.ts

@@ -121,4 +121,28 @@ describe('SentryErrorHandler', () => {
       expect.any(Function),
     );
   });
+
+  it('handleError method shows report dialog', () => {
+    const showReportDialogSpy = jest.spyOn(SentryBrowser, 'showReportDialog');
+
+    const errorHandler = createErrorHandler({ showDialog: true });
+    errorHandler.handleError(new Error('test'));
+
+    expect(showReportDialogSpy).toBeCalledTimes(1);
+  });
+
+  it('handleError method extracts error with a custom extractor', () => {
+    const customExtractor = (error: unknown) => {
+      if (typeof error === 'string') {
+        return new Error(`custom ${error}`);
+      }
+      return error;
+    };
+
+    const errorHandler = createErrorHandler({ extractor: customExtractor });
+    errorHandler.handleError('error');
+
+    expect(captureExceptionSpy).toHaveBeenCalledTimes(1);
+    expect(captureExceptionSpy).toHaveBeenCalledWith(new Error('custom error'), expect.any(Function));
+  });
 });