From 0b05672240e7b0f92967e4c48be959f7a768576c Mon Sep 17 00:00:00 2001
From: Arya <90748009+aryamohanan@users.noreply.github.com>
Date: Mon, 14 Oct 2024 18:09:46 +0530
Subject: [PATCH] fix: dropped support for disabling AWS SDK instrumentation in
 old syntax (#1383)

BREAKING CHANGE:
- Removed the ability to disable AWS SDK instrumentation using the old syntax disabledTracers: ['aws-sdk/v2/index'].
- Migrate to the new syntax for disabling instrumentation: disabledTracers: ['aws-sdk/v2'].
---
 packages/core/src/tracing/index.js            |  4 ++--
 .../instrumentation/cloud/aws-sdk/v2/index.js |  2 --
 .../instrumentation/cloud/aws-sdk/v3/index.js |  2 --
 packages/core/test/tracing/index_test.js      | 23 ++++++++++++++-----
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/tracing/index.js b/packages/core/src/tracing/index.js
index e44b05a86c..ff9fc4eb39 100644
--- a/packages/core/src/tracing/index.js
+++ b/packages/core/src/tracing/index.js
@@ -41,8 +41,8 @@ let processIdentityProvider = null;
 
 // Note: Also update initializedTooLateHeuristic.js and the accompanying test when adding instrumentations.
 let instrumentations = [
-  './instrumentation/cloud/aws-sdk/v2/index',
-  './instrumentation/cloud/aws-sdk/v3/index',
+  './instrumentation/cloud/aws-sdk/v2',
+  './instrumentation/cloud/aws-sdk/v3',
   './instrumentation/cloud/aws-sdk/v2/sdk',
   './instrumentation/cloud/aws-sdk/v2/sqs',
   './instrumentation/cloud/azure/blob',
diff --git a/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v2/index.js b/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v2/index.js
index 14ff027291..f9887e3a9b 100644
--- a/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v2/index.js
+++ b/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v2/index.js
@@ -27,8 +27,6 @@ awsProducts.forEach(awsProduct => {
 
 let isActive = false;
 
-exports.instrumentationName = 'aws-sdk/v2';
-
 exports.isActive = function () {
   return isActive;
 };
diff --git a/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v3/index.js b/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v3/index.js
index debc5f57f1..09302cd7fd 100644
--- a/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v3/index.js
+++ b/packages/core/src/tracing/instrumentation/cloud/aws-sdk/v3/index.js
@@ -31,8 +31,6 @@ awsProducts.forEach(awsProduct => {
 
 let isActive = false;
 
-exports.instrumentationName = 'aws-sdk/v3';
-
 exports.init = function init() {
   sqsConsumer.init();
 
diff --git a/packages/core/test/tracing/index_test.js b/packages/core/test/tracing/index_test.js
index 593d7b7fac..7a8d7a6904 100644
--- a/packages/core/test/tracing/index_test.js
+++ b/packages/core/test/tracing/index_test.js
@@ -127,16 +127,27 @@ mochaSuiteFn('[UNIT] tracing/index', function () {
     expect(activateStubRdKafka).to.have.been.calledWith(extraConfigFromAgent);
   });
 
-  it('[deprecated] aws-sdk/v2/index', () => {
-    initAndActivate({ tracing: { disabledTracers: ['aws-sdk/v2/index'] } });
+  it('disable aws-sdk/v3', () => {
+    initAndActivate({ tracing: { disabledTracers: ['aws-sdk/v3'] } });
 
-    // aws-sdk/v2 has been disabled (via aws-sdk/v2/index)
+    // aws-sdk/v3 has been disabled (via aws-sdk/v3)
+    expect(initAwsSdkv3).not.to.have.been.called;
+    expect(activateAwsSdkv3).not.to.have.been.called;
+
+    // aws-sdk/v2 has not been disabled (via aws-sdk/v2)
+    expect(initAwsSdkv2).to.have.been.called;
+    expect(activateAwsSdkv2).to.have.been.called;
+  });
+  it('disable aws-sdk/v3 and aws-sdk/v2', () => {
+    initAndActivate({ tracing: { disabledTracers: ['aws-sdk/v3', 'aws-sdk/v2'] } });
+
+    // aws-sdk/v2 has been disabled (via aws-sdk/v2)
     expect(initAwsSdkv2).not.to.have.been.called;
     expect(activateAwsSdkv2).not.to.have.been.called;
 
-    // aws-sdk/v3 has not been disabled
-    expect(initAwsSdkv3).to.have.been.called;
-    expect(activateAwsSdkv3).to.have.been.called;
+    // aws-sdk/v3 has been disabled (via aws-sdk/v3)
+    expect(initAwsSdkv3).not.to.have.been.called;
+    expect(activateAwsSdkv3).not.to.have.been.called;
   });
 
   function initAndActivate(initConfig, extraConfigForActivate) {