Skip to content

Commit 6d6a93f

Browse files
jaydelucajaydeluca
committed
cleanups
1 parent 7c88438 commit 6d6a93f

File tree

5 files changed

+110
-125
lines changed

5 files changed

+110
-125
lines changed

‎instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/BarService.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818

1919
public class BarService implements Service {
2020
private final String url;
21-
// private final CountDownLatch latch;
2221
private final InstrumentationExtension testing;
2322

2423
public BarService(String url, InstrumentationExtension testing) {
25-
// this.latch = latch;
2624
this.url = url;
2725
this.testing = testing;
2826
}
@@ -43,7 +41,6 @@ protected void generateSpan(StartEvent event) {
4341
.then(
4442
response -> {
4543
span.end();
46-
// latch.countDown();
4744
});
4845
} catch (URISyntaxException e) {
4946
throw new RuntimeException(e);

‎instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/client/InstrumentedHttpClientTest.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,17 @@
4848
class InstrumentedHttpClientTest {
4949

5050
@RegisterExtension
51-
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
51+
private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
5252

53-
protected static final RatpackClientTelemetry clientTelemetry =
53+
@RegisterExtension
54+
private static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
55+
56+
private static final RatpackClientTelemetry clientTelemetry =
5457
RatpackClientTelemetry.create(testing.getOpenTelemetry());
5558

56-
protected static final RatpackServerTelemetry serverTelemetry =
59+
private static final RatpackServerTelemetry serverTelemetry =
5760
RatpackServerTelemetry.create(testing.getOpenTelemetry());
5861

59-
@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
60-
6162
@Test
6263
void testPropagateTraceWithHttpCalls() throws Exception {
6364
EmbeddedApp otherApp =

‎instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
public class RatpackApp {
1515

16-
private RatpackApp() {}
17-
1816
public static void main(String... args) throws Exception {
1917
RatpackServer.start(
2018
server ->
@@ -33,4 +31,6 @@ public static void main(String... args) throws Exception {
3331
.get(ctx.get(URI.class))
3432
.then(response -> ctx.render("hi-bar")))));
3533
}
34+
35+
private RatpackApp() {}
3636
}

‎instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerApplicationTest.java‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
class RatpackServerApplicationTest {
3030
@RegisterExtension
31-
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
31+
private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
3232

3333
private static RatpackFunctionalTest app;
3434

@@ -38,9 +38,8 @@ static void setup() throws Exception {
3838
}
3939

4040
@Test
41-
void testAddSpanOnHandlers() throws Exception {
42-
app.test(
43-
httpClient -> assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo"));
41+
void testAddSpanOnHandlers() {
42+
assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo");
4443

4544
testing.waitAndAssertTraces(
4645
trace ->
@@ -62,9 +61,8 @@ void testAddSpanOnHandlers() throws Exception {
6261
}
6362

6463
@Test
65-
void testPropagateTraceToHttpCalls() throws Exception {
66-
app.test(
67-
httpClient -> assertThat(httpClient.get("bar").getBody().getText()).isEqualTo("hi-bar"));
64+
void testPropagateTraceToHttpCalls() {
65+
assertThat(app.getHttpClient().get("bar").getBody().getText()).isEqualTo("hi-bar");
6866

6967
testing.waitAndAssertTraces(
7068
trace ->
@@ -97,12 +95,9 @@ void testPropagateTraceToHttpCalls() throws Exception {
9795
}
9896

9997
@Test
100-
void testIgnoreHandlersBeforeOpenTelemetryServerHandler() throws Exception {
101-
app.test(
102-
httpClient -> {
103-
assertThat(httpClient.get("ignore").getBody().getText()).isEqualTo("ignored");
104-
assertThat(testing.spans().stream().filter(span -> "GET /ignore".equals(span.getName())))
105-
.isEmpty();
106-
});
98+
void testIgnoreHandlersBeforeOpenTelemetryServerHandler() {
99+
assertThat(app.getHttpClient().get("ignore").getBody().getText()).isEqualTo("ignored");
100+
assertThat(testing.spans().stream().filter(span -> "GET /ignore".equals(span.getName())))
101+
.isEmpty();
107102
}
108103
}

‎instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/server/RatpackServerTest.java‎

Lines changed: 93 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,13 @@
3232

3333
class RatpackServerTest {
3434
@RegisterExtension
35-
static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
35+
private static final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
3636

37-
static Registry registry;
38-
static RatpackServerTelemetry telemetry =
37+
private static final RatpackServerTelemetry telemetry =
3938
RatpackServerTelemetry.builder(testing.getOpenTelemetry()).build();
4039

40+
private static Registry registry;
41+
4142
@BeforeAll
4243
static void setUp() throws Exception {
4344
registry = Registry.of(telemetry::configureRegistry);
@@ -52,28 +53,25 @@ void testAddSpanOnHandlers() throws Exception {
5253
spec.handlers(chain -> chain.get("foo", ctx -> ctx.render("hi-foo")));
5354
});
5455

55-
app.test(
56-
httpClient -> {
57-
assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo");
58-
59-
testing.waitAndAssertTraces(
60-
trace ->
61-
trace.hasSpansSatisfyingExactly(
62-
span ->
63-
span.hasName("GET /foo")
64-
.hasNoParent()
65-
.hasKind(SpanKind.SERVER)
66-
.hasAttributesSatisfyingExactly(
67-
equalTo(HTTP_ROUTE, "/foo"),
68-
equalTo(URL_PATH, "/foo"),
69-
equalTo(URL_SCHEME, "http"),
70-
equalTo(SERVER_PORT, app.getServer().getBindPort()),
71-
equalTo(SERVER_ADDRESS, "localhost"),
72-
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
73-
equalTo(URL_QUERY, ""),
74-
equalTo(HTTP_REQUEST_METHOD, "GET"),
75-
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L))));
76-
});
56+
assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo");
57+
58+
testing.waitAndAssertTraces(
59+
trace ->
60+
trace.hasSpansSatisfyingExactly(
61+
span ->
62+
span.hasName("GET /foo")
63+
.hasNoParent()
64+
.hasKind(SpanKind.SERVER)
65+
.hasAttributesSatisfyingExactly(
66+
equalTo(HTTP_ROUTE, "/foo"),
67+
equalTo(URL_PATH, "/foo"),
68+
equalTo(URL_SCHEME, "http"),
69+
equalTo(SERVER_PORT, app.getServer().getBindPort()),
70+
equalTo(SERVER_ADDRESS, "localhost"),
71+
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
72+
equalTo(URL_QUERY, ""),
73+
equalTo(HTTP_REQUEST_METHOD, "GET"),
74+
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L))));
7775
}
7876

7977
@Test
@@ -100,33 +98,30 @@ void testPropagateTraceWithInstrumentedAsyncOperations() throws Exception {
10098
}));
10199
});
102100

103-
app.test(
104-
httpClient -> {
105-
assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo");
106-
107-
testing.waitAndAssertTraces(
108-
trace ->
109-
trace.hasSpansSatisfyingExactly(
110-
span ->
111-
span.hasName("GET /foo")
112-
.hasNoParent()
113-
.hasKind(SpanKind.SERVER)
114-
.hasAttributesSatisfyingExactly(
115-
equalTo(HTTP_ROUTE, "/foo"),
116-
equalTo(URL_PATH, "/foo"),
117-
equalTo(URL_SCHEME, "http"),
118-
equalTo(SERVER_PORT, app.getServer().getBindPort()),
119-
equalTo(SERVER_ADDRESS, "localhost"),
120-
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
121-
equalTo(URL_QUERY, ""),
122-
equalTo(HTTP_REQUEST_METHOD, "GET"),
123-
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
124-
span ->
125-
span.hasName("a-span")
126-
.hasParent(trace.getSpan(0))
127-
.hasAttributes(Attributes.empty())
128-
.hasTotalRecordedEvents(1)));
129-
});
101+
assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo");
102+
103+
testing.waitAndAssertTraces(
104+
trace ->
105+
trace.hasSpansSatisfyingExactly(
106+
span ->
107+
span.hasName("GET /foo")
108+
.hasNoParent()
109+
.hasKind(SpanKind.SERVER)
110+
.hasAttributesSatisfyingExactly(
111+
equalTo(HTTP_ROUTE, "/foo"),
112+
equalTo(URL_PATH, "/foo"),
113+
equalTo(URL_SCHEME, "http"),
114+
equalTo(SERVER_PORT, app.getServer().getBindPort()),
115+
equalTo(SERVER_ADDRESS, "localhost"),
116+
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
117+
equalTo(URL_QUERY, ""),
118+
equalTo(HTTP_REQUEST_METHOD, "GET"),
119+
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
120+
span ->
121+
span.hasName("a-span")
122+
.hasParent(trace.getSpan(0))
123+
.hasAttributes(Attributes.empty())
124+
.hasTotalRecordedEvents(1)));
130125
}
131126

132127
@Test
@@ -168,54 +163,51 @@ void testPropagateTraceWithInstrumentedAsyncConcurrentOperations() throws Except
168163
});
169164
});
170165

171-
app.test(
172-
httpClient -> {
173-
assertThat(httpClient.get("foo").getBody().getText()).isEqualTo("hi-foo");
174-
assertThat(httpClient.get("bar").getBody().getText()).isEqualTo("hi-bar");
175-
176-
testing.waitAndAssertTraces(
177-
trace ->
178-
trace.hasSpansSatisfyingExactly(
179-
span ->
180-
span.hasName("GET /foo")
181-
.hasNoParent()
182-
.hasKind(SpanKind.SERVER)
183-
.hasAttributesSatisfyingExactly(
184-
equalTo(HTTP_ROUTE, "/foo"),
185-
equalTo(URL_PATH, "/foo"),
186-
equalTo(URL_SCHEME, "http"),
187-
equalTo(SERVER_PORT, app.getServer().getBindPort()),
188-
equalTo(SERVER_ADDRESS, "localhost"),
189-
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
190-
equalTo(URL_QUERY, ""),
191-
equalTo(HTTP_REQUEST_METHOD, "GET"),
192-
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
193-
span ->
194-
span.hasName("a-span")
195-
.hasParent(trace.getSpan(0))
196-
.hasAttributes(Attributes.empty())
197-
.hasTotalRecordedEvents(1)),
198-
trace ->
199-
trace.hasSpansSatisfyingExactly(
200-
span ->
201-
span.hasName("GET /bar")
202-
.hasNoParent()
203-
.hasKind(SpanKind.SERVER)
204-
.hasAttributesSatisfyingExactly(
205-
equalTo(HTTP_ROUTE, "/bar"),
206-
equalTo(URL_PATH, "/bar"),
207-
equalTo(URL_SCHEME, "http"),
208-
equalTo(SERVER_PORT, app.getServer().getBindPort()),
209-
equalTo(SERVER_ADDRESS, "localhost"),
210-
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
211-
equalTo(URL_QUERY, ""),
212-
equalTo(HTTP_REQUEST_METHOD, "GET"),
213-
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
214-
span ->
215-
span.hasName("another-span")
216-
.hasParent(trace.getSpan(0))
217-
.hasAttributes(Attributes.empty())
218-
.hasTotalRecordedEvents(1)));
219-
});
166+
assertThat(app.getHttpClient().get("foo").getBody().getText()).isEqualTo("hi-foo");
167+
assertThat(app.getHttpClient().get("bar").getBody().getText()).isEqualTo("hi-bar");
168+
169+
testing.waitAndAssertTraces(
170+
trace ->
171+
trace.hasSpansSatisfyingExactly(
172+
span ->
173+
span.hasName("GET /foo")
174+
.hasNoParent()
175+
.hasKind(SpanKind.SERVER)
176+
.hasAttributesSatisfyingExactly(
177+
equalTo(HTTP_ROUTE, "/foo"),
178+
equalTo(URL_PATH, "/foo"),
179+
equalTo(URL_SCHEME, "http"),
180+
equalTo(SERVER_PORT, app.getServer().getBindPort()),
181+
equalTo(SERVER_ADDRESS, "localhost"),
182+
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
183+
equalTo(URL_QUERY, ""),
184+
equalTo(HTTP_REQUEST_METHOD, "GET"),
185+
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
186+
span ->
187+
span.hasName("a-span")
188+
.hasParent(trace.getSpan(0))
189+
.hasAttributes(Attributes.empty())
190+
.hasTotalRecordedEvents(1)),
191+
trace ->
192+
trace.hasSpansSatisfyingExactly(
193+
span ->
194+
span.hasName("GET /bar")
195+
.hasNoParent()
196+
.hasKind(SpanKind.SERVER)
197+
.hasAttributesSatisfyingExactly(
198+
equalTo(HTTP_ROUTE, "/bar"),
199+
equalTo(URL_PATH, "/bar"),
200+
equalTo(URL_SCHEME, "http"),
201+
equalTo(SERVER_PORT, app.getServer().getBindPort()),
202+
equalTo(SERVER_ADDRESS, "localhost"),
203+
equalTo(NETWORK_PROTOCOL_VERSION, "1.1"),
204+
equalTo(URL_QUERY, ""),
205+
equalTo(HTTP_REQUEST_METHOD, "GET"),
206+
equalTo(HTTP_RESPONSE_STATUS_CODE, 200L)),
207+
span ->
208+
span.hasName("another-span")
209+
.hasParent(trace.getSpan(0))
210+
.hasAttributes(Attributes.empty())
211+
.hasTotalRecordedEvents(1)));
220212
}
221213
}

0 commit comments

Comments
 (0)