Skip to content

Commit 38c2b69

Browse files
authored
Convert groovy smoke tests to java (#14795)
1 parent 35ea647 commit 38c2b69

File tree

59 files changed

+1809
-2544
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1809
-2544
lines changed

javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/GlobalIgnoredTypesConfigurer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ private static void configureIgnoredTasks(IgnoredTypesBuilder builder) {
156156
// TODO Workaround for
157157
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/787
158158
builder.ignoreTaskClass("org.apache.tomcat.util.net.NioEndpoint$SocketProcessor");
159+
builder.ignoreTaskClass("org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor");
159160

160161
// HttpConnection implements Runnable. When async request is completed HttpConnection
161162
// may be sent to process next request while context from previous request hasn't been

smoke-tests/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dependencies {
2020
compileOnly("com.google.auto.value:auto-value-annotations")
2121
annotationProcessor("com.google.auto.value:auto-value")
2222

23-
api("org.spockframework:spock-core")
2423
api(project(":testing-common"))
2524

2625
implementation(platform("io.grpc:grpc-bom:1.75.0"))

smoke-tests/src/main/java/io/opentelemetry/smoketest/GroovyTestTelemetryRetriever.java

Lines changed: 0 additions & 88 deletions
This file was deleted.

smoke-tests/src/main/java/io/opentelemetry/smoketest/MetricsInspector.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

smoke-tests/src/main/java/io/opentelemetry/smoketest/TelemetryRetriever.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.opentelemetry.testing.internal.protobuf.GeneratedMessage;
1919
import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
2020
import io.opentelemetry.testing.internal.protobuf.util.JsonFormat;
21+
import java.time.Duration;
2122
import java.util.Collection;
2223
import java.util.List;
2324
import java.util.concurrent.TimeUnit;
@@ -28,9 +29,11 @@
2829
public class TelemetryRetriever {
2930
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
3031
private final WebClient client;
32+
private final Duration telemetryTimeout;
3133

32-
public TelemetryRetriever(int backendPort) {
34+
public TelemetryRetriever(int backendPort, Duration telemetryTimeout) {
3335
client = WebClient.of("http://localhost:" + backendPort);
36+
this.telemetryTimeout = telemetryTimeout;
3437
}
3538

3639
public void clearTelemetry() {
@@ -91,7 +94,7 @@ Collection<T> waitForTelemetry(String path, Supplier<B> builderConstructor) {
9194
@SuppressWarnings("SystemOut")
9295
private String waitForContent(String path) throws InterruptedException {
9396
long previousSize = 0;
94-
long deadline = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30);
97+
long deadline = System.currentTimeMillis() + telemetryTimeout.toMillis();
9598
String content = "[]";
9699
while (System.currentTimeMillis() < deadline) {
97100
content = client.get(path).aggregate().join().contentUtf8();

smoke-tests/src/main/java/io/opentelemetry/smoketest/TestImage.java

Lines changed: 0 additions & 34 deletions
This file was deleted.

smoke-tests/src/main/java/io/opentelemetry/smoketest/TraceInspector.java

Lines changed: 0 additions & 117 deletions
This file was deleted.

0 commit comments

Comments
 (0)