diff --git a/otel-extensions/build.gradle.kts b/otel-extensions/build.gradle.kts index 970a03e7..d4cbf973 100644 --- a/otel-extensions/build.gradle.kts +++ b/otel-extensions/build.gradle.kts @@ -6,6 +6,19 @@ plugins { id("com.google.protobuf") version "0.9.4" } +sourceSets { + main { + proto { + srcDir("src/main/proto") + exclude("gen/go/**") + } + } +} + +tasks.named("processResources") { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + val protobufVersion = "3.25.5" diff --git a/otel-extensions/src/test/java/org/hypertrace/agent/otel/extensions/config/HypertraceConfigTest.java b/otel-extensions/src/test/java/org/hypertrace/agent/otel/extensions/config/HypertraceConfigTest.java index c6253245..4fac1c92 100644 --- a/otel-extensions/src/test/java/org/hypertrace/agent/otel/extensions/config/HypertraceConfigTest.java +++ b/otel-extensions/src/test/java/org/hypertrace/agent/otel/extensions/config/HypertraceConfigTest.java @@ -199,7 +199,7 @@ public void zipkinExporter() throws IOException { AgentConfig agentConfig = HypertraceConfig.load(resource.getPath()); // VERIFY the trace reporting endpoint is the zipkin endpoint Assertions.assertEquals( - "http://example.com:9411/api/v2/spans", + "http://example.com:5442/api/v2/spans", agentConfig.getReporting().getEndpoint().getValue()); // VERIFY the trace reporting type is ZIPKIN Assertions.assertEquals( diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryCollector.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryCollector.java index 64c80281..94f542ec 100644 --- a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryCollector.java +++ b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/OpenTelemetryCollector.java @@ -25,10 +25,10 @@ public class OpenTelemetryCollector extends GenericContainer { public static final int JAEGER_COLLECTOR_THRIFT_PORT = 14268; - public static final int JAEGER_COLLECTOR_GRPC_PORT = 14250; - public static final int HTTP_REVERSE_PROXY_PORT = 5442; - public static final int HTTPS_REVERSE_PROXY_PORT = 5443; - public static final int HEALTH_CHECK_PORT = 13133; + public static final int JAEGER_COLLECTOR_GRPC_PORT = 14250; + public static final int HTTP_REVERSE_PROXY_PORT = 5442; + public static final int HTTPS_REVERSE_PROXY_PORT = 5443; + public static final int HEALTH_CHECK_PORT = 13133; public OpenTelemetryCollector(String dockerImage) { super(DockerImageName.parse(dockerImage)); @@ -42,8 +42,7 @@ protected void init() { JAEGER_COLLECTOR_THRIFT_PORT, JAEGER_COLLECTOR_GRPC_PORT, HTTP_REVERSE_PROXY_PORT, - HTTPS_REVERSE_PROXY_PORT - ); + HTTPS_REVERSE_PROXY_PORT); } public static class BoundPortHttpWaitStrategy extends HttpWaitStrategy { diff --git a/smoke-tests/src/test/resources/otel.yaml b/smoke-tests/src/test/resources/otel.yaml index af97a344..db39b242 100644 --- a/smoke-tests/src/test/resources/otel.yaml +++ b/smoke-tests/src/test/resources/otel.yaml @@ -9,6 +9,7 @@ receivers: otlp: protocols: grpc: + endpoint: 0.0.0.0:5442 zipkin: jaeger: protocols: