Disable default resource providers in tests. (#3288)

open-telemetry · Jun 14, 2021 · ceaa92a · ceaa92a
1 parent ac9cd8d
commit ceaa92a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -254,6 +254,9 @@ tasks.withType(Test).configureEach {
     jvmArgs "-Djavax.net.ssl.trustStore=${trustStore.absolutePath}"
     jvmArgs "-Djavax.net.ssl.trustStorePassword=testing"
   }
+
+  def resourceClassesCsv = ['Host', 'Os', 'Process', 'ProcessRuntime'].collect { "io.opentelemetry.sdk.extension.resources.${it}ResourceProvider" }.join(",")
+  jvmArgs "-Dotel.java.disabled.resource.providers=${resourceClassesCsv}"
 }
 
 tasks.withType(AbstractArchiveTask).configureEach {

diff --git a/...ovy/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModuleTest.groovy b/...ovy/io/opentelemetry/javaagent/extension/instrumentation/InstrumentationModuleTest.groovy
@@ -11,11 +11,6 @@ import spock.lang.Specification
 
 class InstrumentationModuleTest extends Specification {
 
-  def setup() {
-    assert System.getenv().findAll { it.key.startsWith("OTEL_") }.isEmpty()
-    assert System.getProperties().findAll { it.key.toString().startsWith("otel.") }.isEmpty()
-  }
-
   def "default enabled"() {
     setup:
     def target = new TestInstrumentationModule(["test"])