From abbb44127010db6d41282da71b131458a58735f6 Mon Sep 17 00:00:00 2001
From: Emanuele Palazzetti <emanuele.palazzetti@datadoghq.com>
Date: Fri, 4 Aug 2017 12:45:52 +0200
Subject: [PATCH] [decorators] fixed URLAsResourceName when the cast fails

---
 .../trace/integration/URLAsResourceName.java  | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java
index a2f4952729..5273c6fc35 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java
@@ -44,34 +44,32 @@ public class URLAsResourceName extends AbstractDecorator {
   @Override
   public boolean afterSetTag(final DDSpanContext context, final String tag, final Object value) {
     try {
-      final String statusCode = (String) context.getTags().get(Tags.HTTP_STATUS.getKey());
+      final String statusCode = String.valueOf(context.getTags().get(Tags.HTTP_STATUS.getKey()));
       // do nothing if the status code is already set and equals to 404.
       // TODO: it assumes that Status404Decorator is active. If it's not, it will lead to unexpected behaviors
       if (statusCode != null && statusCode.equals("404")) {
-
-        // Get the path without host:port
-        String path = String.valueOf(value);
-
-        try {
-          path = new java.net.URL(path).getPath();
-        } catch (final MalformedURLException e) {
-          // do nothing, use the value instead of the path
-        }
-        // normalize the path
-        path = norm(path);
-
-        // if the verb (GET, POST ...) is present, add it
-        final String verb = (String) context.getTags().get(Tags.HTTP_METHOD.getKey());
-        if (verb != null && !verb.isEmpty()) {
-          path = verb + " " + path;
-        }
-
-        //Assign resource name
-        context.setResourceName(path);
+        return true;
       }
 
-    } catch (final Throwable e) {
+      // Get the path without host:port
+      String path = String.valueOf(value);
 
+      try {
+        path = new java.net.URL(path).getPath();
+      } catch (final MalformedURLException e) {
+        // do nothing, use the value instead of the path
+      }
+      // normalize the path
+      path = norm(path);
+
+      // if the verb (GET, POST ...) is present, add it
+      final String verb = (String) context.getTags().get(Tags.HTTP_METHOD.getKey());
+      if (verb != null && !verb.isEmpty()) {
+        path = verb + " " + path;
+      }
+
+      context.setResourceName(path);
+    } catch (final Throwable e) {
       return false;
     }
     return true;