diff --git a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java index 64a18e9c9..058ed4cb1 100644 --- a/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java +++ b/smoke-tests/src/test/java/org/hypertrace/agent/smoketest/SpringBootSmokeTest.java @@ -20,7 +20,6 @@ import io.opentelemetry.semconv.resource.attributes.ResourceAttributes; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.jar.Attributes; import java.util.jar.JarFile; import okhttp3.Request; @@ -148,20 +147,4 @@ public void get() throws IOException, InterruptedException { // Assertions.assertEquals(1, responseBodyAttributes.size()); // Assertions.assertEquals("Hi!", responseBodyAttributes.get(0)); } - - @Test - public void blocking() throws IOException { - String url = String.format("http://localhost:%d/greeting", app.getMappedPort(8080)); - Request request = new Request.Builder().url(url).addHeader("mockblock", "true").get().build(); - Response response = client.newCall(request).execute(); - Collection traces = waitForTraces(); - - Assertions.assertEquals(403, response.code()); - Assertions.assertEquals( - 1, - getSpanStream(traces) - .flatMap(span -> span.getAttributesList().stream()) - .filter(attribute -> attribute.getKey().equals("hypertrace.mock.filter.result")) - .count()); - } } diff --git a/testing-common/build.gradle.kts b/testing-common/build.gradle.kts index a2d2918da..7fc4be995 100644 --- a/testing-common/build.gradle.kts +++ b/testing-common/build.gradle.kts @@ -31,5 +31,6 @@ dependencies { testFixturesImplementation("net.bytebuddy:byte-buddy:${versions["byte_buddy"]}") testFixturesImplementation("net.bytebuddy:byte-buddy-agent:${versions["byte_buddy"]}") testFixturesCompileOnly("com.google.auto.service:auto-service-annotations:1.0") + testFixturesAnnotationProcessor("com.google.auto.service:auto-service:1.0") testFixturesImplementation("org.eclipse.jetty:jetty-server:8.0.0.v20110901") } diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilter.java b/testing-common/src/testFixtures/java/org/hypertrace/agent/testing/mockfilter/MockFilter.java similarity index 96% rename from filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilter.java rename to testing-common/src/testFixtures/java/org/hypertrace/agent/testing/mockfilter/MockFilter.java index 3460493ac..90f226231 100644 --- a/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilter.java +++ b/testing-common/src/testFixtures/java/org/hypertrace/agent/testing/mockfilter/MockFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hypertrace.agent.filter.mock; +package org.hypertrace.agent.testing.mockfilter; import io.opentelemetry.api.trace.Span; import java.util.Map; diff --git a/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilterProvider.java b/testing-common/src/testFixtures/java/org/hypertrace/agent/testing/mockfilter/MockFilterProvider.java similarity index 94% rename from filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilterProvider.java rename to testing-common/src/testFixtures/java/org/hypertrace/agent/testing/mockfilter/MockFilterProvider.java index 2ce60438e..2be0bfef2 100644 --- a/filter-api/src/main/java/org/hypertrace/agent/filter/mock/MockFilterProvider.java +++ b/testing-common/src/testFixtures/java/org/hypertrace/agent/testing/mockfilter/MockFilterProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hypertrace.agent.filter.mock; +package org.hypertrace.agent.testing.mockfilter; import com.google.auto.service.AutoService; import org.hypertrace.agent.filter.api.Filter;