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

Author: ahmedetefy

.craft.yml

@@ -66,4 +66,5 @@ targets:
         versions:
           - nodejs10.x
           - nodejs12.x
+          - nodejs14.x
     license: MIT

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)

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/react/src/sdk.ts

@@ -5,15 +5,18 @@ import { BrowserOptions, init as browserInit, SDK_VERSION } from '@sentry/browse
  */
 export function init(options: BrowserOptions): void {
   options._metadata = options._metadata || {};
-  options._metadata.sdk = {
-    name: 'sentry.javascript.react',
-    packages: [
-      {
-        name: 'npm:@sentry/react',
-        version: SDK_VERSION,
-      },
-    ],
-    version: SDK_VERSION,
-  };
+  if (options._metadata.sdk === undefined) {
+    options._metadata.sdk = {
+      name: 'sentry.javascript.react',
+      packages: [
+        {
+          name: 'npm:@sentry/react',
+          version: SDK_VERSION,
+        },
+      ],
+      version: SDK_VERSION,
+    };
+  }
+
   browserInit(options);
 }