Ensure reactor netty spans are ended in the order they were started (#…

…9203)
open-telemetry · Aug 16, 2023 · 8211886 · 8211886
1 parent 31b90b1
commit 8211886
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/InstrumentationContexts.java b/...io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/InstrumentationContexts.java
@@ -52,7 +52,10 @@ Context startClientSpan(HttpClientRequest request) {
     return context;
   }
 
-  void endClientSpan(@Nullable HttpClientResponse response, @Nullable Throwable error) {
+  // we are synchronizing here to ensure that spans are ended in the oder they are read from the
+  // queue
+  synchronized void endClientSpan(
+      @Nullable HttpClientResponse response, @Nullable Throwable error) {
     RequestAndContext requestAndContext = clientContexts.poll();
     if (requestAndContext != null) {
       instrumenter().end(requestAndContext.context, requestAndContext.request, response, error);