From 690268434f1dbeec745cc12f3f373178f3831e5b Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 17 Jul 2023 10:11:32 +0200 Subject: [PATCH 1/3] Avoid static initialization in OpenTracingCollector --- .../containers/OpenTracingCollector.java | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java index 7162c68ba905..ff5ba68da10d 100644 --- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java +++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java @@ -31,20 +31,11 @@ public class OpenTracingCollector extends BaseTestContainer { - private static final Path storageDirectory; - - static { - try { - storageDirectory = Files.createTempDirectory("tracing-collector"); - } - catch (IOException e) { - throw new UncheckedIOException(e); - } - } - private static final int COLLECTOR_PORT = 4317; private static final int HTTP_PORT = 16686; + private final Path storageDirectory; + public OpenTracingCollector() { super( @@ -68,7 +59,14 @@ public OpenTracingCollector() withCreateContainerModifier(command -> command.getHostConfig() .withMemory(2 * 1024 * 1024 * 1024L)); // 1 GB limit - mountDirectory(storageDirectory.toString(), "/badger"); + + try { + this.storageDirectory = Files.createTempDirectory("tracing-collector"); + mountDirectory(storageDirectory.toString(), "/badger"); + } + catch (IOException e) { + throw new UncheckedIOException(e); + } } @Override From 345f4e06347452e63c2aef2e8bac4e485cd2a1eb Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 17 Jul 2023 10:12:35 +0200 Subject: [PATCH 2/3] Use 1 GB memory limit for OpenTracingCollector container --- testing/trino-testing-containers/pom.xml | 5 +++++ .../io/trino/testing/containers/OpenTracingCollector.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/testing/trino-testing-containers/pom.xml b/testing/trino-testing-containers/pom.xml index e69fcebbbc68..40cb20ca165c 100644 --- a/testing/trino-testing-containers/pom.xml +++ b/testing/trino-testing-containers/pom.xml @@ -36,6 +36,11 @@ log + + io.airlift + units + + io.minio minio diff --git a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java index ff5ba68da10d..ef8921026d89 100644 --- a/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java +++ b/testing/trino-testing-containers/src/main/java/io/trino/testing/containers/OpenTracingCollector.java @@ -13,6 +13,8 @@ */ package io.trino.testing.containers; +import io.airlift.units.DataSize; + import java.io.File; import java.io.IOException; import java.io.UncheckedIOException; @@ -27,6 +29,7 @@ import java.util.stream.Stream; import static com.google.common.net.UrlEscapers.urlFragmentEscaper; +import static io.airlift.units.DataSize.Unit.GIGABYTE; public class OpenTracingCollector extends BaseTestContainer @@ -58,7 +61,7 @@ public OpenTracingCollector() "--badger.maintenance-interval=30s")); withCreateContainerModifier(command -> command.getHostConfig() - .withMemory(2 * 1024 * 1024 * 1024L)); // 1 GB limit + .withMemory(DataSize.of(1, GIGABYTE).toBytes())); try { this.storageDirectory = Files.createTempDirectory("tracing-collector"); From e4fdfeec528815bc79029a01d12cbe6356515eb4 Mon Sep 17 00:00:00 2001 From: "Mateusz \"Serafin\" Gajewski" Date: Mon, 17 Jul 2023 10:14:07 +0200 Subject: [PATCH 3/3] Rename environment variable TRACING to TEST_TRACING_ENABLED --- .../src/main/java/io/trino/testing/DistributedQueryRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java b/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java index 6e9a7affb07d..94a16513f4e7 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/DistributedQueryRunner.java @@ -800,7 +800,7 @@ protected SELF self() public DistributedQueryRunner build() throws Exception { - String tracingEnabled = firstNonNull(getenv("TRACING"), "false"); + String tracingEnabled = firstNonNull(getenv("TESTS_TRACING_ENABLED"), "false"); if (parseBoolean(tracingEnabled) || tracingEnabled.equals("1")) { withTracing(); }