protect base and jsp decorators from NPE

Author: amarziali

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java

@@ -78,7 +78,9 @@ public AgentSpan afterStart(final AgentSpan span) {
   }
 
   public ContextScope beforeFinish(final ContextScope scope) {
-    beforeFinish(scope.context());
+    if (scope != null) {
+      beforeFinish(scope.context());
+    }
     return scope;
   }
 

dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java

@@ -5,12 +5,9 @@
 import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator;
 import java.net.URI;
-import java.net.URISyntaxException;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.jsp.HttpJspPage;
 import org.apache.jasper.JspCompilationContext;
-import org.slf4j.LoggerFactory;
 
 public class JSPDecorator extends BaseDecorator {
   public static final CharSequence JSP_COMPILE = UTF8BytesString.create("jsp.compile");
@@ -68,11 +65,12 @@ public void onRender(final AgentSpan span, final HttpServletRequest req) {
     // HttpServletRequest#getRequestURL(),
     // normalizing the URL should remove those symbols for readability and consistency
     try {
+      // note: getRequestURL is supposed to always be nonnull - however servlet wrapping can happen
+      // and we never know if ever this can happen
       span.setTag(
           "jsp.requestURL", (new URI(req.getRequestURL().toString())).normalize().toString());
-    } catch (final URISyntaxException uriSE) {
-      LoggerFactory.getLogger(HttpJspPage.class)
-          .debug("Failed to get and normalize request URL: {}", uriSE.getMessage());
+    } catch (final Throwable ignored) {
+      // logging here will be too verbose
     }
   }
 }