Skip to content

Commit 6999a3d

Browse files
committed
format
1 parent 5300d52 commit 6999a3d

File tree

5 files changed

+42
-36
lines changed

5 files changed

+42
-36
lines changed

smoke-tests/src/test/java/io/opentelemetry/smoketest/JavaTelemetryRetriever.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ public Collection<MetricData> waitForMetrics() {
5656

5757
public Collection<LogRecordData> waitForLogs() {
5858
Collection<ExportLogsServiceRequest> requests =
59-
waitForTelemetry("get-logs", () -> ExportLogsServiceRequest.newBuilder());
60-
return TelemetryConverter.getLogRecordData(
61-
requests.stream()
62-
.flatMap(r -> r.getResourceLogsList().stream())
63-
.collect(Collectors.toList()));
59+
waitForTelemetry("get-logs", () -> ExportLogsServiceRequest.newBuilder());
60+
return TelemetryConverter.getLogRecordData(
61+
requests.stream()
62+
.flatMap(r -> r.getResourceLogsList().stream())
63+
.collect(Collectors.toList()));
6464
}
6565

6666
@SuppressWarnings({"unchecked", "rawtypes"})
@@ -103,9 +103,6 @@ private String waitForContent(String path) throws InterruptedException {
103103
TimeUnit.MILLISECONDS.sleep(500);
104104
}
105105

106-
// todo remove debug
107-
// System.out.println(new String(content, StandardCharsets.UTF_8));
108-
109106
return content;
110107
}
111108

smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
* Copyright The OpenTelemetry Authors
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5+
56
package io.opentelemetry.smoketest;
67

78
import static org.assertj.core.api.Assertions.assertThat;
89

10+
import io.opentelemetry.sdk.logs.data.LogRecordData;
911
import java.time.Duration;
1012
import java.util.Collection;
11-
import io.opentelemetry.sdk.logs.data.LogRecordData;
1213
import org.junit.jupiter.api.condition.DisabledIf;
1314
import org.junit.jupiter.params.ParameterizedTest;
1415
import org.junit.jupiter.params.provider.ValueSource;

smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
package io.opentelemetry.smoketest;
77

8+
import static io.opentelemetry.sdk.testing.assertj.TracesAssert.assertThat;
9+
810
import io.opentelemetry.semconv.ServiceAttributes;
11+
import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
912
import java.time.Duration;
1013
import java.util.jar.Attributes;
1114
import java.util.jar.JarFile;
12-
import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
1315
import org.junit.jupiter.api.condition.DisabledIf;
1416
import org.junit.jupiter.params.ParameterizedTest;
1517
import org.junit.jupiter.params.provider.ValueSource;
1618

17-
import static io.opentelemetry.sdk.testing.assertj.TracesAssert.assertThat;
18-
1919
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
2020
class QuarkusSmokeTest extends JavaSmokeTest {
2121
@Override

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/TelemetryConverter.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.instrumentation.testing.internal;
27

38
import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey;
@@ -73,8 +78,8 @@
7378
import java.util.stream.Collectors;
7479

7580
/**
76-
* This class is internal and is hence not for public use. Its APIs are unstable and can change
77-
* at any time.
81+
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
82+
* any time.
7883
*/
7984
public class TelemetryConverter {
8085
private static final char TRACESTATE_KEY_VALUE_DELIMITER = '=';

testing-common/src/main/java/io/opentelemetry/javaagent/testing/common/AgentTestingExporterAccess.java

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,18 @@ public static List<SpanData> getExportedSpans() {
106106
public static List<MetricData> getExportedMetrics() {
107107
try {
108108
return TelemetryConverter.getMetricsData(
109-
((List<byte[]>) getMetricExportRequests.invokeExact()).stream()
110-
.map(
111-
serialized -> {
112-
try {
113-
return ExportMetricsServiceRequest.parseFrom(serialized);
114-
} catch (InvalidProtocolBufferException e) {
115-
throw new AssertionError(e);
116-
}
117-
})
118-
.flatMap(request -> request.getResourceMetricsList().stream())
119-
.collect(toList()));
109+
((List<byte[]>) getMetricExportRequests.invokeExact())
110+
.stream()
111+
.map(
112+
serialized -> {
113+
try {
114+
return ExportMetricsServiceRequest.parseFrom(serialized);
115+
} catch (InvalidProtocolBufferException e) {
116+
throw new AssertionError(e);
117+
}
118+
})
119+
.flatMap(request -> request.getResourceMetricsList().stream())
120+
.collect(toList()));
120121
} catch (Throwable t) {
121122
throw new AssertionError("Could not invoke getSpanExportRequests", t);
122123
}
@@ -125,17 +126,19 @@ public static List<MetricData> getExportedMetrics() {
125126
@SuppressWarnings("unchecked")
126127
public static List<LogRecordData> getExportedLogRecords() {
127128
try {
128-
return TelemetryConverter.getLogRecordData(((List<byte[]>) getLogExportRequests.invokeExact()).stream()
129-
.map(
130-
serialized -> {
131-
try {
132-
return ExportLogsServiceRequest.parseFrom(serialized);
133-
} catch (InvalidProtocolBufferException e) {
134-
throw new AssertionError(e);
135-
}
136-
})
137-
.flatMap(request -> request.getResourceLogsList().stream())
138-
.collect(toList()));
129+
return TelemetryConverter.getLogRecordData(
130+
((List<byte[]>) getLogExportRequests.invokeExact())
131+
.stream()
132+
.map(
133+
serialized -> {
134+
try {
135+
return ExportLogsServiceRequest.parseFrom(serialized);
136+
} catch (InvalidProtocolBufferException e) {
137+
throw new AssertionError(e);
138+
}
139+
})
140+
.flatMap(request -> request.getResourceLogsList().stream())
141+
.collect(toList()));
139142
} catch (Throwable t) {
140143
throw new AssertionError("Could not invoke getLogExportRequests", t);
141144
}

0 commit comments

Comments
 (0)