fix incorrect deduping of named to namespace imports

getsentry · Aug 24, 2023 · 2d48de4 · 2d48de4
1 parent 86b50b5
commit 2d48de4
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 7 deletions.
diff --git a/src/transformers/rewriteTracingImports/rewriteTracingImports.test.js b/src/transformers/rewriteTracingImports/rewriteTracingImports.test.js
@@ -80,7 +80,21 @@ Sentry.init({
   tracesSampleRate: 1.0,
 });
 
-Sentry.addExtensionMethods();`
+Sentry.setTag('shouldBePrefixed', true);
+
+Sentry.addExtensionMethods();
+
+const transaction = Sentry.startTransaction({ name: 'test-transaction' });
+
+Sentry.configureScope(scope => {
+  scope.setSpan(transaction);
+});
+
+transaction.setTag('shouldBePrefixed', false)
+
+doLongRunningThing();
+
+transaction.finish();`
     );
 
     assertStringEquals(
@@ -146,7 +160,7 @@ addExtensionMethods();`
 
     assertStringEquals(
       actual2,
-      ` const { init: SentryInit } = require('@sentry/node');
+      `const { init: SentryInit } = require('@sentry/node');
 const { addExtensionMethods } = require("@sentry/node");
 
 SentryInit({

diff --git a/src/utils/jscodeshift.cjs b/src/utils/jscodeshift.cjs
@@ -213,12 +213,24 @@ function dedupeImportStatements(packageName, root, j) {
         )
         .forEach(specifier => {
           const id = specifier.node.imported.name;
-          root.find(j.Identifier, { name: id }).forEach(idPath => {
-            idPath.replace(j.memberExpression(j.identifier(packageNamespace), j.identifier(id)));
-          });
-          otherPackageImportPath.replace(undefined);
+          root
+            .find(j.Identifier, { name: id })
+            .filter(idPath => {
+              return idPath.parentPath.value.type !== 'MemberExpression';
+            })
+            .forEach(idPath => {
+              idPath.replace(j.memberExpression(j.identifier(packageNamespace), j.identifier(id)));
+            });
+          otherPackageImportPath.node.specifiers?.splice(
+            otherPackageImportPath.node.specifiers.indexOf(specifier.node),
+            1
+          );
         });
 
+      if (!otherPackageImportPath.node.specifiers?.length) {
+        otherPackageImportPath.replace(undefined);
+      }
+
       // case 1b: Old package import is a namespace import (e.g. import * as Tracing from '@sentry/tracing')
       j(otherPackageImportPath)
         .filter(t => t.node.specifiers?.length === 1)

diff --git a/test-fixtures/tracingAppNodeEsm/namespace-named.mjs b/test-fixtures/tracingAppNodeEsm/namespace-named.mjs
@@ -1,9 +1,24 @@
 import * as Sentry from '@sentry/node';
-import { addExtensionMethods } from '@sentry/tracing';
+import { setTag } from '@sentry/node';
+import { addExtensionMethods, startTransaction } from '@sentry/tracing';
 
 Sentry.init({
   dsn: '__DSN__',
   tracesSampleRate: 1.0,
 });
 
+setTag('shouldBePrefixed', true);
+
 addExtensionMethods();
+
+const transaction = startTransaction({ name: 'test-transaction' });
+
+Sentry.configureScope(scope => {
+  scope.setSpan(transaction);
+});
+
+transaction.setTag('shouldBePrefixed', false)
+
+doLongRunningThing();
+
+transaction.finish();