Merge branch master into feat/next-js

Author: rhcarvalho

CHANGELOG.md

@@ -4,6 +4,34 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 6.2.5
+
+- [utils] fix: Avoid performance.timeOrigin if too skewed (#3356)
+
+## 6.2.4
+
+- [browser] fix: Add `SentryRequestType` to `RateLimitingCategory` mapping (#3328)
+- [browser] ref: Add fast-path to `fetchImpl` and cleanup redundant iframe (#3341)
+- [node] fix: Fallback to empty string if `req.baseUrl` is empty (#3329)
+- [node] ref: Remove circular dependency in `@sentry/node` (#3335)
+- [tracing] fix: Attach mysql tracing to `Connection.createQuery` instead of `Connection.prototype.query` (#3353)
+- [tracing] ref: Clarify naming in `BrowserTracing` integration (#3338)
+- [ember] ref: Fix tests to be forward compatible with component changes (#3347)
+- [ember] ref: Silence deprecation warnings in beta (#3346)
+
+## 6.2.3
+
+- [gatsby] fix: Update Vercel environment variables to match their current system variables (#3337)
+
+## 6.2.2
+
+- [hub] fix: Only create sessions if the correct methods are defined (#3281)
+- [core] fix: Don't override SDK metadata (#3304)
+- [browser] fix: Prevent fetch errors loops with invalid fetch implementations (#3318)
+- [serverless] ref: Add compatible runtime nodejs14.x to building awslambda layer (#3303)
+- [ember] fix: Keep route hook context when performance-wrapping (#3274)
+- [integrations] fix: Normalized Event before caching. (#3305)
+
 ## 6.2.1
 
 - [core] fix: Moves SDK metadata-setting into the `NodeClient/BrowserClient` to protect it from being overwritten by other classes extending `BaseClient` like @sentry/serverless (#3279)

README.md

@@ -5,6 +5,8 @@
   <br />
 </p>
 
+_Bad software is everywhere, and we're tired of it. Sentry is on a mission to help developers write better software faster, so we can get back to enjoying technology. If you want to join us [<kbd>**Check out our open positions**</kbd>](https://sentry.io/careers/)_
+
 ![Build & Test](https://github.com/getsentry/sentry-javascript/workflows/Build%20&%20Test/badge.svg)
 [![codecov](https://codecov.io/gh/getsentry/sentry-javascript/branch/master/graph/badge.svg)](https://codecov.io/gh/getsentry/sentry-javascript)
 [![npm version](https://img.shields.io/npm/v/@sentry/core.svg)](https://www.npmjs.com/package/@sentry/core)
@@ -37,14 +39,14 @@ convenient interface and improved consistency between various JavaScript environ
 For each major JavaScript platform, there is a specific high-level SDK that provides all the tools you need in a single
 package. Please refer to the README and instructions of those SDKs for more detailed information:
 
-- [`@sentry/browser`](https://github.com/getsentry/sentry-javascript/tree/master/packages/browser): SDK for Browsers,
-  including integrations for React, Angular, Ember, Vue and Backbone
+- [`@sentry/browser`](https://github.com/getsentry/sentry-javascript/tree/master/packages/browser): SDK for Browsers
+  including integrations for Backbone
 - [`@sentry/node`](https://github.com/getsentry/sentry-javascript/tree/master/packages/node): SDK for Node, including
   integrations for Express, Koa, Loopback, Sails and Connect
-- [`@sentry/angular`](https://github.com/getsentry/sentry-javascript/tree/master/packages/angular): SDK for Angular
-- [`@sentry/react`](https://github.com/getsentry/sentry-javascript/tree/master/packages/react): SDK for ReactJS
-- [`@sentry/ember`](https://github.com/getsentry/sentry-javascript/tree/master/packages/ember): SDK for Ember
-- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): SDK for Vue.js
+- [`@sentry/angular`](https://github.com/getsentry/sentry-javascript/tree/master/packages/angular): browser SDK with Angular integration enabled
+- [`@sentry/react`](https://github.com/getsentry/sentry-javascript/tree/master/packages/react): browser SDK with React integration enabled 
+- [`@sentry/ember`](https://github.com/getsentry/sentry-javascript/tree/master/packages/ember): browser SDK with Ember integration enabled
+- [`@sentry/vue`](https://github.com/getsentry/sentry-javascript/tree/master/packages/vue): browser SDK with Vue integration enabled
 - [`@sentry/gatsby`](https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby): SDK for Gatsby
 - [`@sentry/react-native`](https://github.com/getsentry/sentry-react-native): SDK for React Native with support for native crashes
 - [`@sentry/integrations`](https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations): Pluggable

lerna.json

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

packages/angular/README.md

@@ -82,15 +82,15 @@ Registering a Trace Service is a 3-step process.
    instrumentation:
 
 ```javascript
-import { init, routingInstrumentation } from '@sentry/angular';
+import { init, instrumentAngularRouting } from '@sentry/angular';
 import { Integrations as TracingIntegrations } from '@sentry/tracing';
 
 init({
   dsn: '__DSN__',
   integrations: [
     new TracingIntegrations.BrowserTracing({
       tracingOrigins: ['localhost', 'https://yourserver.io/api'],
-      routingInstrumentation: routingInstrumentation,
+      routingInstrumentation: instrumentAngularRouting,
     }),
   ],
   tracesSampleRate: 1,

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "6.2.1",
+  "version": "6.2.5",
   "description": "Offical Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,17 +21,17 @@
     "@angular/router": "10.x || 11.x"
   },
   "dependencies": {
-    "@sentry/browser": "6.2.1",
-    "@sentry/types": "6.2.1",
-    "@sentry/utils": "6.2.1",
+    "@sentry/browser": "6.2.5",
+    "@sentry/types": "6.2.5",
+    "@sentry/utils": "6.2.5",
     "rxjs": "^6.6.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@angular/common": "^10.0.3",
     "@angular/core": "^10.0.3",
     "@angular/router": "^10.0.3",
-    "@sentry-internal/eslint-config-sdk": "6.2.1",
+    "@sentry-internal/eslint-config-sdk": "6.2.5",
     "eslint": "7.6.0",
     "npm-run-all": "^4.1.2",
     "prettier": "1.19.0",

packages/angular/src/index.ts

@@ -4,7 +4,9 @@ export { init } from './sdk';
 export { createErrorHandler, ErrorHandlerOptions } from './errorhandler';
 export {
   getActiveTransaction,
-  routingInstrumentation,
+  // TODO `instrumentAngularRouting` is just an alias for `routingInstrumentation`; deprecate the latter at some point
+  instrumentAngularRouting, // new name
+  routingInstrumentation, // legacy name
   TraceClassDecorator,
   TraceMethodDecorator,
   TraceDirective,

packages/angular/src/tracing.ts

@@ -14,22 +14,24 @@ let stashedStartTransactionOnLocationChange: boolean;
  * Creates routing instrumentation for Angular Router.
  */
 export function routingInstrumentation(
-  startTransaction: (context: TransactionContext) => Transaction | undefined,
+  customStartTransaction: (context: TransactionContext) => Transaction | undefined,
   startTransactionOnPageLoad: boolean = true,
   startTransactionOnLocationChange: boolean = true,
 ): void {
   instrumentationInitialized = true;
-  stashedStartTransaction = startTransaction;
+  stashedStartTransaction = customStartTransaction;
   stashedStartTransactionOnLocationChange = startTransactionOnLocationChange;
 
   if (startTransactionOnPageLoad) {
-    startTransaction({
+    customStartTransaction({
       name: window.location.pathname,
       op: 'pageload',
     });
   }
 }
 
+export const instrumentAngularRouting = routingInstrumentation;
+
 /**
  * Grabs active transaction off scope
  */

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "6.2.1",
+  "version": "6.2.5",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -16,13 +16,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "6.2.1",
-    "@sentry/types": "6.2.1",
-    "@sentry/utils": "6.2.1",
+    "@sentry/core": "6.2.5",
+    "@sentry/types": "6.2.5",
+    "@sentry/utils": "6.2.5",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "6.2.1",
+    "@sentry-internal/eslint-config-sdk": "6.2.5",
     "@types/eslint": "^7.2.0",
     "@types/md5": "2.1.33",
     "btoa": "^1.2.1",

packages/browser/src/sdk.ts

@@ -189,15 +189,23 @@ function startSessionTracking(): void {
 
   const hub = getCurrentHub();
 
-  hub.startSession();
-  hub.captureSession();
-
-  // We want to create a session for every navigation as well
-  addInstrumentationHandler({
-    callback: () => {
-      hub.startSession();
-      hub.captureSession();
-    },
-    type: 'history',
-  });
+  if ('startSession' in hub) {
+    // The only way for this to be false is for there to be a version mismatch between @sentry/browser (>= 6.0.0) and
+    // @sentry/hub (< 5.27.0). In the simple case, there won't ever be such a mismatch, because the two packages are
+    // pinned at the same version in package.json, but there are edge cases where it's possible'. See
+    // https://github.com/getsentry/sentry-javascript/issues/3234 and
+    // https://github.com/getsentry/sentry-javascript/issues/3207.
+
+    hub.startSession();
+    hub.captureSession();
+
+    // We want to create a session for every navigation as well
+    addInstrumentationHandler({
+      callback: () => {
+        hub.startSession();
+        hub.captureSession();
+      },
+      type: 'history',
+    });
+  }
 }

packages/browser/src/transports/base.ts

@@ -9,6 +9,14 @@ import {
 } from '@sentry/types';
 import { logger, parseRetryAfterHeader, PromiseBuffer, SentryError } from '@sentry/utils';
 
+const CATEGORY_MAPPING: {
+  [key in SentryRequestType]: string;
+} = {
+  event: 'error',
+  transaction: 'transaction',
+  session: 'session',
+};
+
 /** Base Transport class implementation */
 export abstract class BaseTransport implements Transport {
   /**
@@ -80,15 +88,16 @@ export abstract class BaseTransport implements Transport {
   /**
    * Gets the time that given category is disabled until for rate limiting
    */
-  protected _disabledUntil(category: string): Date {
+  protected _disabledUntil(requestType: SentryRequestType): Date {
+    const category = CATEGORY_MAPPING[requestType];
     return this._rateLimits[category] || this._rateLimits.all;
   }
 
   /**
    * Checks if a category is rate limited
    */
-  protected _isRateLimited(category: string): boolean {
-    return this._disabledUntil(category) > new Date(Date.now());
+  protected _isRateLimited(requestType: SentryRequestType): boolean {
+    return this._disabledUntil(requestType) > new Date(Date.now());
   }
 
   /**

packages/browser/src/transports/fetch.ts

@@ -1,13 +1,91 @@
 import { eventToSentryRequest, sessionToSentryRequest } from '@sentry/core';
-import { Event, Response, SentryRequest, Session } from '@sentry/types';
-import { getGlobalObject, supportsReferrerPolicy, SyncPromise } from '@sentry/utils';
+import { Event, Response, SentryRequest, Session, TransportOptions } from '@sentry/types';
+import { getGlobalObject, isNativeFetch, logger, supportsReferrerPolicy, SyncPromise } from '@sentry/utils';
 
 import { BaseTransport } from './base';
 
-const global = getGlobalObject<Window>();
+type FetchImpl = typeof fetch;
+
+/**
+ * A special usecase for incorrectly wrapped Fetch APIs in conjunction with ad-blockers.
+ * Whenever someone wraps the Fetch API and returns the wrong promise chain,
+ * this chain becomes orphaned and there is no possible way to capture it's rejections
+ * other than allowing it bubble up to this very handler. eg.
+ *
+ * const f = window.fetch;
+ * window.fetch = function () {
+ *   const p = f.apply(this, arguments);
+ *
+ *   p.then(function() {
+ *     console.log('hi.');
+ *   });
+ *
+ *   return p;
+ * }
+ *
+ * `p.then(function () { ... })` is producing a completely separate promise chain,
+ * however, what's returned is `p` - the result of original `fetch` call.
+ *
+ * This mean, that whenever we use the Fetch API to send our own requests, _and_
+ * some ad-blocker blocks it, this orphaned chain will _always_ reject,
+ * effectively causing another event to be captured.
+ * This makes a whole process become an infinite loop, which we need to somehow
+ * deal with, and break it in one way or another.
+ *
+ * To deal with this issue, we are making sure that we _always_ use the real
+ * browser Fetch API, instead of relying on what `window.fetch` exposes.
+ * The only downside to this would be missing our own requests as breadcrumbs,
+ * but because we are already not doing this, it should be just fine.
+ *
+ * Possible failed fetch error messages per-browser:
+ *
+ * Chrome:  Failed to fetch
+ * Edge:    Failed to Fetch
+ * Firefox: NetworkError when attempting to fetch resource
+ * Safari:  resource blocked by content blocker
+ */
+function getNativeFetchImplementation(): FetchImpl {
+  /* eslint-disable @typescript-eslint/unbound-method */
+
+  // Fast path to avoid DOM I/O
+  const global = getGlobalObject<Window>();
+  if (isNativeFetch(global.fetch)) {
+    return global.fetch.bind(global);
+  }
+
+  const document = global.document;
+  let fetchImpl = global.fetch;
+  // eslint-disable-next-line deprecation/deprecation
+  if (typeof document?.createElement === `function`) {
+    try {
+      const sandbox = document.createElement('iframe');
+      sandbox.hidden = true;
+      document.head.appendChild(sandbox);
+      if (sandbox.contentWindow?.fetch) {
+        fetchImpl = sandbox.contentWindow.fetch;
+      }
+      document.head.removeChild(sandbox);
+    } catch (e) {
+      logger.warn('Could not create sandbox iframe for pure fetch check, bailing to window.fetch: ', e);
+    }
+  }
+
+  return fetchImpl.bind(global);
+  /* eslint-enable @typescript-eslint/unbound-method */
+}
 
 /** `fetch` based transport */
 export class FetchTransport extends BaseTransport {
+  /**
+   * Fetch API reference which always points to native browser implementation.
+   */
+  private _fetch: typeof fetch;
+
+  constructor(options: TransportOptions, fetchImpl: FetchImpl = getNativeFetchImplementation()) {
+    super(options);
+    this._fetch = fetchImpl;
+  }
+
   /**
    * @inheritDoc
    */
@@ -54,8 +132,7 @@ export class FetchTransport extends BaseTransport {
 
     return this._buffer.add(
       new SyncPromise<Response>((resolve, reject) => {
-        global
-          .fetch(sentryRequest.url, options)
+        this._fetch(sentryRequest.url, options)
           .then(response => {
             const headers = {
               'x-sentry-rate-limits': response.headers.get('X-Sentry-Rate-Limits'),