Revert spring-webmvc view type null-guard change

trask · trask · commit 6bb2f799b573 · 2026-04-13T17:19:41.000-07:00
diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/ModelAndViewAttributesExtractor.java b/instrumentation/spring/spring-webmvc/spring-webmvc-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webmvc/ModelAndViewAttributesExtractor.java
@@ -26,7 +26,9 @@ public void onStart(
     if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {
       attributes.put("spring-webmvc.view.name", modelAndView.getViewName());
       View view = modelAndView.getView();
-      attributes.put("spring-webmvc.view.type", view == null ? null : view.getClass().getName());
+      if (view != null) {
+        attributes.put("spring-webmvc.view.type", view.getClass().getName());
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ public void onStart(`
`26`	`26`	`if (CAPTURE_EXPERIMENTAL_SPAN_ATTRIBUTES) {`
`27`	`27`	`attributes.put("spring-webmvc.view.name", modelAndView.getViewName());`
`28`	`28`	`View view = modelAndView.getView();`
`29`		`- attributes.put("spring-webmvc.view.type", view == null ? null : view.getClass().getName());`
	`29`	`+ if (view != null) {`
	`30`	`+ attributes.put("spring-webmvc.view.type", view.getClass().getName());`
	`31`	`+ }`
`30`	`32`	`}`
`31`	`33`	`}`
`32`	`34`