From c9619c062679de07e11a2f23f71101d29bf12aa4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 23 Aug 2021 22:46:04 -0700 Subject: [PATCH] Disable strict context check for elasticsearch 6 tests (#3917) * Disable strict context check for elasticsearch 6 tests * Mongo too --- .../elasticsearch-transport-6.0/javaagent/build.gradle.kts | 1 + instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts index 42c178104e..8e7178574f 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts @@ -43,4 +43,5 @@ dependencies { tasks.withType().configureEach { // TODO run tests both with and without experimental span attributes jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") + jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false") } diff --git a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts index a43ff00b5e..ec4048c43d 100644 --- a/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts +++ b/instrumentation/mongo/mongo-4.0/javaagent/build.gradle.kts @@ -27,4 +27,8 @@ tasks { named("test") { usesService(gradle.sharedServices.registrations["testcontainersBuildService"].getService()) } -} \ No newline at end of file +} + +tasks.withType().configureEach { + jvmArgs("-Dio.opentelemetry.javaagent.shaded.io.opentelemetry.context.enableStrictContext=false") +}