diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 311b133e2..c37d89c2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: uses: actions/checkout@v2 - name: Setup Java Version - uses: actions/setup-java@v2 + uses: actions/setup-java@v3.14.1 with: java-version: ${{ matrix.java-version }} distribution: ${{ matrix.java-distribution }} diff --git a/config/src/test/java/com/megaease/easeagent/config/OtelSdkConfigsTest.java b/config/src/test/java/com/megaease/easeagent/config/OtelSdkConfigsTest.java index 3a6f82016..8d7e3e88c 100644 --- a/config/src/test/java/com/megaease/easeagent/config/OtelSdkConfigsTest.java +++ b/config/src/test/java/com/megaease/easeagent/config/OtelSdkConfigsTest.java @@ -18,14 +18,30 @@ package com.megaease.easeagent.config; import com.megaease.easeagent.plugin.utils.SystemEnv; +import org.junit.After; import org.junit.Assert; import org.junit.Test; +import java.lang.reflect.Field; import java.util.Map; public class OtelSdkConfigsTest { + @After + public void after() throws NoSuchFieldException, IllegalAccessException { + Field field = SystemEnv.class.getDeclaredField("ENVIRONMENTS"); + field.setAccessible(true); + Object env = field.get(null); + field.setAccessible(false); + Map envMap = (Map) env; + envMap.remove("OTEL_RESOURCE_ATTRIBUTES"); + envMap.remove("OTEL_SERVICE_NAME"); + envMap.remove("OTEL_SERVICE_NAMESPACE"); + System.clearProperty("otel.service.name"); + System.clearProperty("otel.service.namespace"); + } + @Test public void updateEnvCfg() { //value from system env "OTEL_RESOURCE_ATTRIBUTES