From 6d6a93f66f84fc1dc5f044331aa0286425d4b29d Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Sat, 4 Jan 2025 07:57:25 -0500 Subject: [PATCH] cleanups --- .../ratpack/v1_7/client/BarService.java | 3 - .../client/InstrumentedHttpClientTest.java | 11 +- .../ratpack/v1_7/server/RatpackApp.java | 4 +- .../server/RatpackServerApplicationTest.java | 23 +-- .../v1_7/server/RatpackServerTest.java | 194 +++++++++--------- 5 files changed, 110 insertions(+), 125 deletions(-) diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/BarService.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/BarService.java index faab66db485b..b5b612d3f6e1 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/BarService.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/BarService.java @@ -18,11 +18,9 @@ public class BarService implements Service { private final String url; - // private final CountDownLatch latch; private final InstrumentationExtension testing; public BarService(String url, InstrumentationExtension testing) { - // this.latch = latch; this.url = url; this.testing = testing; } @@ -43,7 +41,6 @@ protected void generateSpan(StartEvent event) { .then( response -> { span.end(); - // latch.countDown(); }); } catch (URISyntaxException e) { throw new RuntimeException(e); diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java index 8e9fb7cb7dc9..6143ff2cb057 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java @@ -48,16 +48,17 @@ class InstrumentedHttpClientTest { @RegisterExtension - static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); - protected static final RatpackClientTelemetry clientTelemetry = + @RegisterExtension + private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create(); + + private static final RatpackClientTelemetry clientTelemetry = RatpackClientTelemetry.create(testing.getOpenTelemetry()); - protected static final RatpackServerTelemetry serverTelemetry = + private static final RatpackServerTelemetry serverTelemetry = RatpackServerTelemetry.create(testing.getOpenTelemetry()); - @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create(); - @Test void testPropagateTraceWithHttpCalls() throws Exception { EmbeddedApp otherApp = diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackApp.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackApp.java index 71738c82a57f..92eee76a3a94 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackApp.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackApp.java @@ -13,8 +13,6 @@ public class RatpackApp { - private RatpackApp() {} - public static void main(String... args) throws Exception { RatpackServer.start( server -> @@ -33,4 +31,6 @@ public static void main(String... args) throws Exception { .get(ctx.get(URI.class)) .then(response -> ctx.render("hi-bar"))))); } + + private RatpackApp() {} } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java index 6559b6cb60c3..0e506c578d84 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java @@ -28,7 +28,7 @@ class RatpackServerApplicationTest { @RegisterExtension - static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); private static RatpackFunctionalTest app; @@ -38,9 +38,8 @@ static void setup() throws Exception { } @Test - void testAddSpanOnHandlers() throws Exception { - app.test( - httpClient -> assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo")); + void testAddSpanOnHandlers() { + assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo"); testing.waitAndAssertTraces( trace -> @@ -62,9 +61,8 @@ void testAddSpanOnHandlers() throws Exception { } @Test - void testPropagateTraceToHttpCalls() throws Exception { - app.test( - httpClient -> assertThat(httpClient.get("bar").getBody().getText()).isEqualTo("hi-bar")); + void testPropagateTraceToHttpCalls() { + assertThat(app.getHttpClient().get("bar").getBody().getText()).isEqualTo("hi-bar"); testing.waitAndAssertTraces( trace -> @@ -97,12 +95,9 @@ void testPropagateTraceToHttpCalls() throws Exception { } @Test - void testIgnoreHandlersBeforeOpenTelemetryServerHandler() throws Exception { - app.test( - httpClient -> { - assertThat(httpClient.get("ignore").getBody().getText()).isEqualTo("ignored"); - assertThat(testing.spans().stream().filter(span -> "GET /ignore".equals(span.getName()))) - .isEmpty(); - }); + void testIgnoreHandlersBeforeOpenTelemetryServerHandler() { + assertThat(app.getHttpClient().get("ignore").getBody().getText()).isEqualTo("ignored"); + assertThat(testing.spans().stream().filter(span -> "GET /ignore".equals(span.getName()))) + .isEmpty(); } } diff --git a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java index 8beba03df677..c13eebb2ee1e 100644 --- a/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java +++ b/instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java @@ -32,12 +32,13 @@ class RatpackServerTest { @RegisterExtension - static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); + private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create(); - static Registry registry; - static RatpackServerTelemetry telemetry = + private static final RatpackServerTelemetry telemetry = RatpackServerTelemetry.builder(testing.getOpenTelemetry()).build(); + private static Registry registry; + @BeforeAll static void setUp() throws Exception { registry = Registry.of(telemetry::configureRegistry); @@ -52,28 +53,25 @@ void testAddSpanOnHandlers() throws Exception { spec.handlers(chain -> chain.get("foo", ctx -> ctx.render("hi-foo"))); }); - app.test( - httpClient -> { - assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo"); - - testing.waitAndAssertTraces( - trace -> - trace.hasSpansSatisfyingExactly( - span -> - span.hasName("GET /foo") - .hasNoParent() - .hasKind(SpanKind.SERVER) - .hasAttributesSatisfyingExactly( - equalTo(HTTP_ROUTE, "/foo"), - equalTo(URL_PATH, "/foo"), - equalTo(URL_SCHEME, "http"), - equalTo(SERVER_PORT, app.getServer().getBindPort()), - equalTo(SERVER_ADDRESS, "localhost"), - equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(URL_QUERY, ""), - equalTo(HTTP_REQUEST_METHOD, "GET"), - equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)))); - }); + assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo"); + + testing.waitAndAssertTraces( + trace -> + trace.hasSpansSatisfyingExactly( + span -> + span.hasName("GET /foo") + .hasNoParent() + .hasKind(SpanKind.SERVER) + .hasAttributesSatisfyingExactly( + equalTo(HTTP_ROUTE, "/foo"), + equalTo(URL_PATH, "/foo"), + equalTo(URL_SCHEME, "http"), + equalTo(SERVER_PORT, app.getServer().getBindPort()), + equalTo(SERVER_ADDRESS, "localhost"), + equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(URL_QUERY, ""), + equalTo(HTTP_REQUEST_METHOD, "GET"), + equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)))); } @Test @@ -100,33 +98,30 @@ void testPropagateTraceWithInstrumentedAsyncOperations() throws Exception { })); }); - app.test( - httpClient -> { - assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo"); - - testing.waitAndAssertTraces( - trace -> - trace.hasSpansSatisfyingExactly( - span -> - span.hasName("GET /foo") - .hasNoParent() - .hasKind(SpanKind.SERVER) - .hasAttributesSatisfyingExactly( - equalTo(HTTP_ROUTE, "/foo"), - equalTo(URL_PATH, "/foo"), - equalTo(URL_SCHEME, "http"), - equalTo(SERVER_PORT, app.getServer().getBindPort()), - equalTo(SERVER_ADDRESS, "localhost"), - equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(URL_QUERY, ""), - equalTo(HTTP_REQUEST_METHOD, "GET"), - equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)), - span -> - span.hasName("a-span") - .hasParent(trace.getSpan(0)) - .hasAttributes(Attributes.empty()) - .hasTotalRecordedEvents(1))); - }); + assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo"); + + testing.waitAndAssertTraces( + trace -> + trace.hasSpansSatisfyingExactly( + span -> + span.hasName("GET /foo") + .hasNoParent() + .hasKind(SpanKind.SERVER) + .hasAttributesSatisfyingExactly( + equalTo(HTTP_ROUTE, "/foo"), + equalTo(URL_PATH, "/foo"), + equalTo(URL_SCHEME, "http"), + equalTo(SERVER_PORT, app.getServer().getBindPort()), + equalTo(SERVER_ADDRESS, "localhost"), + equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(URL_QUERY, ""), + equalTo(HTTP_REQUEST_METHOD, "GET"), + equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)), + span -> + span.hasName("a-span") + .hasParent(trace.getSpan(0)) + .hasAttributes(Attributes.empty()) + .hasTotalRecordedEvents(1))); } @Test @@ -168,54 +163,51 @@ void testPropagateTraceWithInstrumentedAsyncConcurrentOperations() throws Except }); }); - app.test( - httpClient -> { - assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo"); - assertThat(httpClient.get("bar").getBody().getText()).isEqualTo("hi-bar"); - - testing.waitAndAssertTraces( - trace -> - trace.hasSpansSatisfyingExactly( - span -> - span.hasName("GET /foo") - .hasNoParent() - .hasKind(SpanKind.SERVER) - .hasAttributesSatisfyingExactly( - equalTo(HTTP_ROUTE, "/foo"), - equalTo(URL_PATH, "/foo"), - equalTo(URL_SCHEME, "http"), - equalTo(SERVER_PORT, app.getServer().getBindPort()), - equalTo(SERVER_ADDRESS, "localhost"), - equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(URL_QUERY, ""), - equalTo(HTTP_REQUEST_METHOD, "GET"), - equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)), - span -> - span.hasName("a-span") - .hasParent(trace.getSpan(0)) - .hasAttributes(Attributes.empty()) - .hasTotalRecordedEvents(1)), - trace -> - trace.hasSpansSatisfyingExactly( - span -> - span.hasName("GET /bar") - .hasNoParent() - .hasKind(SpanKind.SERVER) - .hasAttributesSatisfyingExactly( - equalTo(HTTP_ROUTE, "/bar"), - equalTo(URL_PATH, "/bar"), - equalTo(URL_SCHEME, "http"), - equalTo(SERVER_PORT, app.getServer().getBindPort()), - equalTo(SERVER_ADDRESS, "localhost"), - equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), - equalTo(URL_QUERY, ""), - equalTo(HTTP_REQUEST_METHOD, "GET"), - equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)), - span -> - span.hasName("another-span") - .hasParent(trace.getSpan(0)) - .hasAttributes(Attributes.empty()) - .hasTotalRecordedEvents(1))); - }); + assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo"); + assertThat(app.getHttpClient().get("bar").getBody().getText()).isEqualTo("hi-bar"); + + testing.waitAndAssertTraces( + trace -> + trace.hasSpansSatisfyingExactly( + span -> + span.hasName("GET /foo") + .hasNoParent() + .hasKind(SpanKind.SERVER) + .hasAttributesSatisfyingExactly( + equalTo(HTTP_ROUTE, "/foo"), + equalTo(URL_PATH, "/foo"), + equalTo(URL_SCHEME, "http"), + equalTo(SERVER_PORT, app.getServer().getBindPort()), + equalTo(SERVER_ADDRESS, "localhost"), + equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(URL_QUERY, ""), + equalTo(HTTP_REQUEST_METHOD, "GET"), + equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)), + span -> + span.hasName("a-span") + .hasParent(trace.getSpan(0)) + .hasAttributes(Attributes.empty()) + .hasTotalRecordedEvents(1)), + trace -> + trace.hasSpansSatisfyingExactly( + span -> + span.hasName("GET /bar") + .hasNoParent() + .hasKind(SpanKind.SERVER) + .hasAttributesSatisfyingExactly( + equalTo(HTTP_ROUTE, "/bar"), + equalTo(URL_PATH, "/bar"), + equalTo(URL_SCHEME, "http"), + equalTo(SERVER_PORT, app.getServer().getBindPort()), + equalTo(SERVER_ADDRESS, "localhost"), + equalTo(NETWORK_PROTOCOL_VERSION, "1.1"), + equalTo(URL_QUERY, ""), + equalTo(HTTP_REQUEST_METHOD, "GET"), + equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)), + span -> + span.hasName("another-span") + .hasParent(trace.getSpan(0)) + .hasAttributes(Attributes.empty()) + .hasTotalRecordedEvents(1))); } }