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
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ val asmVersion = "9.9.1"
val jmhVersion = "1.37"
val mockitoVersion = "4.11.0"
val slf4jVersion = "2.0.17"
val semConvVersion = "1.38.0"
val semConvVersion = "1.39.0"
val semConvAlphaVersion = semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")

val CORE_DEPENDENCIES = listOf(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.mockito.junit.jupiter.MockitoExtension;

@ExtendWith(MockitoExtension.class)
@SuppressWarnings("deprecation") // using deprecated semconv
class HttpClientPeerServiceAttributesExtractorTest {
@Mock HttpClientAttributesGetter<String, String> httpAttributesExtractor;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ void shouldNotSetAnyValueIfPeerNameDoesNotMatch() {
}

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void shouldSetPeerNameIfItMatches() {
// given
Map<String, String> peerServiceMapping = new HashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.Map;
import org.junit.jupiter.api.Test;

@SuppressWarnings("deprecation") // using deprecated semconv
class RpcAttributesExtractorTest {

enum TestGetter implements RpcAttributesGetter<Map<String, String>> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;

@SuppressWarnings("deprecation") // using deprecated semconv
class RpcClientMetricsTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.Test;

@SuppressWarnings("deprecation") // using deprecated semconv
class RpcServerMetricsTest {

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractDubboTest {

private final ProtocolConfig protocolConfig = new ProtocolConfig();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractDubboTraceChainTest {

@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ private static WebClient createWebClient(ServerExtension server) {
}

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void testHello() throws Exception {
// verify that spans are created and context is propagated
AggregatedHttpResponse result = createWebClient(server2).get("/").aggregate().get();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;

@SuppressWarnings("deprecation") // using deprecated semconv
class AwsSpanAssertions {
private AwsSpanAssertions() {}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

@SuppressWarnings("deprecation") // using deprecated semconv
class S3ClientTest extends AbstractS3ClientTest {
@RegisterExtension
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

@SuppressWarnings("deprecation") // using deprecated semconv
class Aws0ClientTest {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractBaseAwsClientTest {
protected abstract InstrumentationExtension testing();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractS3ClientTest extends AbstractBaseAwsClientTest {

public abstract AmazonS3ClientBuilder configureClient(AmazonS3ClientBuilder client);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
import software.amazon.awssdk.services.dynamodb.model.UpdateItemRequest;
import software.amazon.awssdk.services.dynamodb.model.WriteRequest;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractAws2ClientCoreTest {
protected static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
StaticCredentialsProvider.create(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import software.amazon.awssdk.services.dynamodb.model.PutItemRequest;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractAws2ClientRecordHttpErrorTest {
private static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
StaticCredentialsProvider.create(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageRequest;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractAws2SqsBaseTest {
protected static final StaticCredentialsProvider CREDENTIALS_PROVIDER =
StaticCredentialsProvider.create(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import software.amazon.awssdk.services.sqs.SqsClientBuilder;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractAws2SqsSuppressReceiveSpansTest extends AbstractAws2SqsBaseTest {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.ArrayList;
import java.util.List;

@SuppressWarnings("deprecation") // using deprecated semconv
class AwsSpanAssertions {

private AwsSpanAssertions() {}
Expand All @@ -52,7 +53,6 @@ static SpanDataAssert sqs(
return sqs(span, spanName, queueUrl, queueName, CLIENT);
}

@SuppressWarnings("deprecation") // using deprecated semconv
static SpanDataAssert sqs(
SpanDataAssert span, String spanName, String queueUrl, String queueName, SpanKind spanKind) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.junit.jupiter.api.extension.RegisterExtension;
import org.testcontainers.elasticsearch.ElasticsearchContainer;

@SuppressWarnings("deprecation") // using deprecated semconv
class ElasticsearchRest6Test {
@RegisterExtension
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public int sendRequest(HttpRequest request, String method, URI uri, Map<String,
protected abstract HttpResponse sendRequest(HttpRequest request) throws Exception;

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void errorTracesWhenExceptionIsNotThrown() throws Exception {
URI uri = resolveAddress("/error");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.cartesian.CartesianTest;

@SuppressWarnings("deprecation") // using deprecated semconv
public abstract class AbstractGrpcStreamingTest {

protected abstract ServerBuilder<?> configureServer(ServerBuilder<?> server);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ RemoteWebDriver getDriver() {
}

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void testGwt() {
RemoteWebDriver driver = getDriver();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

@SuppressWarnings("deprecation") // using deprecated semconv
class HttpUrlConnectionTest extends AbstractHttpClientTest<HttpURLConnection> {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
class KubernetesClientTest {

private static final String TEST_USER_AGENT = "test-user-agent";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
class KubernetesClientVer20Test {

private static final String TEST_USER_AGENT = "test-user-agent";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
class Netty40ClientSslTest {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ protected void initChannel(@NotNull SocketChannel socketChannel) throws Exceptio
}

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void successfulRequest() throws Exception {
// when
URI uri = URI.create("http://localhost:" + server.httpPort() + "/success");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
class Netty41ClientSslTest {

@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

@SuppressWarnings("deprecation") // using deprecated semconv
class Netty41ConnectionSpanTest {
@RegisterExtension
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.junit.jupiter.api.extension.RegisterExtension;
import reactor.netty.http.client.HttpClient;

@SuppressWarnings("deprecation") // using deprecated semconv
class ReactorNettyConnectionSpanTest {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ void shouldNotLeakConnections() {
}

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void shouldEndSpanOnMonoTimeout() {
HttpClient httpClient = createHttpClient();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ static void tearDown() {
}

@Test
@SuppressWarnings("deprecation") // using deprecated semconv
void testSuccessfulRequest() {
HttpClient httpClient = HttpClient.create();
String uri = "http://localhost:" + server.httpPort() + "/base";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import reactor.netty.http.client.HttpClientResponse;
import reactor.netty.tcp.SslProvider;

@SuppressWarnings("deprecation") // using deprecated semconv
class ReactorNettyClientSslTest {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.junit.jupiter.api.extension.RegisterExtension;
import reactor.netty.http.client.HttpClient;

@SuppressWarnings("deprecation") // using deprecated semconv
class ReactorNettyConnectionSpanTest {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import rmi.app.Greeter;
import rmi.app.Server;

@SuppressWarnings("deprecation") // using deprecated semconv
class RmiTest {

@RegisterExtension
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

@SuppressWarnings("deprecation") // using deprecated semconv
@SpringBootTest(
webEnvironment = SpringBootTest.WebEnvironment.NONE,
classes = AwsSqsTestApplication.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import springrmi.app.SpringRmiGreeter;
import springrmi.app.SpringRmiGreeterImpl;

@SuppressWarnings("deprecation") // using deprecated semconv
class SpringRmiTest {

@RegisterExtension
Expand Down
4 changes: 2 additions & 2 deletions licenses/licenses.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1062,6 +1062,7 @@ void spanEndsAfterHeadersReceived() throws Exception {
});
}

@SuppressWarnings("deprecation") // using deprecated semconv
protected SpanDataAssert assertClientSpan(
SpanDataAssert span,
URI uri,
Expand Down
Loading