ref: Update withIsolationScope to not pass current scope

Author: mydea

packages/node-experimental/src/sdk/api.ts

@@ -37,10 +37,10 @@ export function withScope<T>(callback: (scope: Scope) => T): T {
 }
 
 /**
- * Fork a scope from the current scope, and make it the current scope in the given callback.
- * Additionally, also setup a new isolation scope for the callback.
+ * For a new isolation scope from the current isolation scope,
+ * and make it the current isolation scope in the given callback.
  */
-export function withIsolationScope<T>(callback: (scope: Scope, isolationScope: Scope) => T): T {
+export function withIsolationScope<T>(callback: (isolationScope: Scope) => T): T {
   const ctx = context.active();
   const currentScopes = getScopesFromContext(ctx);
   const scopes = currentScopes
@@ -53,7 +53,7 @@ export function withIsolationScope<T>(callback: (scope: Scope, isolationScope: S
   scopes.isolationScope = scopes.isolationScope.clone();
 
   return context.with(setScopesOnContext(ctx, scopes), () => {
-    return callback(getCurrentScope(), getIsolationScope());
+    return callback(getIsolationScope());
   });
 }
 

packages/node-experimental/test/integration/scope.test.ts

@@ -353,14 +353,16 @@ describe('Integration | Scope', () => {
       initialIsolationScope.setTag('tag1', 'val1');
       initialIsolationScope.setTag('tag2', 'val2');
 
+      const initialCurrentScope = Sentry.getCurrentScope();
+
       const error = new Error('test error');
 
-      Sentry.withIsolationScope((_currentScope, newIsolationScope) => {
+      Sentry.withIsolationScope(newIsolationScope => {
         newIsolationScope.setTag('tag4', 'val4');
       });
 
-      Sentry.withIsolationScope((currentScope, newIsolationScope) => {
-        expect(Sentry.getCurrentScope()).toBe(currentScope);
+      Sentry.withIsolationScope(newIsolationScope => {
+        expect(Sentry.getCurrentScope()).not.toBe(initialCurrentScope);
         expect(Sentry.getIsolationScope()).toBe(newIsolationScope);
         expect(newIsolationScope).not.toBe(initialIsolationScope);
 
@@ -402,13 +404,13 @@ describe('Integration | Scope', () => {
 
       const error = new Error('test error');
 
-      Sentry.withIsolationScope((_currentScope, newIsolationScope) => {
+      Sentry.withIsolationScope(newIsolationScope => {
         newIsolationScope.setTag('tag2', 'val2');
 
-        Sentry.withIsolationScope((_currentScope, newIsolationScope) => {
+        Sentry.withIsolationScope(newIsolationScope => {
           newIsolationScope.setTag('tag3', 'val3');
 
-          Sentry.withIsolationScope((_currentScope, newIsolationScope) => {
+          Sentry.withIsolationScope(newIsolationScope => {
             newIsolationScope.setTag('tag4', 'val4');
           });
 
@@ -648,8 +650,8 @@ describe('Integration | Scope', () => {
 
       const error = new Error('test error');
 
-      Sentry.withIsolationScope((currentScope, isolationScope) => {
-        currentScope.setTag('tag2', 'val2a');
+      Sentry.withIsolationScope(isolationScope => {
+        Sentry.getCurrentScope().setTag('tag2', 'val2a');
         isolationScope.setTag('tag2', 'val2b');
         isolationScope.setTag('tag3', 'val3');
 

packages/node-experimental/test/integration/transactions.test.ts

@@ -181,7 +181,7 @@ describe('Integration | Transactions', () => {
 
     Sentry.addBreadcrumb({ message: 'test breadcrumb 1', timestamp: 123456 });
 
-    Sentry.withIsolationScope((scope, isolationScope) => {
+    Sentry.withIsolationScope(() => {
       Sentry.startSpan({ op: 'test op', name: 'test name', source: 'task', origin: 'auto.test' }, span => {
         Sentry.addBreadcrumb({ message: 'test breadcrumb 2', timestamp: 123456 });