diff --git a/pom.xml b/pom.xml index 091291da..ef3545c5 100644 --- a/pom.xml +++ b/pom.xml @@ -200,41 +200,29 @@ test - - - io.opentelemetry - opentelemetry-context - - - io.opentelemetry - opentelemetry-sdk - - - io.opentelemetry - opentelemetry-sdk-common - + io.opentelemetry opentelemetry-sdk-trace + test com.google.cloud.opentelemetry exporter-trace 0.32.0 + test com.google.cloud google-cloud-trace 2.52.0 + test com.google.api.grpc proto-google-cloud-trace-v1 2.52.0 + test diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java index 4b789036..9ae8f600 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITSingleJarTest.java @@ -61,7 +61,6 @@ public void setup() { @Test public void testUseSingleJar() throws Exception { - // printDeps(); buildSingleJar(); buildMainClass(); runTestApplication(); @@ -69,7 +68,6 @@ public void testUseSingleJar() throws Exception { @Test public void testUseShadedJar() throws Exception { - // printDeps(); buildShadedJar(); buildMainClass(); runTestApplication(); @@ -93,12 +91,6 @@ private void runTestApplication() throws Exception { execute(builder); } - private void printDeps() throws Exception { - ProcessBuilder builder = new ProcessBuilder(); - builder.command("mvn", "dependency:tree"); - execute(builder, true); - } - private void buildSingleJar() throws Exception { ProcessBuilder builder = new ProcessBuilder(); builder.command("mvn", "clean", "package", "-DskipTests", "-Dalt.build.dir=./target/single"); @@ -124,23 +116,11 @@ private void buildMainClass() throws Exception { } private void execute(ProcessBuilder builder) throws Exception { - execute(builder, false); - } - - private void execute(ProcessBuilder builder, boolean showOutput) throws Exception { Process process = builder.start(); - String errors, output = ""; + String errors; try (InputStreamReader reader = new InputStreamReader(process.getErrorStream())) { errors = CharStreams.toString(reader); } - if (showOutput) { - try (InputStreamReader reader = new InputStreamReader(process.getInputStream())) { - output = CharStreams.toString(reader); - } - } assertEquals(errors, 0, process.waitFor()); - if (showOutput) { - System.out.print(output); - } } }