dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix license due to test dependency (#1143)

This commit is contained in:
Artur Souza 2024-10-11 20:14:53 -07:00 committed by GitHub
parent cb552ba668
commit 8a0913d4a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdk-tests/pom.xml
View File

@ -246,13 +246,6 @@
<artifactId>jakarta.servlet-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<!-- javax.servlet is needed for OpenTelemetry -->
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
<build>

35
sdk-tests/src/test/java/io/dapr/it/tracing/http/OpenTelemetryInterceptor.java
View File

@ -67,39 +67,4 @@ public class OpenTelemetryInterceptor implements HandlerInterceptor {
// There is no global context to be changed in post handle since it is done in preHandle on a new call.
}
// Implementation for springboot 3.0, which uses jakarta.servlet instead of javax.servlet
private static final TextMapGetter<javax.servlet.http.HttpServletRequest> JAVA_HTTP_SERVLET_REQUEST_GETTER =
new TextMapGetter<>() {
@Override
public Iterable<String> keys(javax.servlet.http.HttpServletRequest carrier) {
return Collections.list(carrier.getHeaderNames());
}
@Override
public String get(javax.servlet.http.HttpServletRequest carrier, String key) {
return carrier.getHeader(key);
}
};
public boolean preHandle(
javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, Object handler) {
final TextMapPropagator textFormat = openTelemetry.getPropagators().getTextMapPropagator();
// preHandle is called twice for asynchronous request. For more information, read:
// https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/servlet/AsyncHandlerInterceptor.html
if (request.getDispatcherType() == javax.servlet.DispatcherType.ASYNC) {
return true;
}
Context context = textFormat.extract(Context.current(), request, JAVA_HTTP_SERVLET_REQUEST_GETTER);
request.setAttribute("opentelemetry-context", context);
return true;
}
public void postHandle(
javax.servlet.http.HttpServletRequest request, javax.servlet.http.HttpServletResponse response, Object handler,
ModelAndView modelAndView) {
// There is no global context to be changed in post handle since it is done in preHandle on a new call.
}
}