move http client to clientPlugin

Author: Jordi Bertran de Balanda

packages/datadog-plugin-http/src/client.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Plugin = require('../../dd-trace/src/plugins/plugin')
+const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
 const tags = require('../../../ext/tags')
 const analyticsSampler = require('../../dd-trace/src/analytics_sampler')
@@ -9,97 +9,99 @@ const HTTP_HEADERS = formats.HTTP_HEADERS
 const urlFilter = require('../../dd-trace/src/plugins/util/urlfilter')
 const log = require('../../dd-trace/src/log')
 const url = require('url')
-const { COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
+const { CLIENT_PORT_KEY, COMPONENT, ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../dd-trace/src/constants')
 
 const HTTP_STATUS_CODE = tags.HTTP_STATUS_CODE
 const HTTP_REQUEST_HEADERS = tags.HTTP_REQUEST_HEADERS
 const HTTP_RESPONSE_HEADERS = tags.HTTP_RESPONSE_HEADERS
 
-class HttpClientPlugin extends Plugin {
+class HttpClientPlugin extends ClientPlugin {
   static get id () {
     return 'http'
   }
 
-  constructor (...args) {
-    super(...args)
-
-    this.addSub('apm:http:client:request:start', ({ args, http }) => {
-      const store = storage.getStore()
-      const options = args.options
-      const agent = options.agent || options._defaultAgent || http.globalAgent
-      const protocol = options.protocol || agent.protocol || 'http:'
-      const hostname = options.hostname || options.host || 'localhost'
-      const host = options.port ? `${hostname}:${options.port}` : hostname
-      const path = options.path ? options.path.split(/[?#]/)[0] : '/'
-      const uri = `${protocol}//${host}${path}`
-      const allowed = this.config.filter(uri)
-
-      const method = (options.method || 'GET').toUpperCase()
-      const childOf = store && allowed ? store.span : null
-      const span = this.tracer.startSpan('http.request', {
-        childOf,
-        tags: {
-          [COMPONENT]: this.constructor.id,
-          'span.kind': 'client',
-          'service.name': getServiceName(this.tracer, this.config, options),
-          'resource.name': method,
-          'span.type': 'http',
-          'http.method': method,
-          'http.url': uri,
-          'out.host': hostname
-        }
-      })
+  addTraceSub (eventName, handler) {
+    this.addSub(`apm:${this.constructor.id}:client:${this.operation}:${eventName}`, handler)
+  }
 
-      // TODO: Figure out a better way to do this for any span.
-      if (!allowed) {
-        span._spanContext._trace.record = false
+  start ({ args, http }) {
+    const store = storage.getStore()
+    const options = args.options
+    const agent = options.agent || options._defaultAgent || http.globalAgent
+    const protocol = options.protocol || agent.protocol || 'http:'
+    const hostname = options.hostname || options.host || 'localhost'
+    const host = options.port ? `${hostname}:${options.port}` : hostname
+    const path = options.path ? options.path.split(/[?#]/)[0] : '/'
+    const uri = `${protocol}//${host}${path}`
+    const allowed = this.config.filter(uri)
+
+    const method = (options.method || 'GET').toUpperCase()
+    const childOf = store && allowed ? store.span : null
+    // TODO delegate to super.startspan
+    const span = this.startSpan('http.request', {
+      childOf,
+      meta: {
+        [COMPONENT]: this.constructor.id,
+        'span.kind': 'client',
+        'service.name': getServiceName(this.tracer, this.config, options),
+        'resource.name': method,
+        'span.type': 'http',
+        'http.method': method,
+        'http.url': uri,
+        'out.host': hostname
+      },
+      metrics: {
+        [CLIENT_PORT_KEY]: parseInt(options.port)
       }
+    })
 
-      if (!(hasAmazonSignature(options) || !this.config.propagationFilter(uri))) {
-        this.tracer.inject(span, HTTP_HEADERS, options.headers)
-      }
+    // TODO: Figure out a better way to do this for any span.
+    if (!allowed) {
+      span._spanContext._trace.record = false
+    }
 
-      analyticsSampler.sample(span, this.config.measured)
-      this.enter(span, store)
-    })
+    if (!(hasAmazonSignature(options) || !this.config.propagationFilter(uri))) {
+      this.tracer.inject(span, HTTP_HEADERS, options.headers)
+    }
 
-    this.addSub('apm:http:client:request:finish', ({ req, res }) => {
-      const span = storage.getStore().span
-      if (res) {
-        span.setTag(HTTP_STATUS_CODE, res.statusCode)
+    analyticsSampler.sample(span, this.config.measured)
+    this.enter(span, store)
+  }
 
-        if (!this.config.validateStatus(res.statusCode)) {
-          span.setTag('error', 1)
-        }
+  finish ({ req, res }) {
+    const span = storage.getStore().span
+    if (res) {
+      span.setTag(HTTP_STATUS_CODE, res.statusCode)
 
-        addResponseHeaders(res, span, this.config)
+      if (!this.config.validateStatus(res.statusCode)) {
+        span.setTag('error', 1)
       }
 
-      addRequestHeaders(req, span, this.config)
+      addResponseHeaders(res, span, this.config)
+    }
 
-      this.config.hooks.request(span, req, res)
-      span.finish()
-    })
+    addRequestHeaders(req, span, this.config)
 
-    this.addSub('apm:http:client:request:error', errorHandler)
+    this.config.hooks.request(span, req, res)
+    span.finish()
   }
 
-  configure (config) {
-    return super.configure(normalizeClientConfig(config))
-  }
-}
+  error (err) {
+    const span = storage.getStore().span
 
-function errorHandler (err) {
-  const span = storage.getStore().span
+    if (err) {
+      span.addTags({
+        [ERROR_TYPE]: err.name,
+        [ERROR_MESSAGE]: err.message || err.code,
+        [ERROR_STACK]: err.stack
+      })
+    } else {
+      span.setTag('error', 1)
+    }
+  }
 
-  if (err) {
-    span.addTags({
-      [ERROR_TYPE]: err.name,
-      [ERROR_MESSAGE]: err.message || err.code,
-      [ERROR_STACK]: err.stack
-    })
-  } else {
-    span.setTag('error', 1)
+  configure (config) {
+    return super.configure(normalizeClientConfig(config))
   }
 }