CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 4.4.0
+
+- [node] HTTP(S) Proxy support
+- [node] Expose lastEventId method
+- [browser] Correctly detect and remove wrapped function frames
+
 ## 4.3.4
 
 - [utils] fix: Broken tslib import - Fixes #1757

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "3.4.0",
-  "version": "4.3.4",
+  "version": "4.4.0",
   "packages": "packages/*",
   "ignore": "raven-*",
   "npmClient": "yarn",

package.json

@@ -21,31 +21,31 @@
     "packages/utils"
   ],
   "devDependencies": {
-    "@google-cloud/storage": "^1.7.0",
+    "@google-cloud/storage": "^2.3.1",
     "@types/chai": "^4.1.3",
-    "@types/jest": "^22.2.3",
+    "@types/jest": "^23.3.9",
     "@types/mocha": "^5.2.0",
     "@types/node": "^10.0.2",
     "@types/raven": "^2.5.1",
-    "@types/sinon": "^4.3.1",
+    "@types/sinon": "^5.0.7",
     "chai": "^4.1.2",
     "codecov": "^3.0.2",
-    "danger": "^4.0.2",
+    "danger": "^6.1.5",
     "danger-plugin-tslint": "^2.0.0",
-    "jest": "^22.4.3",
+    "jest": "^23.6.0",
     "karma-sinon": "^1.0.5",
-    "lerna": "3.4.0",
+    "lerna": "3.4.3",
     "mocha": "^4.1.0",
     "npm-run-all": "^4.1.2",
     "prettier": "^1.14.0",
     "prettier-check": "^2.0.0",
     "replace-in-file": "^3.4.0",
     "rimraf": "^2.6.2",
-    "sinon": "^5.0.3",
-    "ts-jest": "^22.4.4",
+    "sinon": "^7.1.1",
+    "ts-jest": "^23.10.5",
     "tslint": "^5.11.0",
     "tslint-language-service": "^0.9.9",
-    "typedoc": "^0.12.0",
+    "typedoc": "^0.13.0",
     "typedoc-plugin-monorepo": "^0.1.0",
     "typescript": "^3.0.1"
   }

packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "4.3.4",
+  "version": "4.4.0",
   "description": "Offical Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/raven-js.git",
   "homepage": "https://github.com/getsentry/raven-js/tree/master/packages/browser",
@@ -15,14 +15,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "4.3.4",
-    "@sentry/types": "4.3.4",
-    "@sentry/utils": "4.3.4",
+    "@sentry/core": "4.4.0",
+    "@sentry/types": "4.4.0",
+    "@sentry/utils": "4.4.0",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@types/md5": "2.1.32",
     "chai": "^4.1.2",
+    "jsdom": "^11.12.0",
     "karma": "^2.0.2",
     "karma-chai": "^0.1.0",
     "karma-chrome-launcher": "^2.2.0",
@@ -47,7 +48,8 @@
     "rollup-plugin-uglify": "^3.0.0",
     "sinon": "^5.0.3",
     "tslint": "^5.11.0",
-    "typescript": "^3.0.1"
+    "typescript": "^3.0.1",
+    "webpack": "^4.26.0"
   },
   "scripts": {
     "build": "rollup --config",
@@ -65,6 +67,7 @@
     "test:integration": "karma start test/karma/karma.integration.config.js",
     "test:integration:watch": "karma start test/karma/karma.integration.config.js --auto-watch --no-single-run",
     "test:saucelabs": "karma start test/karma/karma.saucelabs.config.js",
+    "test:manual": "node test/manual/npm-build.js && rm test/manual/tmp.js",
     "size:check": "cat build/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print $1,\"kB\";}'",
     "version": "node ../../scripts/versionbump.js src/version.ts"
   },

packages/browser/rollup.config.js

@@ -8,6 +8,16 @@ const commitHash = require('child_process')
   .execSync('git rev-parse --short HEAD', { encoding: 'utf-8' })
   .trim();
 
+const uglifyInstance = uglify({
+  mangle: {
+    // captureExceptions and captureMessage are public API methods and they don't need to be listed here
+    // as mangler doesn't touch user-facing thing, however sentryWrapepd is not, and it would be mangled into a minified version.
+    // We need those full names to correctly detect our internal frames for stripping.
+    // I listed all of them here just for the clarity sake, as they are all used in the frames manipulation process.
+    reserved: ['captureException', 'captureMessage', 'sentryWrapped'],
+  },
+});
+
 const bundleConfig = {
   input: 'src/index.ts',
   output: {
@@ -86,7 +96,7 @@ export default [
     // Uglify has to be at the end of compilation, BUT before the license banner
     plugins: bundleConfig.plugins
       .slice(0, -1)
-      .concat(uglify())
+      .concat(uglifyInstance)
       .concat(bundleConfig.plugins.slice(-1)),
   }),
 ];

packages/browser/src/integrations/helpers.ts

@@ -1,4 +1,4 @@
-import { getCurrentHub, withScope } from '@sentry/core';
+import { captureException, getCurrentHub, withScope } from '@sentry/core';
 import { Mechanism, SentryEvent, SentryWrappedFunction } from '@sentry/types';
 import { isFunction } from '@sentry/utils/is';
 import { htmlTreeAsString } from '@sentry/utils/misc';
@@ -57,7 +57,7 @@ export function wrap(
     return fn;
   }
 
-  const wrapped: SentryWrappedFunction = function(this: any): void {
+  const sentryWrapped: SentryWrappedFunction = function(this: any): void {
     if (before && isFunction(before)) {
       before.apply(this, arguments);
     }
@@ -96,7 +96,7 @@ export function wrap(
           return processedEvent;
         });
 
-        getCurrentHub().captureException(ex, { originalException: ex });
+        captureException(ex);
       });
 
       throw ex;
@@ -108,20 +108,20 @@ export function wrap(
   try {
     for (const property in fn) {
       if (Object.prototype.hasOwnProperty.call(fn, property)) {
-        wrapped[property] = fn[property];
+        sentryWrapped[property] = fn[property];
       }
     }
   } catch (_oO) {} // tslint:disable-line:no-empty
 
-  wrapped.prototype = fn.prototype;
-  fn.__sentry_wrapped__ = wrapped;
+  sentryWrapped.prototype = fn.prototype;
+  fn.__sentry_wrapped__ = sentryWrapped;
 
   // Signal that this function has been wrapped/filled already
   // for both debugging and to prevent it to being wrapped/filled twice
-  wrapped.__sentry__ = true;
-  wrapped.__sentry_original__ = fn;
+  sentryWrapped.__sentry__ = true;
+  sentryWrapped.__sentry_original__ = fn;
 
-  return wrapped;
+  return sentryWrapped;
 }
 
 /**

packages/browser/src/integrations/pluggable/ember.ts

@@ -1,4 +1,4 @@
-import { captureMessage, getCurrentHub, Scope, withScope } from '@sentry/core';
+import { captureException, captureMessage, getCurrentHub, Scope, withScope } from '@sentry/core';
 import { Integration, SentryEvent } from '@sentry/types';
 import { getGlobalObject } from '@sentry/utils/misc';
 
@@ -43,7 +43,7 @@ export class Ember implements Integration {
       if (getCurrentHub().getIntegration(Ember)) {
         withScope(scope => {
           this.addIntegrationToSdkInfo(scope);
-          getCurrentHub().captureException(error, { originalException: error });
+          captureException(error);
         });
       }
 
@@ -62,7 +62,7 @@ export class Ember implements Integration {
             if (reason instanceof Error) {
               scope.setExtra('context', 'Unhandled Promise error detected');
               this.addIntegrationToSdkInfo(scope);
-              getCurrentHub().captureException(reason, { originalException: reason });
+              captureException(reason);
             } else {
               scope.setExtra('reason', reason);
               this.addIntegrationToSdkInfo(scope);

packages/browser/src/integrations/pluggable/vue.ts

@@ -1,4 +1,4 @@
-import { getCurrentHub, withScope } from '@sentry/core';
+import { captureException, getCurrentHub, withScope } from '@sentry/core';
 import { Integration, SentryEvent } from '@sentry/types';
 import { isPlainObject, isUndefined } from '@sentry/utils/is';
 import { getGlobalObject } from '@sentry/utils/misc';
@@ -91,7 +91,7 @@ export class Vue implements Integration {
             return event;
           });
 
-          getCurrentHub().captureException(error, { originalException: error });
+          captureException(error);
         });
       }
 

packages/browser/src/md5.ts

@@ -237,8 +237,8 @@ function str2rstrUTF8(input: string) {
 }
 
 /*
-* Take string arguments and return either raw or hex encoded strings
-*/
+ * Take string arguments and return either raw or hex encoded strings
+ */
 function rawMD5(s: string) {
   return rstrMD5(str2rstrUTF8(s));
 }

packages/browser/src/parsers.ts

@@ -64,12 +64,20 @@ export function prepareFramesForEvent(stack: TraceKitStackFrame[]): StackFrame[]
   }
 
   let localStack = stack;
+
   const firstFrameFunction = localStack[0].func || '';
+  const lastFrameFunction = localStack[localStack.length - 1].func || '';
 
+  // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
   if (includes(firstFrameFunction, 'captureMessage') || includes(firstFrameFunction, 'captureException')) {
     localStack = localStack.slice(1);
   }
 
+  // If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)
+  if (includes(lastFrameFunction, 'sentryWrapped')) {
+    localStack = localStack.slice(0, -1);
+  }
+
   // The frame where the crash happened, should be the last entry in the array
   return localStack
     .map(

packages/browser/src/tracekit.ts

@@ -502,11 +502,14 @@ TraceKit.report = (function reportModuleWrapper() {
     // slow slow IE to see if onerror occurs or not before reporting
     // this exception; otherwise, we will end up with an incomplete
     // stack trace
-    setTimeout(function() {
-      if (lastException === ex) {
-        processLastException();
-      }
-    }, stack.incomplete ? 2000 : 0);
+    setTimeout(
+      function() {
+        if (lastException === ex) {
+          processLastException();
+        }
+      },
+      stack.incomplete ? 2000 : 0,
+    );
 
     throw ex; // re-throw to propagate to the top level (and cause window.onerror)
   }

packages/browser/src/version.ts

@@ -1,2 +1,2 @@
 export const SDK_NAME = 'sentry.javascript.browser';
-export const SDK_VERSION = '4.3.4';
+export const SDK_VERSION = '4.4.0';

packages/browser/test/manual/npm-build.js

@@ -0,0 +1,50 @@
+const fs = require('fs');
+const path = require('path');
+const webpack = require('webpack');
+const { JSDOM } = require('jsdom');
+
+webpack(
+  {
+    entry: path.join(__dirname, 'test-code.js'),
+    output: {
+      path: __dirname,
+      filename: 'tmp.js',
+    },
+    mode: 'production',
+  },
+  (err, stats) => {
+    if (err) {
+      console.error(err.stack || err);
+      if (err.details) {
+        console.error(err.details);
+      }
+      return;
+    }
+
+    const info = stats.toJson();
+
+    if (stats.hasErrors()) {
+      console.error(info.errors);
+    }
+
+    if (stats.hasWarnings()) {
+      console.warn(info.warnings);
+    }
+
+    runTests();
+  },
+);
+
+function runTests() {
+  const bundlePath = path.join(__dirname, 'tmp.js');
+  const { window } = new JSDOM(``, { runScripts: 'dangerously' });
+
+  window.onerror = function() {
+    process.exit(1);
+  };
+
+  const myLibrary = fs.readFileSync(bundlePath, { encoding: 'utf-8' });
+  const scriptEl = window.document.createElement('script');
+  scriptEl.textContent = myLibrary;
+  window.document.body.appendChild(scriptEl);
+}

packages/browser/test/manual/test-code.js

@@ -0,0 +1,62 @@
+const Sentry = require('../../dist/index.js');
+
+// Init
+Sentry.init({
+  dsn: 'https://completelyrandom@dsn.asdf/42',
+  beforeSend(event) {
+    console.log('Got an event');
+    return null;
+  },
+  beforeBreadcrumb(crumb) {
+    console.log(`Got a breadcrumb: ${crumb.category}`);
+    return crumb;
+  },
+});
+
+// Configure
+Sentry.configureScope(scope => {
+  scope.setExtra('foo', 'bar');
+  scope.setFingerprint('foo');
+  scope.setLevel('warning');
+  scope.setTag('foo', 'bar');
+  scope.setUser('foo', 'bar');
+});
+
+// Breadcrumbs integration
+window.console.log('Console', 'Breadcrumb');
+window.console.error({ foo: 'bar' });
+
+const clickEvent = new MouseEvent('click');
+const clickElement = window.document.createElement('button');
+clickElement.addEventListener('click', () => {
+  // do nothing, just capture a breadcrumb
+});
+clickElement.dispatchEvent(clickEvent);
+
+const keypressEvent = new KeyboardEvent('keypress');
+const keypressElement = window.document.createElement('input');
+keypressElement.addEventListener('keypress', () => {
+  // do nothing, just capture a breadcrumb
+});
+keypressElement.dispatchEvent(keypressEvent);
+
+// Basic breadcrumb
+Sentry.addBreadcrumb({
+  category: 'basic',
+  message: 'crumb',
+});
+
+// Capture methods
+Sentry.captureException(new Error('foo'));
+Sentry.captureMessage('bar');
+
+// Scope behavior
+Sentry.withScope(scope => {
+  scope.setExtra('baz', 'qux');
+  scope.setFingerprint('baz');
+  scope.setLevel('error');
+  scope.setTag('baz', 'qux');
+  scope.setUser('baz', 'qux');
+  Sentry.captureException(new TypeError('bar'));
+  Sentry.captureMessage('baz');
+});