Skip to content

Commit 108a46b

Browse files
Wire pretty_print to declarative config and fix Windows test
Add pretty_print field to ComponentProvider classes so it can be set via declarative YAML configuration. Fix line separator handling in StreamJsonWriterTest for Windows.
1 parent 6cb4b72 commit 108a46b

File tree

5 files changed

+20
-1
lines changed

5 files changed

+20
-1
lines changed

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterComponentProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ public String getName() {
3232
public LogRecordExporter create(DeclarativeConfigProperties config) {
3333
OtlpStdoutLogRecordExporterBuilder builder = OtlpStdoutLogRecordExporter.builder();
3434
IncubatingExporterBuilderUtil.configureExporterMemoryMode(config, builder::setMemoryMode);
35+
Boolean prettyPrint = config.getBoolean("pretty_print");
36+
if (prettyPrint != null) {
37+
builder.setPrettyPrint(prettyPrint);
38+
}
3539
return builder.build();
3640
}
3741
}

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/metrics/OtlpStdoutMetricExporterComponentProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ public MetricExporter create(DeclarativeConfigProperties config) {
3636
config, builder::setAggregationTemporalitySelector);
3737
IncubatingExporterBuilderUtil.configureOtlpHistogramDefaultAggregation(
3838
config, builder::setDefaultAggregationSelector);
39+
Boolean prettyPrint = config.getBoolean("pretty_print");
40+
if (prettyPrint != null) {
41+
builder.setPrettyPrint(prettyPrint);
42+
}
3943
return builder.build();
4044
}
4145
}

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/traces/OtlpStdoutSpanExporterComponentProvider.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ public String getName() {
3232
public SpanExporter create(DeclarativeConfigProperties config) {
3333
OtlpStdoutSpanExporterBuilder builder = OtlpStdoutSpanExporter.builder();
3434
IncubatingExporterBuilderUtil.configureExporterMemoryMode(config, builder::setMemoryMode);
35+
Boolean prettyPrint = config.getBoolean("pretty_print");
36+
if (prettyPrint != null) {
37+
builder.setPrettyPrint(prettyPrint);
38+
}
3539
return builder.build();
3640
}
3741
}

exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/AbstractOtlpStdoutExporterTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,13 @@ void componentProviderConfig() {
367367
assertThat(exporterFromComponentProvider(properties))
368368
.extracting("memoryMode")
369369
.isEqualTo(MemoryMode.REUSABLE_DATA);
370+
371+
DeclarativeConfigProperties prettyPrintProperties = spy(DeclarativeConfigProperties.empty());
372+
when(prettyPrintProperties.getBoolean("pretty_print")).thenReturn(true);
373+
assertThat(exporterFromComponentProvider(prettyPrintProperties))
374+
.extracting("jsonWriter")
375+
.extracting("prettyPrint")
376+
.isEqualTo(true);
370377
}
371378

372379
@SuppressWarnings("unchecked")

exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/internal/writer/StreamJsonWriterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void write_prettyPrintEnabled() throws IOException {
4444

4545
assertThat(
4646
new String(baos.toByteArray(), StandardCharsets.UTF_8)
47-
.replace("\n", System.lineSeparator()))
47+
.replace("\r\n", "\n"))
4848
.isEqualTo("{\n \"key\" : \"value\"\n}\n");
4949
}
5050

0 commit comments

Comments
 (0)