From 0c4522881fc76898538f16e7a0090fbec46149d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= <eloy.de.enige@gmail.com>
Date: Wed, 3 Oct 2018 14:38:05 +0200
Subject: [PATCH] [package] Update dd-trace to use our fork with connection
 tracing.

---
 package.json                 |  2 +-
 patches/dd-trace+0.6.0.patch | 30 ------------------------------
 yarn.lock                    |  4 ++--
 3 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 patches/dd-trace+0.6.0.patch

diff --git a/package.json b/package.json
index c75864d3f3..bc59c8e87a 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "compression": "^1.7.2",
     "cors": "^2.7.1",
     "dataloader": "^1.3.0",
-    "dd-trace": "^0.6.0",
+    "dd-trace": "artsy/dd-trace-js#artsy",
     "debug": "^2.2.0",
     "express": "^4.13.3",
     "express-force-ssl": "^0.3.0",
diff --git a/patches/dd-trace+0.6.0.patch b/patches/dd-trace+0.6.0.patch
deleted file mode 100644
index 64b5a798ed..0000000000
--- a/patches/dd-trace+0.6.0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-patch-package
---- a/node_modules/dd-trace/src/plugins/http.js
-+++ b/node_modules/dd-trace/src/plugins/http.js
-@@ -3,6 +3,7 @@
- const url = require('url')
- const opentracing = require('opentracing')
- const semver = require('semver')
-+const platform = require("../platform")
- 
- const Tags = opentracing.Tags
- const FORMAT_HTTP_HEADERS = opentracing.FORMAT_HTTP_HEADERS
-@@ -43,7 +44,17 @@ function patch (http, methodName, tracer, config) {
- 
-       const req = request.call(this, options, callback)
- 
--      req.on('socket', () => {
-+      const startedConnectionAt = platform.now()
-+      req.on("socket", socket => {
-+        // TODO: We only make https connections, but if we ever were to make
-+        //       plain http requests then we should trace the `connect` event.
-+        socket.on("secureConnect", () => {
-+          tracer.startSpan("http.request.connect", {
-+            childOf: span,
-+            startTime: startedConnectionAt
-+          }).finish()
-+        })
-+
-         // empty the data stream when no other listener exists to consume it
-         if (req.listenerCount('response') === 1) {
-           req.on('response', res => res.resume())
diff --git a/yarn.lock b/yarn.lock
index bb66580a83..39c805b16d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2007,9 +2007,9 @@ date-fns@^1.27.2:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
 
-dd-trace@^0.6.0:
+dd-trace@artsy/dd-trace-js#artsy:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-0.6.0.tgz#c80fb7ddaa83d5873b0ff9d0e50ca1343d248235"
+  resolved "https://codeload.github.com/artsy/dd-trace-js/tar.gz/8331e739b8878eb17600c02b49e7ac55c1de771d"
   dependencies:
     async-hook-jl "^1.7.6"
     int64-buffer "^0.1.9"