Merge branch 'master' into node-pg

Author: kamilogorek

.size-limit.js

@@ -3,24 +3,24 @@ module.exports = [
     name: '@sentry/browser - CDN Bundle (gzipped)',
     path: 'packages/browser/build/bundle.min.js',
     gzip: true,
-    limit: '18 KB',
+    limit: '21 KB',
   },
   {
     name: '@sentry/browser - Webpack',
     path: 'packages/browser/esm/index.js',
     import: '{ init }',
-    limit: '19 KB',
+    limit: '22 KB',
   },
   {
     name: '@sentry/react - Webpack',
     path: 'packages/react/esm/index.js',
     import: '{ init }',
-    limit: '19 KB',
+    limit: '22 KB',
   },
   {
     name: '@sentry/browser + @sentry/tracing - CDN Bundle (gzipped)',
     path: 'packages/tracing/build/bundle.tracing.min.js',
     gzip: true,
-    limit: '25 KB',
+    limit: '28 KB',
   },
 ];

packages/node/test/handlers.test.ts

@@ -308,8 +308,8 @@ describe('tracingHandler', () => {
     });
   });
 
-  it('lets all spans being finished before calling `finish` itself, despite being registered to `res.finish` event first', done => {
-    const transaction = new Transaction({ name: 'mockTransaction' });
+  it('waits to finish transaction until all spans are finished, even though `transaction.finish()` is registered on `res.finish` event first', done => {
+    const transaction = new Transaction({ name: 'mockTransaction', sampled: true });
     transaction.initSpanRecorder();
     const span = transaction.startChild({
       description: 'reallyCoolHandler',
@@ -319,6 +319,11 @@ describe('tracingHandler', () => {
     const finishSpan = jest.spyOn(span, 'finish');
     const finishTransaction = jest.spyOn(transaction, 'finish');
 
+    let sentEvent: Event;
+    jest.spyOn((transaction as any)._hub, 'captureEvent').mockImplementation(event => {
+      sentEvent = event as Event;
+    });
+
     sentryTracingMiddleware(req, res, next);
     res.once('finish', () => {
       span.finish();
@@ -328,7 +333,9 @@ describe('tracingHandler', () => {
     setImmediate(() => {
       expect(finishSpan).toHaveBeenCalled();
       expect(finishTransaction).toHaveBeenCalled();
-      expect(span.endTimestamp).toBeLessThan(transaction.endTimestamp!);
+      expect(span.endTimestamp).toBeLessThanOrEqual(transaction.endTimestamp!);
+      expect(sentEvent.spans?.length).toEqual(1);
+      expect(sentEvent.spans?.[0].spanId).toEqual(span.spanId);
       done();
     });
   });

scripts/test.sh

@@ -7,14 +7,14 @@ if [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -le 6 ]]; then
   nvm use 8
   yarn install --ignore-engines --ignore-scripts
   # ember requires Node >= 10 to build
-  yarn build --ignore="@sentry/ember" --ignore="@sentry/serverless"
+  yarn build --ignore="@sentry/ember" --ignore="@sentry/serverless" --ignore="@sentry/gatsby" --ignore="@sentry/react"
   nvm use 6
   # browser can be tested only on Node >= v8 because Karma is not supporting anything older
   yarn test --ignore="@sentry/tracing" --ignore="@sentry/react" --ignore="@sentry/gatsby" --ignore="@sentry/ember" --ignore="@sentry-internal/eslint-plugin-sdk" --ignore="@sentry-internal/eslint-config-sdk" --ignore="@sentry/serverless" --ignore="@sentry/browser" --ignore="@sentry/integrations" 
 elif [[ "$(cut -d. -f1 <<< "$TRAVIS_NODE_VERSION")" -le 8 ]]; then
   yarn install --ignore-engines --ignore-scripts
   # ember requires Node >= 10 to build
-  yarn build --ignore="@sentry/ember" --ignore="@sentry/serverless"
+  yarn build --ignore="@sentry/ember" --ignore="@sentry/serverless" --ignore="@sentry/gatsby" --ignore="@sentry/react"
   # serverless, tracing, ember and react work only on Node >= v10
   yarn test --ignore="@sentry/tracing" --ignore="@sentry/react" --ignore="@sentry/gatsby" --ignore="@sentry/ember" --ignore="@sentry-internal/eslint-plugin-sdk" --ignore="@sentry-internal/eslint-config-sdk" --ignore="@sentry/serverless"
 else