fix http and restify

Author: rochdev

packages/dd-trace/src/format.js

@@ -106,20 +106,15 @@ function extractTags (trace, span) {
     registerExtraService(tags['service.name'])
   }
 
+  extractHttpResource(trace, tags)
+
   for (const tag in tags) {
     switch (tag) {
       case 'service.name':
       case 'span.type':
       case 'resource.name':
         addTag(trace, {}, map[tag], tags[tag])
         break
-      case 'http.route': {
-        const resource = [tags['http.method'], tags['http.route']].filter(v => v).join(' ')
-        if (!tags['resource.name']) {
-          addTag(trace, {}, 'resource', resource)
-        }
-        break
-      }
       // HACK: remove when Datadog supports numeric status code
       case 'http.status_code':
         addTag(trace.meta, {}, tag, tags[tag] && String(tags[tag]))
@@ -196,6 +191,18 @@ function extractError (trace, error) {
   }
 }
 
+function extractHttpResource (trace, tags) {
+  if (tags['resource.name']) return
+  if (tags['http.route']) {
+    addTag(trace, {}, 'resource', [
+      tags['http.method'],
+      tags['http.route']
+    ].filter(v => v).join(' '))
+  } else if (tags['http.method']) {
+    addTag(trace, {}, 'resource', tags['http.method'])
+  }
+}
+
 function addTag (meta, metrics, key, value, nested) {
   switch (typeof value) {
     case 'string':