@@ -67,39 +67,4 @@ public void postHandle(
6767 // There is no global context to be changed in post handle since it is done in preHandle on a new call.
6868 }
6969
70-
71- // Implementation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
72- private static final TextMapGetter <javax .servlet .http .HttpServletRequest > JAVA_HTTP_SERVLET_REQUEST_GETTER =
73- new TextMapGetter <>() {
74- @ Override
75- public Iterable <String > keys (javax .servlet .http .HttpServletRequest carrier ) {
76- return Collections .list (carrier .getHeaderNames ());
77- }
78-
79- @ Override
80- public String get (javax .servlet .http .HttpServletRequest carrier , String key ) {
81- return carrier .getHeader (key );
82- }
83- };
84-
85- public boolean preHandle (
86- javax .servlet .http .HttpServletRequest request , javax .servlet .http .HttpServletResponse response , Object handler ) {
87- final TextMapPropagator textFormat = openTelemetry .getPropagators ().getTextMapPropagator ();
88- // preHandle is called twice for asynchronous request. For more information, read:
89- // https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/servlet/AsyncHandlerInterceptor.html
90- if (request .getDispatcherType () == javax .servlet .DispatcherType .ASYNC ) {
91- return true ;
92- }
93-
94- Context context = textFormat .extract (Context .current (), request , JAVA_HTTP_SERVLET_REQUEST_GETTER );
95- request .setAttribute ("opentelemetry-context" , context );
96- return true ;
97- }
98-
99- public void postHandle (
100- javax .servlet .http .HttpServletRequest request , javax .servlet .http .HttpServletResponse response , Object handler ,
101- ModelAndView modelAndView ) {
102- // There is no global context to be changed in post handle since it is done in preHandle on a new call.
103- }
104-
10570}
0 commit comments