From b371361bb971430f2a18728c5b05ec01362dd8f0 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Fri, 8 Oct 2021 23:05:20 +0300
Subject: [PATCH] Set server span name only when needed (#4331)

---
 .../servlet/OpenTelemetryHandlerMappingFilter.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/OpenTelemetryHandlerMappingFilter.java b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/OpenTelemetryHandlerMappingFilter.java
index 2d1af04660..501d0a9cde 100644
--- a/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/OpenTelemetryHandlerMappingFilter.java
+++ b/instrumentation/spring/spring-webmvc-3.1/javaagent/src/main/java/org/springframework/web/servlet/OpenTelemetryHandlerMappingFilter.java
@@ -53,13 +53,15 @@ public class OpenTelemetryHandlerMappingFilter implements Filter, Ordered {
       return;
     }
 
-    if (handlerMappings != null) {
-      Context context = Context.current();
-      ServerSpanNaming.updateServerSpanName(
-          context, CONTROLLER, serverSpanName, (HttpServletRequest) request);
+    try {
+      filterChain.doFilter(request, response);
+    } finally {
+      if (handlerMappings != null) {
+        Context context = Context.current();
+        ServerSpanNaming.updateServerSpanName(
+            context, CONTROLLER, serverSpanName, (HttpServletRequest) request);
+      }
     }
-
-    filterChain.doFilter(request, response);
   }
 
   @Override