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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ package datadog.trace.civisibility

import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializationFeature
import com.jayway.jsonpath.*
import com.jayway.jsonpath.Configuration
import com.jayway.jsonpath.JsonPath
import com.jayway.jsonpath.Option
import com.jayway.jsonpath.ReadContext
import com.jayway.jsonpath.WriteContext
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.civisibility.config.LibraryCapability
import datadog.trace.api.civisibility.config.TestFQN
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void setup() throws IOException {
}

@AfterEach
public void tearDown() throws IOException {
public void tearDown() {
uploader.shutdown();
try {
server.shutdown();
Expand Down Expand Up @@ -511,7 +511,7 @@ public void testRequestWithProxyDefaultPassword() throws Exception {
}

@Test
void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() throws Exception {
void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
when(config.getFinalProfilingUrl()).thenReturn("http://example.com");

uploader = new ProfileUploader(config, configProvider);
Expand All @@ -522,7 +522,7 @@ void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() throws Exception {
}

@Test
void testOkHttpClientUsesDefaultConnspecsOverTLS() throws Exception {
void testOkHttpClientUsesDefaultConnspecsOverTLS() {
when(config.getFinalProfilingUrl()).thenReturn("https://example.com");

uploader = new ProfileUploader(config, configProvider);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import datadog.smoketest.AbstractSmokeTest
import datadog.trace.test.agent.decoder.DecodedSpan
import datadog.trace.test.agent.decoder.DecodedTrace

import java.nio.file.Paths
import java.util.function.Function

import static java.util.concurrent.TimeUnit.SECONDS
Expand All @@ -16,7 +17,7 @@ abstract class AbstractStructuredConcurrencyTest extends AbstractSmokeTest {
ProcessBuilder createProcessBuilder() {
def jarPath = System.getProperty("datadog.smoketest.shadowJar.path")
def command = new ArrayList<String>()
command.add(System.getenv("JAVA_25_HOME") + "/bin/java")
command.add(Paths.get(System.getenv("JAVA_25_HOME"), "bin", "java").toString())
command.addAll(defaultJavaProperties)
command.add("--enable-preview")
command.add("-Ddd.trace.otel.enabled=true")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static void produce() {
log.info("produced message");
}
} catch (Exception e) {
e.printStackTrace();
log.error("KafkaProducerWithSchemaRegistry failed", e);
} finally {
producer.close();
}
Expand Down