fixes to scope & use scope.clone()

Author: mydea

packages/node-experimental/src/integrations/http.ts

@@ -132,7 +132,7 @@ export class Http implements Integration {
 
             // Update the isolation scope, isolation this request
             if (getSpanKind(span) === SpanKind.SERVER) {
-              setIsolationScope(Scope.clone(getIsolationScope()));
+              setIsolationScope(getIsolationScope().clone());
             }
           },
           responseHook: (span, res) => {

packages/node-experimental/src/otel/contextManager.ts

@@ -31,7 +31,7 @@ export class SentryContextManager extends AsyncLocalStorageContextManager {
     const currentScope = previousScopes ? previousScopes.scope : getCurrentScope();
     const isolationScope = previousScopes ? previousScopes.isolationScope : getIsolationScope();
 
-    const newCurrentScope = Scope.clone(currentScope);
+    const newCurrentScope = currentScope.clone();
     const scopes: CurrentScopes = { scope: newCurrentScope, isolationScope };
 
     // We also need to "mock" the hub on the context, as the original @sentry/opentelemetry uses that...

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

@@ -100,7 +100,7 @@ export function withIsolationScope<T>(callback: (scope: Scope, isolationScope: S
         isolationScope: getIsolationScope(),
       };
 
-  scopes.isolationScope = Scope.clone(scopes.isolationScope);
+  scopes.isolationScope = scopes.isolationScope.clone();
 
   return context.with(setScopesOnContext(ctx, scopes), () => {
     return callback(getCurrentScope(), getIsolationScope());

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

@@ -3,7 +3,7 @@ import { NodeClient, SDK_VERSION } from '@sentry/node';
 import type { Tracer } from '@opentelemetry/api';
 import { trace } from '@opentelemetry/api';
 import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
-import type { Event, EventHint } from '@sentry/types';
+import type { CaptureContext, Event, EventHint } from '@sentry/types';
 import { Scope } from './scope';
 
 /** A client for using Sentry with Node & OpenTelemetry. */
@@ -57,17 +57,23 @@ export class NodeExperimentalClient extends NodeClient {
 
   /**
    * Extends the base `_prepareEvent` so that we can properly handle `captureContext`.
-   * This uses `Scope.clone()`, which we need to replace with `NodeExperimentalScope.clone()` for this client.
+   * This uses `new Scope()`, which we need to replace with our own Scope  for this client.
    */
   protected _prepareEvent(event: Event, hint: EventHint, scope?: Scope): PromiseLike<Event | null> {
     let actualScope = scope;
 
     // Remove `captureContext` hint and instead clone already here
     if (hint && hint.captureContext) {
-      actualScope = Scope.clone(scope);
+      actualScope = getFinalScope(scope, hint.captureContext);
       delete hint.captureContext;
     }
 
     return super._prepareEvent(event, hint, actualScope);
   }
 }
+
+function getFinalScope(scope: Scope | undefined, captureContext: CaptureContext): Scope | undefined {
+  const finalScope = scope ? scope.clone() : new Scope();
+  finalScope.update(captureContext);
+  return finalScope;
+}

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

@@ -18,27 +18,24 @@ export class Scope extends OpenTelemetryScope implements ScopeInterface {
   /**
    * @inheritDoc
    */
-  public static clone(scope?: Scope): Scope {
+  public clone(): Scope {
     const newScope = new Scope();
-    if (scope) {
-      newScope._breadcrumbs = [...scope['_breadcrumbs']];
-      newScope._tags = { ...scope['_tags'] };
-      newScope._extra = { ...scope['_extra'] };
-      newScope._contexts = { ...scope['_contexts'] };
-      newScope._user = scope['_user'];
-      newScope._level = scope['_level'];
-      newScope._span = scope['_span'];
-      newScope._session = scope['_session'];
-      newScope._transactionName = scope['_transactionName'];
-      newScope._fingerprint = scope['_fingerprint'];
-      newScope._eventProcessors = [...scope['_eventProcessors']];
-      newScope._requestSession = scope['_requestSession'];
-      newScope._attachments = [...scope['_attachments']];
-      newScope._sdkProcessingMetadata = { ...scope['_sdkProcessingMetadata'] };
-      newScope._propagationContext = { ...scope['_propagationContext'] };
-      newScope._client = scope['_client'];
-      newScope._lastEventId = scope['_lastEventId'];
-    }
+    newScope._breadcrumbs = [...this['_breadcrumbs']];
+    newScope._tags = { ...this['_tags'] };
+    newScope._extra = { ...this['_extra'] };
+    newScope._contexts = { ...this['_contexts'] };
+    newScope._user = this['_user'];
+    newScope._level = this['_level'];
+    newScope._span = this['_span'];
+    newScope._session = this['_session'];
+    newScope._transactionName = this['_transactionName'];
+    newScope._fingerprint = this['_fingerprint'];
+    newScope._eventProcessors = [...this['_eventProcessors']];
+    newScope._requestSession = this['_requestSession'];
+    newScope._attachments = [...this['_attachments']];
+    newScope._sdkProcessingMetadata = { ...this['_sdkProcessingMetadata'] };
+    newScope._propagationContext = { ...this['_propagationContext'] };
+
     return newScope;
   }