-
Notifications
You must be signed in to change notification settings - Fork 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix NullPointerException when uri is null (#7387)
- Loading branch information
Showing
3 changed files
with
136 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
123 changes: 123 additions & 0 deletions
123
...pentelemetry/javaagent/instrumentation/reactornetty/v1_0/ReactorNettyBaseUrlOnlyTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,123 @@ | ||
/* | ||
* Copyright The OpenTelemetry Authors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
package io.opentelemetry.javaagent.instrumentation.reactornetty.v1_0; | ||
|
||
import static io.opentelemetry.api.trace.SpanKind.CLIENT; | ||
import static io.opentelemetry.api.trace.SpanKind.INTERNAL; | ||
import static io.opentelemetry.api.trace.SpanKind.SERVER; | ||
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; | ||
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; | ||
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HttpFlavorValues.HTTP_1_1; | ||
import static org.assertj.core.api.Assertions.assertThat; | ||
|
||
import io.opentelemetry.api.GlobalOpenTelemetry; | ||
import io.opentelemetry.api.trace.SpanBuilder; | ||
import io.opentelemetry.context.Context; | ||
import io.opentelemetry.instrumentation.test.server.http.RequestContextGetter; | ||
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension; | ||
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension; | ||
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes; | ||
import io.opentelemetry.testing.internal.armeria.common.HttpData; | ||
import io.opentelemetry.testing.internal.armeria.common.HttpResponse; | ||
import io.opentelemetry.testing.internal.armeria.common.HttpStatus; | ||
import io.opentelemetry.testing.internal.armeria.common.ResponseHeaders; | ||
import io.opentelemetry.testing.internal.armeria.common.ResponseHeadersBuilder; | ||
import io.opentelemetry.testing.internal.armeria.server.ServerBuilder; | ||
import io.opentelemetry.testing.internal.armeria.testing.junit5.server.ServerExtension; | ||
import org.assertj.core.api.AbstractLongAssert; | ||
import org.junit.jupiter.api.AfterAll; | ||
import org.junit.jupiter.api.BeforeAll; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
import reactor.netty.http.client.HttpClient; | ||
|
||
class ReactorNettyBaseUrlOnlyTest { | ||
|
||
@RegisterExtension | ||
static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); | ||
|
||
static ServerExtension server; | ||
|
||
@BeforeAll | ||
static void setUp() { | ||
server = | ||
new ServerExtension() { | ||
@Override | ||
protected void configure(ServerBuilder sb) { | ||
sb.service( | ||
"/base/", | ||
(ctx, req) -> { | ||
ResponseHeadersBuilder headers = ResponseHeaders.builder(HttpStatus.OK); | ||
|
||
SpanBuilder span = | ||
GlobalOpenTelemetry.getTracer("test") | ||
.spanBuilder("test-http-server") | ||
.setSpanKind(SERVER) | ||
.setParent( | ||
GlobalOpenTelemetry.getPropagators() | ||
.getTextMapPropagator() | ||
.extract(Context.current(), ctx, RequestContextGetter.INSTANCE)); | ||
|
||
span.startSpan().end(); | ||
|
||
return HttpResponse.of(headers.build(), HttpData.ofAscii("Hello.")); | ||
}); | ||
} | ||
}; | ||
server.start(); | ||
} | ||
|
||
@AfterAll | ||
static void tearDown() { | ||
server.stop(); | ||
} | ||
|
||
@Test | ||
void testSuccessfulRequest() { | ||
HttpClient httpClient = HttpClient.create(); | ||
String uri = "http://localhost:" + server.httpPort() + "/base"; | ||
|
||
int responseCode = | ||
testing.runWithSpan( | ||
"parent", | ||
() -> | ||
httpClient | ||
.baseUrl(uri) | ||
.get() | ||
.responseSingle( | ||
(resp, content) -> { | ||
// Make sure to consume content since that's when we close the span. | ||
return content.map(unused -> resp); | ||
}) | ||
.block() | ||
.status() | ||
.code()); | ||
|
||
assertThat(responseCode).isEqualTo(200); | ||
|
||
testing.waitAndAssertTraces( | ||
trace -> | ||
trace.hasSpansSatisfyingExactlyInAnyOrder( | ||
span -> span.hasName("parent").hasKind(INTERNAL).hasNoParent(), | ||
span -> | ||
span.hasName("HTTP GET") | ||
.hasKind(CLIENT) | ||
.hasParent(trace.getSpan(0)) | ||
.hasAttributesSatisfyingExactly( | ||
equalTo(SemanticAttributes.HTTP_METHOD, "GET"), | ||
equalTo(SemanticAttributes.HTTP_URL, uri + "/"), | ||
equalTo(SemanticAttributes.HTTP_FLAVOR, HTTP_1_1), | ||
equalTo(SemanticAttributes.HTTP_STATUS_CODE, 200), | ||
satisfies( | ||
SemanticAttributes.HTTP_RESPONSE_CONTENT_LENGTH, | ||
AbstractLongAssert::isNotNegative), | ||
equalTo(SemanticAttributes.NET_PEER_NAME, "localhost"), | ||
equalTo(SemanticAttributes.NET_PEER_PORT, server.httpPort()), | ||
equalTo(SemanticAttributes.NET_SOCK_PEER_ADDR, "127.0.0.1")), | ||
span -> | ||
span.hasName("test-http-server").hasKind(SERVER).hasParent(trace.getSpan(1)))); | ||
} | ||
} |