Skip to content

Commit 3a389f5

Browse files
Minor code cleanup. (#9574)
1 parent abb87ab commit 3a389f5

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityTestUtils.groovy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ package datadog.trace.civisibility
22

33
import com.fasterxml.jackson.databind.ObjectMapper
44
import com.fasterxml.jackson.databind.SerializationFeature
5-
import com.jayway.jsonpath.*
5+
import com.jayway.jsonpath.Configuration
6+
import com.jayway.jsonpath.JsonPath
7+
import com.jayway.jsonpath.Option
8+
import com.jayway.jsonpath.ReadContext
9+
import com.jayway.jsonpath.WriteContext
610
import datadog.trace.api.DDSpanTypes
711
import datadog.trace.api.civisibility.config.LibraryCapability
812
import datadog.trace.api.civisibility.config.TestFQN

dd-java-agent/agent-profiling/profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void setup() throws IOException {
188188
}
189189

190190
@AfterEach
191-
public void tearDown() throws IOException {
191+
public void tearDown() {
192192
uploader.shutdown();
193193
try {
194194
server.shutdown();
@@ -511,7 +511,7 @@ public void testRequestWithProxyDefaultPassword() throws Exception {
511511
}
512512

513513
@Test
514-
void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() throws Exception {
514+
void testOkHttpClientForcesCleartextConnspecWhenNotUsingTLS() {
515515
when(config.getFinalProfilingUrl()).thenReturn("http://example.com");
516516

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

524524
@Test
525-
void testOkHttpClientUsesDefaultConnspecsOverTLS() throws Exception {
525+
void testOkHttpClientUsesDefaultConnspecsOverTLS() {
526526
when(config.getFinalProfilingUrl()).thenReturn("https://example.com");
527527

528528
uploader = new ProfileUploader(config, configProvider);

dd-smoke-tests/concurrent/java-25/src/test/groovy/datadog/smoketest/concurrent/AbstractStructuredConcurrencyTest.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import datadog.smoketest.AbstractSmokeTest
44
import datadog.trace.test.agent.decoder.DecodedSpan
55
import datadog.trace.test.agent.decoder.DecodedTrace
66

7+
import java.nio.file.Paths
78
import java.util.function.Function
89

910
import static java.util.concurrent.TimeUnit.SECONDS
@@ -16,7 +17,7 @@ abstract class AbstractStructuredConcurrencyTest extends AbstractSmokeTest {
1617
ProcessBuilder createProcessBuilder() {
1718
def jarPath = System.getProperty("datadog.smoketest.shadowJar.path")
1819
def command = new ArrayList<String>()
19-
command.add(System.getenv("JAVA_25_HOME") + "/bin/java")
20+
command.add(Paths.get(System.getenv("JAVA_25_HOME"), "bin", "java").toString())
2021
command.addAll(defaultJavaProperties)
2122
command.add("--enable-preview")
2223
command.add("-Ddd.trace.otel.enabled=true")

dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreamskafka/KafkaProducerWithSchemaRegistry.java renamed to dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/KafkaProducerWithSchemaRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static void produce() {
6363
log.info("produced message");
6464
}
6565
} catch (Exception e) {
66-
e.printStackTrace();
66+
log.error("KafkaProducerWithSchemaRegistry failed", e);
6767
} finally {
6868
producer.close();
6969
}

dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreamskafka/Message.java renamed to dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/Message.java

File renamed without changes.

dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreamskafka/message.proto renamed to dd-smoke-tests/datastreams/kafkaschemaregistry/src/main/java/datadog/smoketest/datastreams/kafkaschemaregistry/message.proto

File renamed without changes.

0 commit comments

Comments
 (0)