fix: Fix potential race condition in AWS SDK, AWS Bedrock, and Elasti…

…search that could lead to an orphaned Transaction. (#2842)
newrelic · Oct 21, 2024 · 3afa15f · 3afa15f
1 parent ba9ee7b
commit 3afa15f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ITransaction.cs b/src/Agent/NewRelic/Agent/Extensions/NewRelic.Agent.Extensions/Api/ITransaction.cs
@@ -165,6 +165,10 @@ ISegment StartMessageBrokerSegment(MethodCall methodCall, MessageBrokerDestinati
         /// <summary>
         /// Detatches the transaction from each non-async active context storage. This is necessary when async tracking needs to continue but
         /// the primary context(s) the transaction may be stored can continue to persist, such as thread static or thread local storgage.
+        /// <para>
+        /// <b>Warning:</b> This method should only be called at the start of the transaction, before any other segments are created.
+        /// If called partway through the transaction, this can result in "Transaction was garbage collected without ever ending" errors.
+        /// </para>
         /// </summary>
         void DetachFromPrimary();
 

diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsSdk/AwsSdkPipelineWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/AwsSdk/AwsSdkPipelineWrapper.cs
@@ -30,7 +30,6 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
             if (isAsync)
             {
                 transaction.AttachToAsync();
-                transaction.DetachFromPrimary(); //Remove from thread-local type storage
             }
 
             // Get the IRequestContext

diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/InvokeModelAsyncWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Bedrock/InvokeModelAsyncWrapper.cs
@@ -40,7 +40,6 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
             if (instrumentedMethodCall.IsAsync)
             {
                 transaction.AttachToAsync();
-                transaction.DetachFromPrimary(); //Remove from thread-local type storage
             }
 
             dynamic invokeModelRequest = instrumentedMethodCall.MethodCall.MethodArguments[0];

diff --git a/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs b/src/Agent/NewRelic/Agent/Extensions/Providers/Wrapper/Elasticsearch/RequestWrapper.cs
@@ -45,8 +45,6 @@ public AfterWrappedMethodDelegate BeforeWrappedMethod(InstrumentedMethodCall ins
             if (isAsync)
             {
                 transaction.AttachToAsync();
-                transaction.DetachFromPrimary(); //Remove from thread-local type storage
-
                 var parameterTypeNamesList = instrumentedMethodCall.InstrumentedMethodInfo.Method.ParameterTypeNames.Split(',');
                 if (parameterTypeNamesList[4] == "Elasticsearch.Net.IRequestParameters")
                 {