3.6.1

benvinegar · benvinegar · commit 9b6283f779b0 · 2016-09-01T11:12:56.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.6.1
+* BUGFIX: Fix `trimHeadFrames` appearing in some data payloads when using synthetic traces. See: https://github.com/getsentry/raven-js/pull/714
+
 ## 3.6.0
 * NEW: `Raven.captureMessage` will generate synthetic stacktraces if passed `stacktrace: true` via options. See: https://github.com/getsentry/raven-js/pull/582
 * NEW: Added `Raven.setDSN` for changing target DSN after Raven has been configured. See: https://github.com/getsentry/raven-js/pull/706
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "dependencies": {},
   "main": "dist/raven.js",
   "ignore": [
diff --git a/dist/plugins/angular.js b/dist/plugins/angular.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.6.0 (c474a32) | github.com/getsentry/raven-js */
+/*! Raven.js 3.6.1 (8c680b0) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/angular.min.js b/dist/plugins/angular.min.js
diff --git a/dist/plugins/console.js b/dist/plugins/console.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.6.0 (c474a32) | github.com/getsentry/raven-js */
+/*! Raven.js 3.6.1 (8c680b0) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/console.min.js b/dist/plugins/console.min.js
diff --git a/dist/plugins/ember.js b/dist/plugins/ember.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.6.0 (c474a32) | github.com/getsentry/raven-js */
+/*! Raven.js 3.6.1 (8c680b0) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/ember.min.js b/dist/plugins/ember.min.js
diff --git a/dist/plugins/require.js b/dist/plugins/require.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.6.0 (c474a32) | github.com/getsentry/raven-js */
+/*! Raven.js 3.6.1 (8c680b0) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/require.min.js b/dist/plugins/require.min.js
diff --git a/dist/plugins/vue.js b/dist/plugins/vue.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.6.0 (c474a32) | github.com/getsentry/raven-js */
+/*! Raven.js 3.6.1 (8c680b0) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
diff --git a/dist/plugins/vue.min.js b/dist/plugins/vue.min.js
diff --git a/dist/raven.js b/dist/raven.js
@@ -1,4 +1,4 @@
-/*! Raven.js 3.6.0 (c474a32) | github.com/getsentry/raven-js */
+/*! Raven.js 3.6.1 (8c680b0) | github.com/getsentry/raven-js */
 
 /*
  * Includes TraceKit
@@ -182,7 +182,7 @@ Raven.prototype = {
     // webpack (using a build step causes webpack #1617). Grunt verifies that
     // this value matches package.json during build.
     //   See: https://github.com/getsentry/raven-js/issues/465
-    VERSION: '3.6.0',
+    VERSION: '3.6.1',
 
     debug: false,
 
@@ -1234,8 +1234,6 @@ Raven.prototype = {
                 for (var j = 0; j < options.trimHeadFrames && j < frames.length; j++) {
                     frames[j].in_app = false;
                 }
-                // ... delete to prevent from appearing in outbound payload
-                delete options.trimHeadFrames;
             }
         }
         frames = frames.slice(0, this._globalOptions.stackTraceLimit);
@@ -1356,6 +1354,9 @@ Raven.prototype = {
             baseData.request = httpData;
         }
 
+        // HACK: delete `trimHeadFrames` to prevent from appearing in outbound payload
+        if (data.trimHeadFrames) delete data.trimHeadFrames;
+
         data = objectMerge(baseData, data);
 
         // Merge in the tags and extra separately since objectMerge doesn't handle a deep merge
diff --git a/dist/raven.min.js b/dist/raven.min.js
diff --git a/dist/raven.min.js.map b/dist/raven.min.js.map
diff --git a/dist/sri.json b/dist/sri.json
@@ -1,20 +1,20 @@
 {
   "@dist/raven.js": {
     "hashes": {
-      "sha256": "Rheia/eYhjZUCvaSKwK9BYfWSBhA3i2VD9aleTwdh48=",
-      "sha512": "LveFv8BWO8kKj9fXm/PtKlscTLt2L/pVdXZs9mlPXs6BtpU4wPmOZaor+KYnztYCPGMV/ScdolhTSZDXx7IP0g=="
+      "sha256": "gYS09eseknpRK6X4Kue9Y61yaxLkDrQRbYz9Fx06pYI=",
+      "sha512": "vio21BavZ9HqTZ3/ip3C5B5kSprPF092jh8lOMWP9l5kAuUKkgaStFad6DE8IXF2JwVKjjLFNumQG5l8bGcztA=="
     },
     "type": null,
-    "integrity": "sha256-Rheia/eYhjZUCvaSKwK9BYfWSBhA3i2VD9aleTwdh48= sha512-LveFv8BWO8kKj9fXm/PtKlscTLt2L/pVdXZs9mlPXs6BtpU4wPmOZaor+KYnztYCPGMV/ScdolhTSZDXx7IP0g==",
+    "integrity": "sha256-gYS09eseknpRK6X4Kue9Y61yaxLkDrQRbYz9Fx06pYI= sha512-vio21BavZ9HqTZ3/ip3C5B5kSprPF092jh8lOMWP9l5kAuUKkgaStFad6DE8IXF2JwVKjjLFNumQG5l8bGcztA==",
     "path": "dist/raven.js"
   },
   "@dist/raven.min.js": {
     "hashes": {
-      "sha256": "DcSOaOnJG0Y/B7DwqDZRjgMprGgUZJ3FnnV+kpWwIRM=",
-      "sha512": "Olaakub9v7be7qS5eNiIp7lq7R/LznsT4ps6UNS5oISmrcRM+x3Ns68t+/cU+OuaaQrXmC0F5T2GFFGqS+A1VQ=="
+      "sha256": "QP4ST/YcNDgM1Z7cHpcC6Jkd6mRqkOFIyXrDjYF025k=",
+      "sha512": "mef0s0xPrUB28Rf1WmjIfWeBD2E5Mwwhyg+nDQnhmG7Vd8Yp9z3TUN9Zie0scaFAYYinVNrnhZSPSil9OysE/A=="
     },
     "type": null,
-    "integrity": "sha256-DcSOaOnJG0Y/B7DwqDZRjgMprGgUZJ3FnnV+kpWwIRM= sha512-Olaakub9v7be7qS5eNiIp7lq7R/LznsT4ps6UNS5oISmrcRM+x3Ns68t+/cU+OuaaQrXmC0F5T2GFFGqS+A1VQ==",
+    "integrity": "sha256-QP4ST/YcNDgM1Z7cHpcC6Jkd6mRqkOFIyXrDjYF025k= sha512-mef0s0xPrUB28Rf1WmjIfWeBD2E5Mwwhyg+nDQnhmG7Vd8Yp9z3TUN9Zie0scaFAYYinVNrnhZSPSil9OysE/A==",
     "path": "dist/raven.min.js"
   }
 }
diff --git a/docs/config.rst b/docs/config.rst
@@ -269,7 +269,7 @@ Putting it all together
     <body>
         ...
         <script src="jquery.min.js"></script>
-        <script src="https://cdn.ravenjs.com/3.6.0/raven.min.js"></script>
+        <script src="https://cdn.ravenjs.com/3.6.1/raven.min.js"></script>
         <script>
             Raven.config('___PUBLIC_DSN___', {
                 logger: 'my-logger',
diff --git a/docs/index.rst b/docs/index.rst
@@ -26,7 +26,7 @@ scripts.  For all details see :doc:`install`.
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.6.0/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/raven.min.js"></script>
 
 
 Configuring the Client
diff --git a/docs/install.rst b/docs/install.rst
@@ -9,7 +9,7 @@ So for example:
 .. sourcecode:: html
 
     <script src="jquery.js"></script>
-    <script src="https://cdn.ravenjs.com/3.6.0/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
     <script src="app.js"></script>
 
@@ -28,7 +28,7 @@ Our CDN distributes builds with and without :doc:`integrations <integrations/ind
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.6.0/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/raven.min.js"></script>
 
 This version does not include any plugins. See `ravenjs.com
 <http://ravenjs.com/>`_ for more information about plugins and getting
diff --git a/docs/integrations/angular.rst b/docs/integrations/angular.rst
@@ -24,7 +24,7 @@ Example:
 .. sourcecode:: html
 
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.4.5/angular.min.js"></script>
-    <script src="https://cdn.ravenjs.com/3.6.0/angular/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/angular/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
 
 Note that this CDN build auto-initializes the Angular plugin.
diff --git a/docs/integrations/backbone.rst b/docs/integrations/backbone.rst
@@ -8,7 +8,7 @@ Start by adding the ``raven.js`` script tag to your page. It should be loaded as
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.6.0/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/raven.min.js"></script>
 
 Configuring the Client
 ----------------------
diff --git a/docs/integrations/ember.rst b/docs/integrations/ember.rst
@@ -23,7 +23,7 @@ Example:
 .. sourcecode:: html
 
     <script src="http://builds.emberjs.com/tags/v2.3.1/ember.prod.js"></script>
-    <script src="https://cdn.ravenjs.com/3.6.0/ember/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/ember/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
 
 Note that this CDN build auto-initializes the Ember plugin.
diff --git a/docs/integrations/react.rst b/docs/integrations/react.rst
@@ -8,7 +8,7 @@ Start by adding the ``raven.js`` script tag to your page. It should be loaded as
 
 .. sourcecode:: html
 
-    <script src="https://cdn.ravenjs.com/3.6.0/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/raven.min.js"></script>
 
 Configuring the Client
 ----------------------
diff --git a/docs/integrations/vue.rst b/docs/integrations/vue.rst
@@ -27,7 +27,7 @@ Example:
 .. sourcecode:: html
 
     <script src="https://cdn.jsdelivr.net/vue/2.0.0-rc/vue.min.js"></script>
-    <script src="https://cdn.ravenjs.com/3.6.0/vue/raven.min.js"></script>
+    <script src="https://cdn.ravenjs.com/3.6.1/vue/raven.min.js"></script>
     <script>Raven.config('___PUBLIC_DSN___').install();</script>
 
 Note that this CDN build auto-initializes the Vue plugin.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "raven-js",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "license": "BSD-2-Clause",
   "homepage": "https://github.com/getsentry/raven-js",
   "scripts": {
diff --git a/src/raven.js b/src/raven.js
@@ -89,7 +89,7 @@ Raven.prototype = {
     // webpack (using a build step causes webpack #1617). Grunt verifies that
     // this value matches package.json during build.
     //   See: https://github.com/getsentry/raven-js/issues/465
-    VERSION: '3.6.0',
+    VERSION: '3.6.1',
 
     debug: false,
 
diff --git a/test/raven.test.js b/test/raven.test.js
@@ -1008,7 +1008,7 @@ describe('globals', function() {
                 extra: {'session:duration': 100},
             });
             assert.deepEqual(opts.auth, {
-                sentry_client: 'raven-js/3.6.0',
+                sentry_client: 'raven-js/3.6.1',
                 sentry_key: 'abc',
                 sentry_version: '7'
             });
@@ -1055,7 +1055,7 @@ describe('globals', function() {
                 extra: {'session:duration': 100},
             });
             assert.deepEqual(opts.auth, {
-                sentry_client: 'raven-js/3.6.0',
+                sentry_client: 'raven-js/3.6.1',
                 sentry_key: 'abc',
                 sentry_secret: 'def',
                 sentry_version: '7'

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "raven-js",`
`3`		`- "version": "3.6.0",`
	`3`	`+ "version": "3.6.1",`
`4`	`4`	`"dependencies": {},`
`5`	`5`	`"main": "dist/raven.js",`
`6`	`6`	`"ignore": [`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/! Raven.js 3.6.0 (c474a32) \| github.com/getsentry/raven-js /`
	`1`	`+/! Raven.js 3.6.1 (8c680b0) \| github.com/getsentry/raven-js /`
`2`	`2`
`3`	`3`	`/*`
`4`	`4`	`* Includes TraceKit`