Skip to content

Commit e3e41d9

Browse files
committed
upgrade: workflows and clear env after OtelSdkConfigsTest resolve megaease#345
1 parent 8a5854b commit e3e41d9

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/checkout@v2
4545

4646
- name: Setup Java Version
47-
uses: actions/setup-java@v2
47+
uses: actions/setup-java@v3.14.1
4848
with:
4949
java-version: ${{ matrix.java-version }}
5050
distribution: ${{ matrix.java-distribution }}

config/src/test/java/com/megaease/easeagent/config/OtelSdkConfigsTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,30 @@
1818
package com.megaease.easeagent.config;
1919

2020
import com.megaease.easeagent.plugin.utils.SystemEnv;
21+
import org.junit.After;
2122
import org.junit.Assert;
2223
import org.junit.Test;
2324

25+
import java.lang.reflect.Field;
2426
import java.util.Map;
2527

2628

2729
public class OtelSdkConfigsTest {
2830

31+
@After
32+
public void after() throws NoSuchFieldException, IllegalAccessException {
33+
Field field = SystemEnv.class.getDeclaredField("ENVIRONMENTS");
34+
field.setAccessible(true);
35+
Object env = field.get(null);
36+
field.setAccessible(false);
37+
Map<String, String> envMap = (Map<String, String>) env;
38+
envMap.remove("OTEL_RESOURCE_ATTRIBUTES");
39+
envMap.remove("OTEL_SERVICE_NAME");
40+
envMap.remove("OTEL_SERVICE_NAMESPACE");
41+
System.clearProperty("otel.service.name");
42+
System.clearProperty("otel.service.namespace");
43+
}
44+
2945
@Test
3046
public void updateEnvCfg() {
3147
//value from system env "OTEL_RESOURCE_ATTRIBUTES

0 commit comments

Comments
 (0)