@@ -3,10 +3,9 @@ import { BrowserClient } from '@sentry/browser';
3
3
import { getMainCarrier , Hub } from '@sentry/hub' ;
4
4
import * as hubModule from '@sentry/hub' ;
5
5
import * as utilsModule from '@sentry/utils' ; // for mocking
6
- import { base64ToUnicode , getGlobalObject , isNodeEnv , logger } from '@sentry/utils' ;
6
+ import { computeTracestate , getGlobalObject , isNodeEnv , logger } from '@sentry/utils' ;
7
7
import * as nodeHttpModule from 'http' ;
8
8
9
- import { Transaction } from '../src' ;
10
9
import { BrowserTracing } from '../src/browser/browsertracing' ;
11
10
import { addExtensionMethods } from '../src/hubextensions' ;
12
11
import { extractTraceparentData , TRACEPARENT_REGEXP } from '../src/utils' ;
@@ -46,26 +45,26 @@ describe('Hub', () => {
46
45
expect ( transaction ) . toEqual ( expect . objectContaining ( transactionContext ) ) ;
47
46
} ) ;
48
47
49
- it ( 'creates a new tracestate value (with the right data) if not given one in transaction context' , ( ) => {
48
+ it ( 'creates a new tracestate value if not given one in transaction context' , ( ) => {
49
+ const environment = 'dogpark' ;
50
+ const release = 'off.leash.park' ;
50
51
const hub = new Hub (
51
52
new BrowserClient ( {
52
53
dsn :
'https://[email protected] /12312012' ,
53
- release : 'off.leash.park' ,
54
- environment : 'dogpark' ,
54
+ release,
55
+ environment,
55
56
} ) ,
56
57
) ;
57
58
const transaction = hub . startTransaction ( { name : 'FETCH /ball' } ) ;
58
59
59
- const b64Value =
60
- 'eyJwdWJsaWNfa2V5IjoiZG9nc2FyZWJhZGF0a2VlcGluZ3NlY3JldHMiLCJlbnZpcm9ubWVudCI6ImRvZ3BhcmsiLCJyZWxlYXNlI' +
61
- 'joib2ZmLmxlYXNoLnBhcmsifQ.' ;
62
-
63
- expect ( transaction . tracestate ) . toEqual ( b64Value ) ;
64
- expect ( JSON . parse ( base64ToUnicode ( b64Value . replace ( '.' , '=' ) ) ) ) . toEqual ( {
65
- environment : 'dogpark' ,
60
+ const b64Value = computeTracestate ( {
61
+ trace_id : transaction . traceId ,
62
+ environment,
63
+ release,
66
64
public_key : 'dogsarebadatkeepingsecrets' ,
67
- release : 'off.leash.park' ,
68
65
} ) ;
66
+
67
+ expect ( transaction . tracestate ) . toEqual ( b64Value ) ;
69
68
} ) ;
70
69
} ) ;
71
70
0 commit comments