Skip to content

Commit 5a80c0c

Browse files
jeromevdljeromevdl
committed
fix unit tests (env var)
1 parent f64d894 commit 5a80c0c

File tree

5 files changed

+51
-66
lines changed

5 files changed

+51
-66
lines changed

‎powertools-logging/powertools-logging-log4j/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,18 @@
155155
<groupId>org.apache.maven.plugins</groupId>
156156
<artifactId>maven-checkstyle-plugin</artifactId>
157157
</plugin>
158+
<plugin>
159+
<groupId>org.apache.maven.plugins</groupId>
160+
<artifactId>maven-surefire-plugin</artifactId>
161+
<version>3.1.2</version>
162+
<configuration>
163+
<environmentVariables>
164+
<POWERTOOLS_SERVICE_NAME>testLog4j</POWERTOOLS_SERVICE_NAME>
165+
<AWS_REGION>eu-central-1</AWS_REGION>
166+
<_X_AMZN_TRACE_ID>Root=1-63441c4a-abcdef012345678912345678</_X_AMZN_TRACE_ID>
167+
</environmentVariables>
168+
</configuration>
169+
</plugin>
158170
</plugins>
159171
</build>
160172

‎powertools-logging/powertools-logging-log4j/src/test/java/org/apache/logging/log4j/layout/template/json/resolver/PowerToolsResolverFactoryTest.java

Lines changed: 12 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField;
1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static org.assertj.core.api.Assertions.contentOf;
20-
import static org.mockito.Mockito.mockStatic;
2120
import static org.mockito.Mockito.when;
2221
import static org.mockito.MockitoAnnotations.openMocks;
23-
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
2422

2523
import com.amazonaws.services.lambda.runtime.Context;
2624
import java.io.File;
@@ -34,10 +32,8 @@
3432
import org.junit.jupiter.api.Order;
3533
import org.junit.jupiter.api.Test;
3634
import org.mockito.Mock;
37-
import org.mockito.MockedStatic;
3835
import org.slf4j.MDC;
3936
import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
40-
import software.amazon.lambda.powertools.common.internal.SystemWrapper;
4137
import software.amazon.lambda.powertools.logging.internal.LambdaLoggingAspect;
4238
import software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled;
4339

@@ -71,41 +67,25 @@ void cleanUp() throws IOException{
7167

7268
@Test
7369
void shouldLogInJsonFormat() throws IllegalAccessException {
74-
try (MockedStatic<SystemWrapper> mocked = mockStatic(SystemWrapper.class)) {
75-
mocked.when(() -> getenv("_X_AMZN_TRACE_ID"))
76-
.thenReturn("Root=1-63441c4a-abcdef012345678912345678");
77-
mocked.when(() -> getenv("POWERTOOLS_SERVICE_NAME"))
78-
.thenReturn("testLog4j");
70+
writeStaticField(LambdaLoggingAspect.class, "SAMPLING_RATE", "0.000000001", true);
7971

80-
writeStaticField(LambdaLoggingAspect.class, "SAMPLING_RATE", "0.000000001", true);
72+
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
73+
handler.handleRequest("Input", context);
8174

82-
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
83-
handler.handleRequest("Input", context);
84-
85-
File logFile = new File("target/logfile.json");
86-
assertThat(contentOf(logFile)).contains(
87-
"{\"level\":\"DEBUG\",\"message\":\"Test debug event\",\"cold_start\":true,\"function_arn\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"function_memory_size\":1024,\"function_name\":\"testFunction\",\"function_request_id\":\"RequestId\",\"function_version\":\"1\",\"sampling_rate\":1.0E-9,\"service\":\"testLog4j\",\"timestamp\":")
88-
.contains("\"xray_trace_id\":\"1-63441c4a-abcdef012345678912345678\",\"myKey\":\"myValue\"}\n");
89-
}
75+
File logFile = new File("target/logfile.json");
76+
assertThat(contentOf(logFile)).contains(
77+
"{\"level\":\"DEBUG\",\"message\":\"Test debug event\",\"cold_start\":true,\"function_arn\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"function_memory_size\":1024,\"function_name\":\"testFunction\",\"function_request_id\":\"RequestId\",\"function_version\":\"1\",\"sampling_rate\":1.0E-9,\"service\":\"testLog4j\",\"timestamp\":")
78+
.contains("\"xray_trace_id\":\"1-63441c4a-abcdef012345678912345678\",\"myKey\":\"myValue\"}\n");
9079
}
9180

9281
@Test
9382
void shouldLogInEcsFormat() {
94-
try (MockedStatic<SystemWrapper> mocked = mockStatic(SystemWrapper.class)) {
95-
mocked.when(() -> getenv("_X_AMZN_TRACE_ID"))
96-
.thenReturn("Root=1-63441c4a-abcdef012345678912345678");
97-
mocked.when(() -> getenv("AWS_REGION"))
98-
.thenReturn("eu-central-1");
99-
mocked.when(() -> getenv("POWERTOOLS_SERVICE_NAME"))
100-
.thenReturn("testLog4j");
83+
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
84+
handler.handleRequest("Input", context);
10185

102-
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
103-
handler.handleRequest("Input", context);
104-
105-
File logFile = new File("target/ecslogfile.json");
106-
assertThat(contentOf(logFile)).contains(
107-
"\"ecs.version\":\"1.2.0\",\"log.level\":\"DEBUG\",\"message\":\"Test debug event\",\"service.name\":\"testLog4j\",\"service.version\":\"1\",\"log.logger\":\"software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled\",\"process.thread.name\":\"main\",\"cloud.provider\":\"aws\",\"cloud.service.name\":\"lambda\",\"cloud.region\":\"eu-central-1\",\"cloud.account.id\":\"012345678910\",\"faas.id\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"faas.name\":\"testFunction\",\"faas.version\":\"1\",\"faas.memory\":1024,\"faas.execution\":\"RequestId\",\"faas.coldstart\":true,\"trace.id\":\"1-63441c4a-abcdef012345678912345678\",\"myKey\":\"myValue\"}\n");
108-
}
86+
File logFile = new File("target/ecslogfile.json");
87+
assertThat(contentOf(logFile)).contains(
88+
"\"ecs.version\":\"1.2.0\",\"log.level\":\"DEBUG\",\"message\":\"Test debug event\",\"service.name\":\"testLog4j\",\"service.version\":\"1\",\"log.logger\":\"software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled\",\"process.thread.name\":\"main\",\"cloud.provider\":\"aws\",\"cloud.service.name\":\"lambda\",\"cloud.region\":\"eu-central-1\",\"cloud.account.id\":\"012345678910\",\"faas.id\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"faas.name\":\"testFunction\",\"faas.version\":\"1\",\"faas.memory\":1024,\"faas.execution\":\"RequestId\",\"faas.coldstart\":true,\"trace.id\":\"1-63441c4a-abcdef012345678912345678\",\"myKey\":\"myValue\"}\n");
10989
}
11090

11191
private void setupContext() {

‎powertools-logging/powertools-logging-logback/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,18 @@
151151
<groupId>org.apache.maven.plugins</groupId>
152152
<artifactId>maven-checkstyle-plugin</artifactId>
153153
</plugin>
154+
<plugin>
155+
<groupId>org.apache.maven.plugins</groupId>
156+
<artifactId>maven-surefire-plugin</artifactId>
157+
<version>3.1.2</version>
158+
<configuration>
159+
<environmentVariables>
160+
<POWERTOOLS_SERVICE_NAME>testLogback</POWERTOOLS_SERVICE_NAME>
161+
<AWS_REGION>eu-central-1</AWS_REGION>
162+
<_X_AMZN_TRACE_ID>Root=1-63441c4a-abcdef012345678912345678</_X_AMZN_TRACE_ID>
163+
</environmentVariables>
164+
</configuration>
165+
</plugin>
154166
</plugins>
155167
</build>
156168

‎powertools-logging/powertools-logging-logback/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaEcsEncoderTest.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField;
1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static org.assertj.core.api.Assertions.contentOf;
20-
import static org.mockito.Mockito.mockStatic;
2120
import static org.mockito.Mockito.when;
2221
import static org.mockito.MockitoAnnotations.openMocks;
23-
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
2422

2523
import ch.qos.logback.classic.Level;
2624
import ch.qos.logback.classic.Logger;
@@ -39,11 +37,9 @@
3937
import org.junit.jupiter.api.Order;
4038
import org.junit.jupiter.api.Test;
4139
import org.mockito.Mock;
42-
import org.mockito.MockedStatic;
4340
import org.slf4j.LoggerFactory;
4441
import org.slf4j.MDC;
4542
import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
46-
import software.amazon.lambda.powertools.common.internal.SystemWrapper;
4743
import software.amazon.lambda.powertools.logging.LambdaEcsEncoder;
4844
import software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled;
4945

@@ -72,24 +68,17 @@ void setUp() throws IllegalAccessException, IOException {
7268

7369
@AfterEach
7470
void cleanUp() throws IOException{
75-
// FileChannel.open(Paths.get("target/ecslogfile.json"), StandardOpenOption.WRITE).truncate(0).close();
71+
FileChannel.open(Paths.get("target/ecslogfile.json"), StandardOpenOption.WRITE).truncate(0).close();
7672
}
7773

7874
@Test
7975
void shouldLogInEcsFormat() {
80-
try (MockedStatic<SystemWrapper> mocked = mockStatic(SystemWrapper.class)) {
81-
mocked.when(() -> getenv("_X_AMZN_TRACE_ID"))
82-
.thenReturn("Root=1-63441c4a-abcdef012345678912345678");
83-
mocked.when(() -> getenv("AWS_REGION"))
84-
.thenReturn("eu-central-1");
85-
86-
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
87-
handler.handleRequest("Input", context);
88-
89-
File logFile = new File("target/ecslogfile.json");
90-
assertThat(contentOf(logFile)).contains(
91-
"\"ecs.version\":\"1.2.0\",\"log.level\":\"DEBUG\",\"message\":\"Test debug event\",\"service.name\":\"testLogback\",\"service.version\":\"1\",\"log.logger\":\"software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled\",\"process.thread.name\":\"main\",\"cloud.provider\":\"aws\",\"cloud.service.name\":\"lambda\",\"cloud.region\":\"eu-west-1\",\"cloud.account.id\":\"012345678910\",\"faas.id\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"faas.name\":\"testFunction\",\"faas.version\":\"1\",\"faas.memory\":\"1024\",\"faas.execution\":\"RequestId\",\"faas.coldstart\":\"true\",\"trace.id\":\"1-63441c4a-abcdef012345678912345678\",\"myKey\":\"myValue\"}\n");
92-
}
76+
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
77+
handler.handleRequest("Input", context);
78+
79+
File logFile = new File("target/ecslogfile.json");
80+
assertThat(contentOf(logFile)).contains(
81+
"\"ecs.version\":\"1.2.0\",\"log.level\":\"DEBUG\",\"message\":\"Test debug event\",\"service.name\":\"testLogback\",\"service.version\":\"1\",\"log.logger\":\"software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled\",\"process.thread.name\":\"main\",\"cloud.provider\":\"aws\",\"cloud.service.name\":\"lambda\",\"cloud.region\":\"eu-west-1\",\"cloud.account.id\":\"012345678910\",\"faas.id\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"faas.name\":\"testFunction\",\"faas.version\":\"1\",\"faas.memory\":\"1024\",\"faas.execution\":\"RequestId\",\"faas.coldstart\":\"true\",\"trace.id\":\"1-63441c4a-abcdef012345678912345678\",\"myKey\":\"myValue\"}\n");
9382
}
9483

9584
private final LoggingEvent loggingEvent = new LoggingEvent("fqcn", logger, Level.INFO, "message", null, null);

‎powertools-logging/powertools-logging-logback/src/test/java/software/amazon/lambda/powertools/logging/internal/LambdaJsonEncoderTest.java

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
import static org.apache.commons.lang3.reflect.FieldUtils.writeStaticField;
1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static org.assertj.core.api.Assertions.contentOf;
20-
import static org.mockito.Mockito.mockStatic;
2120
import static org.mockito.Mockito.when;
2221
import static org.mockito.MockitoAnnotations.openMocks;
23-
import static software.amazon.lambda.powertools.common.internal.SystemWrapper.getenv;
2422

2523
import ch.qos.logback.classic.Level;
2624
import ch.qos.logback.classic.Logger;
@@ -42,11 +40,9 @@
4240
import org.junit.jupiter.api.Order;
4341
import org.junit.jupiter.api.Test;
4442
import org.mockito.Mock;
45-
import org.mockito.MockedStatic;
4643
import org.slf4j.LoggerFactory;
4744
import org.slf4j.MDC;
4845
import software.amazon.lambda.powertools.common.internal.LambdaHandlerProcessor;
49-
import software.amazon.lambda.powertools.common.internal.SystemWrapper;
5046
import software.amazon.lambda.powertools.logging.LambdaJsonEncoder;
5147
import software.amazon.lambda.powertools.logging.internal.handler.PowertoolsLogEnabled;
5248

@@ -80,21 +76,17 @@ void cleanUp() throws IOException{
8076
@Test
8177
void shouldLogInJsonFormat() throws IllegalAccessException {
8278
// GIVEN
83-
try (MockedStatic<SystemWrapper> mocked = mockStatic(SystemWrapper.class)) {
84-
mocked.when(() -> getenv("_X_AMZN_TRACE_ID"))
85-
.thenReturn("Root=1-63441c4a-abcdef012345678912345678");
86-
writeStaticField(LambdaLoggingAspect.class, "SAMPLING_RATE", "0.000000001", true);
79+
writeStaticField(LambdaLoggingAspect.class, "SAMPLING_RATE", "0.000000001", true);
8780

88-
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
81+
PowertoolsLogEnabled handler = new PowertoolsLogEnabled();
8982

90-
// WHEN
91-
handler.handleRequest("Input", context);
83+
// WHEN
84+
handler.handleRequest("Input", context);
9285

93-
// THEN
94-
File logFile = new File("target/logfile.json");
95-
assertThat(contentOf(logFile)).contains(
96-
"{\"level\":\"DEBUG\",\"message\":\"Test debug event\",\"cold_start\":true,\"function_arn\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"function_memory_size\":1024,\"function_name\":\"testFunction\",\"function_request_id\":\"RequestId\",\"function_version\":1,\"myKey\":\"myValue\",\"sampling_rate\":\"1.0E-9\",\"service\":\"testLogback\",\"xray_trace_id\":\"1-63441c4a-abcdef012345678912345678\",\"timestamp\":");
97-
}
86+
// THEN
87+
File logFile = new File("target/logfile.json");
88+
assertThat(contentOf(logFile)).contains(
89+
"{\"level\":\"DEBUG\",\"message\":\"Test debug event\",\"cold_start\":true,\"function_arn\":\"arn:aws:lambda:eu-west-1:012345678910:function:testFunction:1\",\"function_memory_size\":1024,\"function_name\":\"testFunction\",\"function_request_id\":\"RequestId\",\"function_version\":1,\"myKey\":\"myValue\",\"sampling_rate\":\"1.0E-9\",\"service\":\"testLogback\",\"xray_trace_id\":\"1-63441c4a-abcdef012345678912345678\",\"timestamp\":");
9890
}
9991

10092
private final LoggingEvent loggingEvent = new LoggingEvent("fqcn", logger, Level.INFO, "message", null, null);

0 commit comments

Comments
 (0)