Merge branch 'master' of github.com:getsentry/sentry-javascript

Author: ahmedetefy

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)

CONTRIBUTING.md

@@ -51,10 +51,20 @@ Similar to building and testing, linting can be done in the project root or in i
 
 Note: you must run `yarn build` before `yarn lint` will work.
 
-## Final Notes
+## Considerations Before Sending Your First PR
 
-When contributing to the codebase, please make note of the following:
+When contributing to the codebase, please note:
 
 - Non-trivial PRs will not be accepted without tests (see above).
 - Please do not bump version numbers yourself. 
 - [`raven-js`](https://github.com/getsentry/sentry-javascript/tree/3.x/packages/raven-js) and [`raven-node`](https://github.com/getsentry/sentry-javascript/tree/3.x/packages/raven-node) are deprecated, and only bug and security fix PRs will be accepted targeting the [3.x branch](https://github.com/getsentry/sentry-javascript/tree/3.x). Any new features and improvements should be to our new SDKs (`browser` and `node`) and the packages (`core`, `hub`, `integrations`, and the like) which support them.
+
+## Publishing a Release
+
+_These steps are only relevant to Sentry employees when preparing and publishing a new SDK release._
+
+1. Determine what version will be released (we use [semver](https://semver.org)).
+2. Update [`CHANGELOG.md`](https://github.com/getsentry/sentry-javascript/edit/master/CHANGELOG.md) to add an entry to the next release number and a list of changes since the last release.
+3. Run the [Prepare Release](https://github.com/getsentry/sentry-javascript/actions/workflows/release.yml) workflow.
+4. A new issue should appear in https://github.com/getsentry/publish/issues.
+5. Ask a member of the [@getsentry/releases team](https://github.com/orgs/getsentry/teams/releases/members) to approve the release.

README.md

@@ -39,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

package.json

@@ -36,8 +36,8 @@
     "packages/types",
     "packages/typescript",
     "packages/utils",
-    "packages/wasm",
-    "packages/vue"
+    "packages/vue",
+    "packages/wasm"
   ],
   "devDependencies": {
     "@google-cloud/storage": "^5.7.0",

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",