Added the environment variable for logging the service name automatically.

Author: msailes

example/template.yaml

@@ -20,7 +20,7 @@ Resources:
       MemorySize: 512
       Environment: # More info about Env Vars: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
         Variables:
-          POWERTOOLS_SERVICE_NAME: SAILING
+          POWERTOOLS_SERVICE_NAME: "Payment Service"
       Tracing: Active
       Events:
         HelloWorld:

pom.xml

@@ -188,11 +188,6 @@
                 <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,7 +9,8 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 
 public final class LambdaHandlerProcessor {
-    public static String SERVICE_NAME = System.getenv("POWERTOOLS_SERVICE_NAME");
+    public static String SERVICE_NAME = null != System.getenv("POWERTOOLS_SERVICE_NAME")
+            ? System.getenv("POWERTOOLS_SERVICE_NAME") : "service_undefined";
     public static Boolean IS_COLD_START = null;
 
     public static boolean isHandlerMethod(ProceedingJoinPoint pjp) {

src/main/java/software/amazon/lambda/tracing/PowerTracer.java

@@ -6,9 +6,9 @@
 import com.amazonaws.xray.entities.Entity;
 import com.amazonaws.xray.entities.Subsegment;
 
+import static software.amazon.lambda.internal.LambdaHandlerProcessor.SERVICE_NAME;
+
 public final class PowerTracer {
-    public static final String SERVICE_NAME = null != System.getenv("POWERTOOLS_SERVICE_NAME")
-            ? System.getenv("POWERTOOLS_SERVICE_NAME") : "service_undefined";
 
     public static void putAnnotation(String key, String value) {
         AWSXRay.getCurrentSubsegmentOptional()

src/main/java/software/amazon/lambda/tracing/internal/LambdaTracingAspect.java

@@ -7,8 +7,8 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
+import software.amazon.lambda.internal.LambdaHandlerProcessor;
 import software.amazon.lambda.tracing.PowerToolTracing;
-import software.amazon.lambda.tracing.PowerTracer;
 
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.IS_COLD_START;
 import static software.amazon.lambda.internal.LambdaHandlerProcessor.isHandlerMethod;
@@ -59,7 +59,7 @@ public Object around(ProceedingJoinPoint pjp,
     }
 
     private String namespace(PowerToolTracing powerToolsTracing) {
-        return powerToolsTracing.namespace().isEmpty() ? PowerTracer.SERVICE_NAME : powerToolsTracing.namespace();
+        return powerToolsTracing.namespace().isEmpty() ? LambdaHandlerProcessor.SERVICE_NAME : powerToolsTracing.namespace();
     }
 
     private boolean placedOnHandlerMethod(ProceedingJoinPoint pjp) {

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

@@ -29,6 +29,7 @@
 
 class LambdaLoggingAspectTest {
 
+    private static final int EXPECTED_CONTEXT_SIZE = 6;
     private RequestStreamHandler requestStreamHandler;
     private RequestHandler<Object, Object> requestHandler;
 
@@ -50,7 +51,7 @@ void shouldSetLambdaContextWhenEnabled() {
         requestHandler.handleRequest(new Object(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(6)
+                .hasSize(EXPECTED_CONTEXT_SIZE)
                 .containsEntry(DefaultLambdaFields.FUNCTION_ARN.getName(), "testArn")
                 .containsEntry(DefaultLambdaFields.FUNCTION_MEMORY_SIZE.getName(), "10")
                 .containsEntry(DefaultLambdaFields.FUNCTION_VERSION.getName(), "1")
@@ -66,7 +67,7 @@ void shouldSetLambdaContextForStreamHandlerWhenEnabled() throws IOException {
         requestStreamHandler.handleRequest(new ByteArrayInputStream(new byte[]{}), new ByteArrayOutputStream(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(6)
+                .hasSize(EXPECTED_CONTEXT_SIZE)
                 .containsEntry(DefaultLambdaFields.FUNCTION_ARN.getName(), "testArn")
                 .containsEntry(DefaultLambdaFields.FUNCTION_MEMORY_SIZE.getName(), "10")
                 .containsEntry(DefaultLambdaFields.FUNCTION_VERSION.getName(), "1")
@@ -86,7 +87,7 @@ void shouldSetColdStartFlag() throws IOException {
         requestStreamHandler.handleRequest(new ByteArrayInputStream(new byte[]{}), new ByteArrayOutputStream(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(6)
+                .hasSize(EXPECTED_CONTEXT_SIZE)
                 .containsEntry("coldStart", "false");
     }
 
@@ -127,7 +128,7 @@ void shouldLogEventForHandler() {
         requestHandler.handleRequest(new Object(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(6);
+                .hasSize(EXPECTED_CONTEXT_SIZE);
     }
 
     @Test
@@ -144,15 +145,16 @@ void shouldLogEventForStreamAndLambdaStreamIsValid() throws IOException {
                 .isEqualTo("{\"test\":\"payload\"}");
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(6);
+                .hasSize(EXPECTED_CONTEXT_SIZE);
     }
 
     @Test
     void shouldLogServiceNameWhenEnvVarSet() {
+        LambdaHandlerProcessor.SERVICE_NAME = "testService";
         requestHandler.handleRequest(new Object(), context);
 
         assertThat(ThreadContext.getImmutableContext())
-                .hasSize(6)
+                .hasSize(EXPECTED_CONTEXT_SIZE)
                 .containsEntry("service", "testService");
     }