Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,11 @@

<properties>
<woody.version>2.0.12</woody.version>
<otel.instrumentation.version>2.15.0</otel.instrumentation.version>
<woody-http-bridge.version>0.0.8</woody-http-bridge.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>21</java.version>
<server.port>8022</server.port>
<wachter.endpoint>wachter</wachter.endpoint>
<management.port>8023</management.port>
<exposed.ports>${server.port} ${management.port}</exposed.ports>
</properties>
Expand All @@ -36,6 +35,11 @@
<groupId>dev.vality.geck</groupId>
<artifactId>serializer</artifactId>
</dependency>
<dependency>
<groupId>dev.vality</groupId>
<artifactId>woody-http-bridge</artifactId>
<version>${woody-http-bridge.version}</version>
</dependency>

<!--spring-->
<dependency>
Expand Down Expand Up @@ -83,11 +87,6 @@
</dependency>

<!--third party-->
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-spring-boot-starter</artifactId>
<version>${otel.instrumentation.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
Expand All @@ -112,11 +111,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.vality.wachter.client;

import dev.vality.wachter.constants.TraceHeadersConstants;
import dev.vality.woody.http.bridge.tracing.TraceHeadersConstants;
import jakarta.servlet.http.HttpServletRequest;
import lombok.experimental.UtilityClass;
import org.springframework.http.HttpHeaders;
Expand Down
10 changes: 7 additions & 3 deletions src/main/java/dev/vality/wachter/client/WachterClient.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package dev.vality.wachter.client;

import dev.vality.wachter.tracing.TraceContextHeadersExtractor;
import dev.vality.wachter.tracing.TraceContextHeadersNormalizer;
import dev.vality.woody.http.bridge.tracing.TraceContextExtractor;
import dev.vality.woody.http.bridge.tracing.TraceContextHeadersNormalizer;
import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatusCode;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestClient;
Expand All @@ -26,7 +27,7 @@ public WachterClientResponse send(HttpServletRequest servletRequest, byte[] cont
var httpMethod = resolveMethod(servletRequest);

var proxyHeaders = ProxyHeadersExtractor.extractHeaders(servletRequest);
var traceHeaders = TraceContextHeadersExtractor.extractHeaders();
var traceHeaders = TraceContextExtractor.extractHeaders();

var httpHeaders = new HttpHeaders();
proxyHeaders.forEach(httpHeaders::addAll);
Expand Down Expand Up @@ -59,4 +60,7 @@ private HttpMethod resolveMethod(HttpServletRequest servletRequest) {
return HttpMethod.POST;
}
}

public record WachterClientResponse(HttpStatusCode statusCode, HttpHeaders headers, byte[] body) {
}
}

This file was deleted.

70 changes: 0 additions & 70 deletions src/main/java/dev/vality/wachter/config/OtelConfig.java

This file was deleted.

73 changes: 0 additions & 73 deletions src/main/java/dev/vality/wachter/config/WebConfig.java

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ public static class Service {
private String url;

}

}

This file was deleted.

This file was deleted.

Loading
Loading