fix RequestContextImpl.copy instrumentation issue with pekko-http 1.1…

….+ (#1372)
kamon-io · Oct 10, 2024 · 655fa6d · 655fa6d
1 parent a478d3b
commit 655fa6d
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/...http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala b/...http/src/main/scala/kamon/instrumentation/pekko/http/PekkoHttpServerInstrumentation.scala
@@ -55,9 +55,10 @@ class PekkoHttpServerInstrumentation extends InstrumentationBuilder {
     * The rest of these sections are just about making sure that we can generate an appropriate operation name (i.e. free
     * of variables) and take a Sampling Decision in case none has been taken so far.
     */
-  onType("org.apache.pekko.http.scaladsl.server.RequestContextImpl")
-    .mixin(classOf[HasMatchingContext.Mixin])
-    .intercept(method("copy"), RequestContextCopyInterceptor)
+  Try(Class.forName("org.apache.pekko.http.scaladsl.server.RequestContext")).toOption
+    .foldLeft(
+      onType("org.apache.pekko.http.scaladsl.server.RequestContextImpl").mixin(classOf[HasMatchingContext.Mixin])
+    )((advice, klass) => advice.intercept(withReturnTypes(klass), RequestContextCopyInterceptor))
 
   onType("org.apache.pekko.http.scaladsl.server.directives.PathDirectives")
     .intercept(method("rawPathPrefix"), classOf[PathDirectivesRawPathPrefixInterceptor])
@@ -262,7 +263,7 @@ object RequestContextCopyInterceptor {
   @RuntimeType
   def copy(@This context: RequestContext, @SuperCall copyCall: Callable[RequestContext]): RequestContext = {
     val copiedRequestContext = copyCall.call()
-    copiedRequestContext.asInstanceOf[HasMatchingContext].setMatchingContext(
+    if (copiedRequestContext ne context) copiedRequestContext.asInstanceOf[HasMatchingContext].setMatchingContext(
       context.asInstanceOf[HasMatchingContext].matchingContext
     )
     copiedRequestContext