File tree Expand file tree Collapse file tree 13 files changed +43
-31
lines changed Expand file tree Collapse file tree 13 files changed +43
-31
lines changed Original file line number Diff line number Diff line change 11{
22 "lerna" : " 3.4.0" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "packages" : " packages/*" ,
55 "ignore" : " raven-*" ,
66 "npmClient" : " yarn" ,
Original file line number Diff line number Diff line change 11{
22 "name" : " @sentry/browser" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "description" : " Official Sentry SDK for browsers" ,
55 "repository" : " git://github.com/getsentry/sentry-javascript.git" ,
66 "homepage" : " https://github.com/getsentry/sentry-javascript/tree/master/packages/browser" ,
1616 "access" : " public"
1717 },
1818 "dependencies" : {
19- "@sentry/core" : " 5.6.0-beta.3 " ,
20- "@sentry/types" : " 5.6.0-beta.3 " ,
21- "@sentry/utils" : " 5.6.0-beta.3 " ,
19+ "@sentry/core" : " 5.6.0-beta.4 " ,
20+ "@sentry/types" : " 5.6.0-beta.4 " ,
21+ "@sentry/utils" : " 5.6.0-beta.4 " ,
2222 "tslib" : " ^1.9.3"
2323 },
2424 "devDependencies" : {
Original file line number Diff line number Diff line change 11export const SDK_NAME = 'sentry.javascript.browser' ;
2- export const SDK_VERSION = '5.6.0-beta.3 ' ;
2+ export const SDK_VERSION = '5.6.0-beta.4 ' ;
Original file line number Diff line number Diff line change 11{
22 "name" : " @sentry/core" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "description" : " Base implementation for all Sentry JavaScript SDKs" ,
55 "repository" : " git://github.com/getsentry/sentry-javascript.git" ,
66 "homepage" : " https://github.com/getsentry/sentry-javascript/tree/master/packages/core" ,
1616 "access" : " public"
1717 },
1818 "dependencies" : {
19- "@sentry/hub" : " 5.6.0-beta.3 " ,
20- "@sentry/minimal" : " 5.6.0-beta.3 " ,
21- "@sentry/types" : " 5.6.0-beta.3 " ,
22- "@sentry/utils" : " 5.6.0-beta.3 " ,
19+ "@sentry/hub" : " 5.6.0-beta.4 " ,
20+ "@sentry/minimal" : " 5.6.0-beta.4 " ,
21+ "@sentry/types" : " 5.6.0-beta.4 " ,
22+ "@sentry/utils" : " 5.6.0-beta.4 " ,
2323 "tslib" : " ^1.9.3"
2424 },
2525 "devDependencies" : {
Original file line number Diff line number Diff line change 11{
22 "name" : " @sentry/hub" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "description" : " Sentry hub which handles global state managment." ,
55 "repository" : " git://github.com/getsentry/sentry-javascript.git" ,
66 "homepage" : " https://github.com/getsentry/sentry-javascript/tree/master/packages/hub" ,
1616 "access" : " public"
1717 },
1818 "dependencies" : {
19- "@sentry/types" : " 5.6.0-beta.3 " ,
20- "@sentry/utils" : " 5.6.0-beta.3 " ,
19+ "@sentry/types" : " 5.6.0-beta.4 " ,
20+ "@sentry/utils" : " 5.6.0-beta.4 " ,
2121 "tslib" : " ^1.9.3"
2222 },
2323 "devDependencies" : {
Original file line number Diff line number Diff line change @@ -444,11 +444,11 @@ export class Hub implements HubInterface {
444444
445445 // TODO: if sampled do what?
446446
447- const finishedSpans = passedSpan . finishedSpans . filter ( s => s !== span ) ;
447+ const finishedSpans = passedSpan . finishedSpans . filter ( s => s !== passedSpan ) ;
448448
449449 const eventId = this . captureEvent ( {
450450 contexts : { trace : passedSpan . getTraceContext ( ) } ,
451- spans : finishedSpans ,
451+ spans : finishedSpans . length > 0 ? finishedSpans : undefined ,
452452 start_timestamp : passedSpan . startTimestamp ,
453453 timestamp : passedSpan . timestamp ,
454454 transaction : passedSpan . transaction ,
Original file line number Diff line number Diff line change @@ -323,6 +323,18 @@ describe('Hub', () => {
323323 const span = hub . startSpan ( { transaction : 'test' } , true ) as any ;
324324 expect ( hub . finishSpan ( span ) ) . toBeDefined ( ) ;
325325 expect ( spy ) . toHaveBeenCalled ( ) ;
326+ expect ( spy . mock . calls [ 0 ] [ 0 ] . spans ) . toBeUndefined ( ) ;
327+ } ) ;
328+
329+ test ( 'finish a scope span with transaction + child span' , ( ) => {
330+ const myScope = new Scope ( ) ;
331+ const hub = new Hub ( clientFn , myScope ) ;
332+ const spy = jest . spyOn ( hub as any , 'captureEvent' ) ;
333+ const span = hub . startSpan ( { transaction : 'test' } , true ) as any ;
334+ hub . finishSpan ( hub . startSpan ( ) ) ;
335+ expect ( hub . finishSpan ( span ) ) . toBeDefined ( ) ;
336+ expect ( spy ) . toHaveBeenCalled ( ) ;
337+ expect ( spy . mock . calls [ 0 ] [ 0 ] . spans ) . toHaveLength ( 1 ) ;
326338 } ) ;
327339 } ) ;
328340 } ) ;
Original file line number Diff line number Diff line change 11{
22 "name" : " @sentry/integrations" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "description" : " Pluggable integrations that can be used to enchance JS SDKs" ,
55 "repository" : " git://github.com/getsentry/sentry-javascript.git" ,
66 "homepage" : " https://github.com/getsentry/sentry-javascript/tree/master/packages/integrations" ,
1616 "module" : " esm/index.js" ,
1717 "types" : " dist/index.d.ts" ,
1818 "dependencies" : {
19- "@sentry/types" : " 5.6.0-beta.3 " ,
20- "@sentry/utils" : " 5.6.0-beta.3 " ,
19+ "@sentry/types" : " 5.6.0-beta.4 " ,
20+ "@sentry/utils" : " 5.6.0-beta.4 " ,
2121 "tslib" : " ^1.9.3"
2222 },
2323 "devDependencies" : {
Original file line number Diff line number Diff line change 11{
22 "name" : " @sentry/minimal" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "description" : " Sentry minimal library that can be used in other packages" ,
55 "repository" : " git://github.com/getsentry/sentry-javascript.git" ,
66 "homepage" : " https://github.com/getsentry/sentry-javascript/tree/master/packages/minimal" ,
1616 "access" : " public"
1717 },
1818 "dependencies" : {
19- "@sentry/hub" : " 5.6.0-beta.3 " ,
20- "@sentry/types" : " 5.6.0-beta.3 " ,
19+ "@sentry/hub" : " 5.6.0-beta.4 " ,
20+ "@sentry/types" : " 5.6.0-beta.4 " ,
2121 "tslib" : " ^1.9.3"
2222 },
2323 "devDependencies" : {
Original file line number Diff line number Diff line change 11{
22 "name" : " @sentry/node" ,
3- "version" : " 5.6.0-beta.3 " ,
3+ "version" : " 5.6.0-beta.4 " ,
44 "description" : " Offical Sentry SDK for Node.js" ,
55 "repository" : " git://github.com/getsentry/sentry-javascript.git" ,
66 "homepage" : " https://github.com/getsentry/sentry-javascript/tree/master/packages/node" ,
1616 "access" : " public"
1717 },
1818 "dependencies" : {
19- "@sentry/core" : " 5.6.0-beta.3 " ,
20- "@sentry/hub" : " 5.6.0-beta.3 " ,
21- "@sentry/types" : " 5.6.0-beta.3 " ,
22- "@sentry/utils" : " 5.6.0-beta.3 " ,
19+ "@sentry/core" : " 5.6.0-beta.4 " ,
20+ "@sentry/hub" : " 5.6.0-beta.4 " ,
21+ "@sentry/types" : " 5.6.0-beta.4 " ,
22+ "@sentry/utils" : " 5.6.0-beta.4 " ,
2323 "cookie" : " 0.3.1" ,
2424 "https-proxy-agent" : " 2.2.1" ,
2525 "lru_map" : " 0.3.3" ,
You can’t perform that action at this time.
0 commit comments