Skip to content

Commit e3e1ba9

Browse files
authored
Default to zipkin exporter (#305)
* defaulting to zipkin exporter * spotless apply * making smoke tests use OTLP exporter
1 parent 73e69db commit e3e1ba9

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

javaagent-core/src/main/java/org/hypertrace/agent/core/config/HypertraceConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private HypertraceConfig() {}
5656
private static volatile AgentConfig agentConfig;
5757

5858
static final String DEFAULT_SERVICE_NAME = "unknown";
59-
static final String DEFAULT_REPORTING_ENDPOINT = "http://localhost:4317";
59+
static final String DEFAULT_REPORTING_ENDPOINT = "http://localhost:9411/api/v2/spans";
6060
static final String DEFAULT_OPA_ENDPOINT = "http://opa.traceableai:8181/";
6161
static final int DEFAULT_OPA_POLL_PERIOD_SECONDS = 30;
6262
// 128 KiB
@@ -189,7 +189,7 @@ private static Reporting.Builder applyReportingDefaults(Reporting.Builder builde
189189
builder.setEndpoint(StringValue.newBuilder().setValue(DEFAULT_REPORTING_ENDPOINT).build());
190190
}
191191
if (builder.getTraceReporterType().equals(Config.TraceReporterType.UNSPECIFIED)) {
192-
builder.setTraceReporterType(Config.TraceReporterType.OTLP);
192+
builder.setTraceReporterType(Config.TraceReporterType.ZIPKIN);
193193
}
194194
Builder opaBuilder = applyOpaDefaults(builder.getOpa().toBuilder());
195195
builder.setOpa(opaBuilder);

javaagent-core/src/test/java/org/hypertrace/agent/core/config/HypertraceConfigTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void defaultValues() throws IOException {
4040
Assertions.assertTrue(agentConfig.getEnabled().getValue());
4141
Assertions.assertEquals("unknown", agentConfig.getServiceName().getValue());
4242
Assertions.assertEquals(
43-
TraceReporterType.OTLP, agentConfig.getReporting().getTraceReporterType());
43+
TraceReporterType.ZIPKIN, agentConfig.getReporting().getTraceReporterType());
4444
Assertions.assertEquals(
4545
HypertraceConfig.DEFAULT_REPORTING_ENDPOINT,
4646
agentConfig.getReporting().getEndpoint().getValue());
@@ -104,7 +104,7 @@ private void assertConfig(AgentConfig agentConfig) {
104104
Assertions.assertEquals(
105105
Arrays.asList(PropagationFormat.B3), agentConfig.getPropagationFormatsList());
106106
Assertions.assertEquals(
107-
TraceReporterType.ZIPKIN, agentConfig.getReporting().getTraceReporterType());
107+
TraceReporterType.OTLP, agentConfig.getReporting().getTraceReporterType());
108108
Assertions.assertEquals(
109109
"http://localhost:9411", agentConfig.getReporting().getEndpoint().getValue());
110110
Assertions.assertEquals(true, agentConfig.getReporting().getSecure().getValue());

javaagent-core/src/test/resources/config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ propagationFormats:
66
reporting:
77
endpoint: http://localhost:9411
88
secure: true
9-
trace_reporter_type: ZIPKIN
9+
trace_reporter_type: OTLP
1010
opa:
1111
endpoint: http://opa.localhost:8181/
1212
pollPeriodSeconds: 12

smoke-tests/src/test/resources/ht-config-all-disabled.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
service_name: app_under_test
22
reporting:
33
endpoint: http://localhost:4317
4+
trace_reporter_type: OTLP
45
secure: true
56
data_capture:
67
http_headers:
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
serviceName: app_under_test
22
reporting:
33
endpoint: http://localhost:4317
4+
trace_reporter_type: OTLP

0 commit comments

Comments
 (0)