PR Feedback

README code streamlining, unnesting try blocks, exception error message.

Author: Matt Whelan

README.md

@@ -62,19 +62,7 @@ dependencies {
 #### Example Usage
 
 ```java
-package com.handler.example;
-
-import com.amazonaws.services.lambda.runtime.Context;
-import com.amazonaws.services.lambda.runtime.RequestHandler;
-import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
-import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
-import com.newrelic.opentracing.LambdaTracer;
-import com.newrelic.opentracing.aws.LambdaTracing;
-import io.opentracing.util.GlobalTracer;
-
-import java.util.Map;
-
-public static class YourLambdaHandler implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+public class YourLambdaHandler implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
     static {
         // Obtain an instance of the OpenTracing Tracer of your choice
         Tracer tracer = LambdaTracer.INSTANCE;

src/main/java/com/newrelic/opentracing/aws/LambdaTracing.java

@@ -52,14 +52,12 @@ public Output instrumentRequest(
 
     Span span = buildRootSpan(input, context, tracer, spanContext);
     try (Scope scope = tracer.activateSpan(span)) {
-      try {
-        Output output = realHandler.apply(input, context);
-        parseResponse(span, output);
-        return output;
-      } catch (Throwable throwable) {
-        span.log(SpanUtil.createErrorAttributes(throwable));
-        throw throwable;
-      }
+      Output output = realHandler.apply(input, context);
+      parseResponse(span, output);
+      return output;
+    } catch (Throwable throwable) {
+      span.log(SpanUtil.createErrorAttributes(throwable));
+      throw throwable;
     } finally {
       span.finish();
     }

src/main/java/com/newrelic/opentracing/aws/StreamLambdaTracing.java

@@ -48,12 +48,10 @@ public void instrumentRequest(
 
     Span span = buildRootSpan(input, context, tracer, spanContext);
     try (Scope scope = tracer.activateSpan(span)) {
-      try {
-        realHandler.handleRequest(input, output, context);
-      } catch (Throwable throwable) {
-        span.log(SpanUtil.createErrorAttributes(throwable));
-        throw throwable;
-      }
+      realHandler.handleRequest(input, output, context);
+    } catch (Throwable throwable) {
+      span.log(SpanUtil.createErrorAttributes(throwable));
+      throw throwable;
     } finally {
       span.finish();
     }

src/main/java/com/newrelic/opentracing/aws/TracingRequestStreamHandler.java

@@ -41,7 +41,7 @@ default void handleRequest(InputStream input, OutputStream output, Context conte
     try {
       StreamLambdaTracing.instrument(input, output, context, this::doHandleRequest);
     } catch (IOException e) {
-      throw new RuntimeException(e);
+      throw new RuntimeException("Exception while processing Lambda invocation", e);
     }
   }