ref(core): Remove duplicate logic in scope.update (#11384)

Found when examining minified bundle for v8 (to see if treeshaking
working properly everywhere).

Author: AbhiPrasad

packages/core/src/scope.ts

@@ -322,47 +322,37 @@ export class Scope implements ScopeInterface {
 
     const scopeToMerge = typeof captureContext === 'function' ? captureContext(this) : captureContext;
 
-    if (scopeToMerge instanceof Scope) {
-      const scopeData = scopeToMerge.getScopeData();
-
-      this._tags = { ...this._tags, ...scopeData.tags };
-      this._extra = { ...this._extra, ...scopeData.extra };
-      this._contexts = { ...this._contexts, ...scopeData.contexts };
-      if (scopeData.user && Object.keys(scopeData.user).length) {
-        this._user = scopeData.user;
-      }
-      if (scopeData.level) {
-        this._level = scopeData.level;
-      }
-      if (scopeData.fingerprint.length) {
-        this._fingerprint = scopeData.fingerprint;
-      }
-      if (scopeToMerge.getRequestSession()) {
-        this._requestSession = scopeToMerge.getRequestSession();
-      }
-      if (scopeData.propagationContext) {
-        this._propagationContext = scopeData.propagationContext;
-      }
-    } else if (isPlainObject(scopeToMerge)) {
-      const scopeContext = captureContext as ScopeContext;
-      this._tags = { ...this._tags, ...scopeContext.tags };
-      this._extra = { ...this._extra, ...scopeContext.extra };
-      this._contexts = { ...this._contexts, ...scopeContext.contexts };
-      if (scopeContext.user) {
-        this._user = scopeContext.user;
-      }
-      if (scopeContext.level) {
-        this._level = scopeContext.level;
-      }
-      if (scopeContext.fingerprint) {
-        this._fingerprint = scopeContext.fingerprint;
-      }
-      if (scopeContext.requestSession) {
-        this._requestSession = scopeContext.requestSession;
-      }
-      if (scopeContext.propagationContext) {
-        this._propagationContext = scopeContext.propagationContext;
-      }
+    const [scopeInstance, requestSession] =
+      scopeToMerge instanceof Scope
+        ? [scopeToMerge.getScopeData(), scopeToMerge.getRequestSession()]
+        : isPlainObject(scopeToMerge)
+          ? [captureContext as ScopeContext, (captureContext as ScopeContext).requestSession]
+          : [];
+
+    const { tags, extra, user, contexts, level, fingerprint = [], propagationContext } = scopeInstance || {};
+
+    this._tags = { ...this._tags, ...tags };
+    this._extra = { ...this._extra, ...extra };
+    this._contexts = { ...this._contexts, ...contexts };
+
+    if (user && Object.keys(user).length) {
+      this._user = user;
+    }
+
+    if (level) {
+      this._level = level;
+    }
+
+    if (fingerprint.length) {
+      this._fingerprint = fingerprint;
+    }
+
+    if (propagationContext) {
+      this._propagationContext = propagationContext;
+    }
+
+    if (requestSession) {
+      this._requestSession = requestSession;
     }
 
     return this;
@@ -450,34 +440,19 @@ export class Scope implements ScopeInterface {
 
   /** @inheritDoc */
   public getScopeData(): ScopeData {
-    const {
-      _breadcrumbs,
-      _attachments,
-      _contexts,
-      _tags,
-      _extra,
-      _user,
-      _level,
-      _fingerprint,
-      _eventProcessors,
-      _propagationContext,
-      _sdkProcessingMetadata,
-      _transactionName,
-    } = this;
-
     return {
-      breadcrumbs: _breadcrumbs,
-      attachments: _attachments,
-      contexts: _contexts,
-      tags: _tags,
-      extra: _extra,
-      user: _user,
-      level: _level,
-      fingerprint: _fingerprint || [],
-      eventProcessors: _eventProcessors,
-      propagationContext: _propagationContext,
-      sdkProcessingMetadata: _sdkProcessingMetadata,
-      transactionName: _transactionName,
+      breadcrumbs: this._breadcrumbs,
+      attachments: this._attachments,
+      contexts: this._contexts,
+      tags: this._tags,
+      extra: this._extra,
+      user: this._user,
+      level: this._level,
+      fingerprint: this._fingerprint || [],
+      eventProcessors: this._eventProcessors,
+      propagationContext: this._propagationContext,
+      sdkProcessingMetadata: this._sdkProcessingMetadata,
+      transactionName: this._transactionName,
       span: _getSpanForScope(this),
     };
   }