Merge branch 'master' into apm

HazAT · HazAT · commit eb6480249650 · 2019-11-19T10:27:38.000+01:00
* master: feat: Trigger handlers when starting fetch request as well (getsentry#2320) meta: 5.9.1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,9 @@
 - [hub] feat: Add more span functions (#2161)
 - [integrations] feat: Change `Tracing` integration (#2161)
 - [browser] feat: Refactor breadcrumbs integration to allow for custom handlers
+
+## 5.9.1
+
 - [browser] ref: Fix regression with bundle size
 
 ## 5.9.0
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "5.9.0",
+  "version": "5.9.1",
   "packages": "packages/*",
   "ignore": "raven-*",
   "npmClient": "yarn",
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "5.9.0",
+  "version": "5.9.1",
   "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",
diff --git a/packages/browser/src/integrations/breadcrumbs.ts b/packages/browser/src/integrations/breadcrumbs.ts
@@ -45,7 +45,7 @@ type XMLHttpRequestProp = 'onload' | 'onerror' | 'onprogress';
 
 /**
  * Default Breadcrumbs instrumentations
- * @deprecated With v6, this will be renamed
+ * TODO: Deprecated - with v6, this will be renamed to `Instrument`
  */
 export class Breadcrumbs implements Integration {
   /**
@@ -255,19 +255,24 @@ export class Breadcrumbs implements Integration {
             method: getFetchMethod(args),
             url: getFetchUrl(args),
           },
+          requestComplete: false,
           startTimestamp: Date.now(),
         };
 
+        triggerHandlers(handlerData);
+
         return originalFetch.apply(global, args).then(
           (response: Response) => {
             handlerData.endTimestamp = Date.now();
+            handlerData.requestComplete = true;
             handlerData.response = response;
             handlerData.fetchData.status_code = response.status;
             triggerHandlers(handlerData);
             return response;
           },
           (error: Error) => {
             handlerData.endTimestamp = Date.now();
+            handlerData.requestComplete = true;
             handlerData.error = error;
             triggerHandlers(handlerData);
             throw error;
@@ -387,6 +392,7 @@ export class Breadcrumbs implements Integration {
           const handlerData: { [key: string]: any } = {
             args,
             endTimestamp: Date.now(),
+            requestComplete: false,
             startTimestamp: Date.now(),
             xhr,
           };
diff --git a/packages/browser/src/integrations/instrumenthandlers.ts b/packages/browser/src/integrations/instrumenthandlers.ts
@@ -103,6 +103,11 @@ function xhrBreadcrumb(handlerData: { [key: string]: any }): void {
  * Creates breadcrumbs from fetch API calls
  */
 function fetchBreadcrumb(handlerData: { [key: string]: any }): void {
+  // We only capture complete fetch requests
+  if (!handlerData.requestComplete) {
+    return;
+  }
+
   const client = getCurrentHub().getClient<BrowserClient>();
   const dsn = client && client.getDsn();
 
diff --git a/packages/browser/src/version.ts b/packages/browser/src/version.ts
@@ -1,2 +1,2 @@
 export const SDK_NAME = 'sentry.javascript.browser';
-export const SDK_VERSION = '5.9.0';
+export const SDK_VERSION = '5.9.1';

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"lerna": "3.4.0",`
`3`		`- "version": "5.9.0",`
	`3`	`+ "version": "5.9.1",`
`4`	`4`	`"packages": "packages/*",`
`5`	`5`	`"ignore": "raven-*",`
`6`	`6`	`"npmClient": "yarn",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@sentry/browser",`
`3`		`- "version": "5.9.0",`
	`3`	`+ "version": "5.9.1",`
`4`	`4`	`"description": "Official Sentry SDK for browsers",`
`5`	`5`	`"repository": "git://github.com/getsentry/sentry-javascript.git",`
`6`	`6`	`"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`export const SDK_NAME = 'sentry.javascript.browser';`
`2`		`-export const SDK_VERSION = '5.9.0';`
	`2`	`+export const SDK_VERSION = '5.9.1';`