Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ private static void configureIgnoredTasks(IgnoredTypesBuilder builder) {
// TODO Workaround for
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/787
builder.ignoreTaskClass("org.apache.tomcat.util.net.NioEndpoint$SocketProcessor");
builder.ignoreTaskClass("org.apache.tomcat.util.net.JIoEndpoint$SocketProcessor");

// HttpConnection implements Runnable. When async request is completed HttpConnection
// may be sent to process next request while context from previous request hasn't been
Expand Down
1 change: 0 additions & 1 deletion smoke-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ dependencies {
compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value")

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

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

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.opentelemetry.testing.internal.protobuf.GeneratedMessage;
import io.opentelemetry.testing.internal.protobuf.InvalidProtocolBufferException;
import io.opentelemetry.testing.internal.protobuf.util.JsonFormat;
import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
Expand All @@ -28,9 +29,11 @@
public class TelemetryRetriever {
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
private final WebClient client;
private final Duration telemetryTimeout;

public TelemetryRetriever(int backendPort) {
public TelemetryRetriever(int backendPort, Duration telemetryTimeout) {
client = WebClient.of("http://localhost:" + backendPort);
this.telemetryTimeout = telemetryTimeout;
}

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

This file was deleted.

This file was deleted.

Loading