feat: Fallback to name Span including requestURI

open-telemetry · Mar 25, 2024 · b94f789 · b94f789
1 parent 296bd9e
commit b94f789
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...y/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/HttpRouteSupport.java b/...y/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/v6_0/HttpRouteSupport.java
@@ -113,6 +113,8 @@ String getHttpRoute(Context context, HttpServletRequest request) {
         if (bestMatchingPattern != null) {
           return prependContextPath(request, bestMatchingPattern.toString());
         }
+      } else {
+        return request.getRequestURI();
       }
     } finally {
       // mimic spring DispatcherServlet and restore the previous value of PATH_ATTRIBUTE

diff --git a/...a/io/opentelemetry/instrumentation/spring/webmvc/v6_0/WebMvcTelemetryProducingFilter.java b/...a/io/opentelemetry/instrumentation/spring/webmvc/v6_0/WebMvcTelemetryProducingFilter.java
@@ -60,9 +60,7 @@ public void doFilterInternal(
       error = t;
       throw t;
     } finally {
-      if (httpRouteSupport.hasMappings()) {
-        HttpServerRoute.update(context, CONTROLLER, httpRouteSupport::getHttpRoute, request);
-      }
+      HttpServerRoute.update(context, CONTROLLER, httpRouteSupport::getHttpRoute, request);
       instrumenter.end(context, request, response, error);
     }
   }