Skip to content

Commit 9943972

Browse files
committed
convert groovy smoke tests to java
1 parent eaccb17 commit 9943972

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
lines changed

smoke-tests/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ dependencies {
3737
testImplementation("com.github.docker-java:docker-java-core:$dockerJavaVersion")
3838
testImplementation("com.github.docker-java:docker-java-transport-httpclient5:$dockerJavaVersion")
3939

40-
// make IntelliJ see shaded Armeria
40+
// make IntelliJ see shaded Armeria and protobuf
4141
testCompileOnly(project(":testing:armeria-shaded-for-testing", configuration = "shadow"))
42+
testCompileOnly(project(":testing:proto-shaded-for-testing", configuration = "shadow"))
4243
}
4344

4445
tasks {

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77

88
import com.fasterxml.jackson.core.JsonProcessingException;
99
import com.fasterxml.jackson.databind.ObjectMapper;
10-
import com.google.protobuf.GeneratedMessage;
11-
import com.google.protobuf.InvalidProtocolBufferException;
10+
import io.opentelemetry.testing.internal.protobuf.GeneratedMessage;
11+
import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
1212
import com.google.protobuf.util.JsonFormat;
1313
import io.opentelemetry.javaagent.testing.common.AgentTestingExporterAccess;
14-
import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
15-
import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
16-
import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
14+
import io.opentelemetry.testing.internal.proto.collector.logs.v1.ExportLogsServiceRequest;
15+
import io.opentelemetry.testing.internal.proto.collector.metrics.v1.ExportMetricsServiceRequest;
1716
import io.opentelemetry.sdk.trace.data.SpanData;
1817
import io.opentelemetry.testing.internal.armeria.client.WebClient;
18+
import io.opentelemetry.testing.internal.proto.collector.trace.v1.ExportTraceServiceRequest;
1919
import java.util.Collection;
2020
import java.util.List;
2121
import java.util.concurrent.TimeUnit;
2222
import java.util.function.Supplier;
2323
import java.util.stream.Collectors;
24-
import java.util.stream.Stream;
2524

2625
public class JavaTelemetryRetriever {
2726
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
@@ -37,17 +36,10 @@ public void clearTelemetry() {
3736

3837
public List<SpanData> waitForTraces() {
3938
Collection<ExportTraceServiceRequest> collection =
40-
waitForTelemetry("get-traces", () -> ExportTraceServiceRequest.newBuilder());
41-
Stream<io.opentelemetry.proto.trace.v1.Span> objectStream =
42-
collection.stream()
43-
.flatMap(
44-
req ->
45-
req.getResourceSpansList().stream()
46-
.flatMap(
47-
rs ->
48-
rs.getScopeSpansList().stream()
49-
.flatMap(ss -> ss.getSpansList().stream())));
50-
39+
waitForTelemetry("get-traces", () -> {
40+
ExportTraceServiceRequest.Builder builder = ExportTraceServiceRequest.newBuilder();
41+
return builder;
42+
});
5143
return AgentTestingExporterAccess.getSpanData(
5244
collection.stream().flatMap(req -> req.getResourceSpansList().stream()));
5345
}

0 commit comments

Comments
 (0)