Skip to content

upgrade: workflows and clear env after OtelSdkConfigsTest resolve #345 #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhao-kun merged 1 commit into from
Jun 23, 2025
+17 −1
Merged

upgrade: workflows and clear env after OtelSdkConfigsTest resolve #345 #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
16 changes: 16 additions & 0 deletions config/src/test/java/com/megaease/easeagent/config/OtelSdkConfigsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> envMap = (Map<String, String>) 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
Expand Down
Loading