Skip to content

Commit efd9b45

Browse files
authored
fix submodule duplication errors (#424)
1 parent f0ae509 commit efd9b45

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

otel-extensions/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@ plugins {
66
id("com.google.protobuf") version "0.9.4"
77
}
88

9+
sourceSets {
10+
main {
11+
proto {
12+
srcDir("src/main/proto")
13+
exclude("gen/go/**")
14+
}
15+
}
16+
}
17+
18+
tasks.named<Copy>("processResources") {
19+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
20+
}
21+
922

1023
val protobufVersion = "3.25.5"
1124

otel-extensions/src/test/java/org/hypertrace/agent/otel/extensions/config/HypertraceConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void zipkinExporter() throws IOException {
199199
AgentConfig agentConfig = HypertraceConfig.load(resource.getPath());
200200
// VERIFY the trace reporting endpoint is the zipkin endpoint
201201
Assertions.assertEquals(
202-
"http://example.com:9411/api/v2/spans",
202+
"http://example.com:5442/api/v2/spans",
203203
agentConfig.getReporting().getEndpoint().getValue());
204204
// VERIFY the trace reporting type is ZIPKIN
205205
Assertions.assertEquals(

smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryCollector.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
public class OpenTelemetryCollector extends GenericContainer<OpenTelemetryCollector> {
2626

2727
public static final int JAEGER_COLLECTOR_THRIFT_PORT = 14268;
28-
public static final int JAEGER_COLLECTOR_GRPC_PORT = 14250;
29-
public static final int HTTP_REVERSE_PROXY_PORT = 5442;
30-
public static final int HTTPS_REVERSE_PROXY_PORT = 5443;
31-
public static final int HEALTH_CHECK_PORT = 13133;
28+
public static final int JAEGER_COLLECTOR_GRPC_PORT = 14250;
29+
public static final int HTTP_REVERSE_PROXY_PORT = 5442;
30+
public static final int HTTPS_REVERSE_PROXY_PORT = 5443;
31+
public static final int HEALTH_CHECK_PORT = 13133;
3232

3333
public OpenTelemetryCollector(String dockerImage) {
3434
super(DockerImageName.parse(dockerImage));
@@ -42,8 +42,7 @@ protected void init() {
4242
JAEGER_COLLECTOR_THRIFT_PORT,
4343
JAEGER_COLLECTOR_GRPC_PORT,
4444
HTTP_REVERSE_PROXY_PORT,
45-
HTTPS_REVERSE_PROXY_PORT
46-
);
45+
HTTPS_REVERSE_PROXY_PORT);
4746
}
4847

4948
public static class BoundPortHttpWaitStrategy extends HttpWaitStrategy {

smoke-tests/src/test/resources/otel.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ receivers:
99
otlp:
1010
protocols:
1111
grpc:
12+
endpoint: 0.0.0.0:5442
1213
zipkin:
1314
jaeger:
1415
protocols:

0 commit comments

Comments
 (0)