diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 92ce26e8..aecc1551 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -118,6 +118,7 @@ jobs: - name: Set up cluster with Docker Compose run: docker compose up -d env: + KURRENTDB_LICENSE_KEY: ${{ secrets.KURRENTDB_TEST_LICENSE_KEY }} KURRENTDB_DOCKER_REGISTRY: ${{ needs.load_configuration.outputs.registry }} KURRENTDB_DOCKER_IMAGE: ${{ needs.load_configuration.outputs.image }} KURRENTDB_DOCKER_TAG: ${{ needs.load_configuration.outputs.tag }} diff --git a/gradle.properties b/gradle.properties index 75a70795..b8117f39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,5 +11,5 @@ openTelemetrySemConvVersion=1.25.0-alpha # Test Dependencies slf4jNopVersion=1.7.29 -testcontainersVersion=1.20.6 +testcontainersVersion=1.21.4 jacksonVersion=2.18.3 diff --git a/src/test/java/io/kurrent/dbclient/TelemetryTests.java b/src/test/java/io/kurrent/dbclient/TelemetryTests.java index 5bfc0151..4ca5db59 100644 --- a/src/test/java/io/kurrent/dbclient/TelemetryTests.java +++ b/src/test/java/io/kurrent/dbclient/TelemetryTests.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -30,20 +30,15 @@ public class TelemetryTests implements StreamsTracingInstrumentationTests, Persi static private Database database; static private Logger logger; - private final List> spanEndedHooks = new ArrayList<>(); - private final List recordedSpans = new ArrayList<>(); + private static final List> spanEndedHooks = new CopyOnWriteArrayList<>(); + private static final List recordedSpans = new CopyOnWriteArrayList<>(); @BeforeAll public static void setup() { database = DatabaseFactory.spawn(); logger = LoggerFactory.getLogger(StreamsTests.class); - } - @BeforeEach - public void beforeEach() { GlobalOpenTelemetry.resetForTest(); - spanEndedHooks.add(recordedSpans::add); - OtlpGrpcSpanExporter otlpExporter = OtlpGrpcSpanExporter.builder() .setEndpoint("http://localhost:4317") .build(); @@ -62,6 +57,13 @@ public void beforeEach() { .buildAndRegisterGlobal(); } + @BeforeEach + public void beforeEach() { + spanEndedHooks.clear(); + recordedSpans.clear(); + spanEndedHooks.add(recordedSpans::add); + } + @Override public void onOperationSpanEnded(String operation, Consumer onSpanEnded) { spanEndedHooks.add(span -> { diff --git a/vars.env b/vars.env index a3ecdad9..8e9d2ff1 100644 --- a/vars.env +++ b/vars.env @@ -6,3 +6,5 @@ EVENTSTORE_TRUSTED_ROOT_CERTIFICATES_PATH=/etc/kurrentdb/certs/ca EVENTSTORE_DISCOVER_VIA_DNS=false EVENTSTORE_ENABLE_ATOM_PUB_OVER_HTTP=true EVENTSTORE_ADVERTISE_HOST_TO_CLIENT_AS=localhost +EVENTSTORE_LICENSING__LICENSE_KEY=${KURRENTDB_LICENSE_KEY:-} +EVENTSTORE_ALLOW_UNKNOWN_OPTIONS=true