From 033c20a3d930838defbe4958173eac225bc0a1f5 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Sat, 2 Oct 2021 20:52:03 +0300 Subject: [PATCH] Fix flaky StatementSanitizationConfigTest (#4264) --- instrumentation-api/build.gradle.kts | 18 ++++++++++++++++++ .../db/StatementSanitizationConfigTest.java | 6 ------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/instrumentation-api/build.gradle.kts b/instrumentation-api/build.gradle.kts index 80cee2683d..13800d2943 100644 --- a/instrumentation-api/build.gradle.kts +++ b/instrumentation-api/build.gradle.kts @@ -47,4 +47,22 @@ tasks { sourcesJar { dependsOn("generateJflex") } + + val testStatementSanitizerConfig by registering(Test::class) { + filter { + includeTestsMatching("StatementSanitizationConfigTest") + isFailOnNoMatchingTests = false + } + include("**/StatementSanitizationConfigTest.*") + jvmArgs("-Dotel.instrumentation.common.db-statement-sanitizer.enabled=false") + } + + named("test") { + dependsOn(testStatementSanitizerConfig) + + filter { + excludeTestsMatching("StatementSanitizationConfigTest") + isFailOnNoMatchingTests = false + } + } } diff --git a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/db/StatementSanitizationConfigTest.java b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/db/StatementSanitizationConfigTest.java index be823455c7..30a6e20490 100644 --- a/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/db/StatementSanitizationConfigTest.java +++ b/instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/db/StatementSanitizationConfigTest.java @@ -7,18 +7,12 @@ package io.opentelemetry.instrumentation.api.db; import static org.junit.jupiter.api.Assertions.assertFalse; -import io.opentelemetry.instrumentation.api.config.Config; import org.junit.jupiter.api.Test; public class StatementSanitizationConfigTest { @Test void shouldGetFalse() { - Config config = - Config.newBuilder() - .addProperty("otel.instrumentation.common.db-statement-sanitizer.enabled", "false") - .build(); - Config.internalInitializeConfig(config); assertFalse(StatementSanitizationConfig.isStatementSanitizationEnabled()); } }