Unfinished implementation of the POWERTOOLS_SERVICE_NAME env var.

Author: msailes

pom.xml

@@ -188,6 +188,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
+                <configuration>
+                    <environmentVariables>
+                        <POWERTOOLS_SERVICE_NAME>testService</POWERTOOLS_SERVICE_NAME>
+                    </environmentVariables>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.jacoco</groupId>

src/main/java/software/amazon/lambda/internal/LambdaHandlerProcessor.java

@@ -9,6 +9,7 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 
 public final class LambdaHandlerProcessor {
+    public static String SERVICE_NAME = System.getenv("POWERTOOLS_SERVICE_NAME");
     public static Boolean IS_COLD_START = null;
 
     public static boolean isHandlerMethod(ProceedingJoinPoint pjp) {

src/main/java/software/amazon/lambda/logging/internal/LambdaLoggingAspect.java

@@ -24,6 +24,7 @@
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.SERVICE_NAME;
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnRequestHandler;
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.placedOnStreamHandler;
@@ -45,6 +46,7 @@ public Object around(ProceedingJoinPoint pjp,
                 .ifPresent(context -> {
                     ThreadContext.putAll(DefaultLambdaFields.values(context));
                     ThreadContext.put("coldStart", null == IS_COLD_START ? "true" : "false");
+                    ThreadContext.put("service", SERVICE_NAME);
                 });
 
 

src/test/java/software/amazon/lambda/logging/internal/LambdaLoggingAspectTest.java

@@ -50,12 +50,13 @@ void shouldSetLambdaContextWhenEnabled() {
         requestHandler.handleRequest(new Object(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(5)
+                .hasSize(6)
                 .containsEntry(DefaultLambdaFields.FUNCTION_ARN.getName(), "testArn")
                 .containsEntry(DefaultLambdaFields.FUNCTION_MEMORY_SIZE.getName(), "10")
                 .containsEntry(DefaultLambdaFields.FUNCTION_VERSION.getName(), "1")
                 .containsEntry(DefaultLambdaFields.FUNCTION_NAME.getName(), "testFunction")
-                .containsKey("coldStart");
+                .containsKey("coldStart")
+                .containsKey("service");
     }
 
     @Test
@@ -65,26 +66,27 @@ void shouldSetLambdaContextForStreamHandlerWhenEnabled() throws IOException {
         requestStreamHandler.handleRequest(new ByteArrayInputStream(new byte[]{}), new ByteArrayOutputStream(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(5)
+                .hasSize(6)
                 .containsEntry(DefaultLambdaFields.FUNCTION_ARN.getName(), "testArn")
                 .containsEntry(DefaultLambdaFields.FUNCTION_MEMORY_SIZE.getName(), "10")
                 .containsEntry(DefaultLambdaFields.FUNCTION_VERSION.getName(), "1")
                 .containsEntry(DefaultLambdaFields.FUNCTION_NAME.getName(), "testFunction")
-                .containsKey("coldStart");
+                .containsKey("coldStart")
+                .containsKey("service");
     }
 
     @Test
     void shouldSetColdStartFlag() throws IOException {
         requestStreamHandler.handleRequest(new ByteArrayInputStream(new byte[]{}), new ByteArrayOutputStream(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(5)
+                .hasSize(6)
                 .containsEntry("coldStart", "true");
 
         requestStreamHandler.handleRequest(new ByteArrayInputStream(new byte[]{}), new ByteArrayOutputStream(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(5)
+                .hasSize(6)
                 .containsEntry("coldStart", "false");
     }
 
@@ -125,7 +127,7 @@ void shouldLogEventForHandler() {
         requestHandler.handleRequest(new Object(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(5);
+                .hasSize(6);
     }
 
     @Test
@@ -142,7 +144,16 @@ void shouldLogEventForStreamAndLambdaStreamIsValid() throws IOException {
                 .isEqualTo("{\"test\":\"payload\"}");
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(5);
+                .hasSize(6);
+    }
+
+    @Test
+    void shouldLogServiceNameWhenEnvVarSet() {
+        requestHandler.handleRequest(new Object(), context);
+
+        assertThat(ThreadContext.getImmutableContext())
+                .hasSize(6)
+                .containsEntry("service", "testService");
     }
 
     private void setupContext() {