Skip to content

Commit 7535594

Browse files
committed
Fix tests
1 parent 6819623 commit 7535594

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ dependencies {
4545
}
4646

4747
test {
48-
environment "ENV_ALPHANUMERIC", "d2gd9W"
4948
useTestNG()
5049
finalizedBy jacocoTestReport
5150
}

src/test/java/io/opentelemetry/contrib/generator/core/TestResourceModelGenerator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.opentelemetry.contrib.generator.core.jel.JELProvider;
2323
import io.opentelemetry.contrib.generator.core.jel.methods.ResourceModelExpressions;
2424
import io.opentelemetry.contrib.generator.core.utils.CommonUtils;
25+
import io.opentelemetry.contrib.generator.telemetry.misc.Constants;
2526
import com.fasterxml.jackson.databind.ObjectMapper;
2627
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2728
import io.opentelemetry.proto.common.v1.KeyValue;
@@ -65,6 +66,7 @@ public void generateModel() {
6566
} catch (IOException ioException) {
6667
log.error("Failed to read resource definition file", ioException);
6768
}
69+
System.setProperty(Constants.ENV_ALPHANUMERIC, "d2gd9W");
6870
Map<String, ResourceDefinition> resourcesMap = resources.getResources().stream()
6971
.collect(Collectors.toMap(ResourceDefinition::getName, Function.identity()));
7072
Map<String, ResourceDefinition> resourcesMapRuntimeMods = resourcesWithRuntimeMods.getResources().stream()

src/test/java/io/opentelemetry/contrib/generator/telemetry/TestMELTAttributeExpressions.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
import io.opentelemetry.contrib.generator.core.jel.methods.ResourceModelExpressions;
2020
import io.opentelemetry.contrib.generator.telemetry.jel.JELProvider;
2121
import io.opentelemetry.contrib.generator.telemetry.jel.methods.MELTAttributeGenerators;
22+
import io.opentelemetry.contrib.generator.telemetry.misc.Constants;
2223
import jakarta.el.ELProcessor;
2324
import org.apache.commons.lang3.RandomStringUtils;
2425
import org.apache.commons.lang3.StringUtils;
2526
import org.testng.Assert;
2627
import org.testng.annotations.Test;
2728

28-
import java.lang.reflect.Field;
2929
import java.util.*;
3030
import java.util.stream.IntStream;
3131

@@ -46,10 +46,10 @@ public void testCounter() {
4646
@Test
4747
public void testAlphanumericSequenceFromEnv() {
4848
String randomString = RandomStringUtils.randomAlphanumeric(16);
49-
setEnv(randomString);
49+
System.setProperty(Constants.ENV_ALPHANUMERIC, randomString);
5050
String inputExpression = "alphanumericSequenceFromEnv(\"" + requestID + "\", \"log\", \"k8slog\", \"source.name\")";
51-
Assert.assertEquals(jelProcessor.eval(inputExpression), System.getenv("ENV_ALPHANUMERIC"));
52-
setEnv("d2gd9W");
51+
Assert.assertEquals(jelProcessor.eval(inputExpression), System.getProperty(Constants.ENV_ALPHANUMERIC));
52+
System.setProperty(Constants.ENV_ALPHANUMERIC, "d2gd9W");
5353
String inputExpression2 = "alphanumericSequenceFromEnv(\"" + requestID + "\", \"log\", \"k8slog2\", \"source.name\")";
5454
List<String> outputs2 = Arrays.asList("d2gd9W", "d2gd9X", "d2gd9Y", "d2gd9Z", "d2gda0", "d2gda1", "d2gda2", "d2gda3", "d2gda4", "d2gda5");
5555
for (int i=0; i<10; i++) {
@@ -208,17 +208,4 @@ public void testBoolean() {
208208
List<Boolean> expectedValues = Arrays.asList(false, true, false, true, false);
209209
IntStream.range(0, 5).forEach(i -> Assert.assertEquals(jelProcessor.eval(expression), expectedValues.get(i)));
210210
}
211-
212-
private static void setEnv(String value) {
213-
try {
214-
Map<String, String> env = System.getenv();
215-
Class<?> cl = env.getClass();
216-
Field field = cl.getDeclaredField("m");
217-
field.setAccessible(true);
218-
Map<String, String> writableEnv = (Map<String, String>) field.get(env);
219-
writableEnv.put("ENV_ALPHANUMERIC", value);
220-
} catch (Exception e) {
221-
throw new IllegalStateException("Failed to set environment variable", e);
222-
}
223-
}
224211
}

0 commit comments

Comments
 (0)