Merge 71a6451 into f601099

e2e-tests/react/package.json

@@ -7,7 +7,7 @@
     "react": "16.3.1",
     "react-dom": "16.3.1",
     "react-scripts": "1.1.4",
-    "zipkin": "0.10.1",
+    "zipkin": "0.19.2",
     "zipkin-javascript-opentracing": "file:../..",
     "zipkin-transport-http": "0.10.1"
   },

e2e-tests/react/yarn.lock

@@ -4698,10 +4698,6 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
-network-address@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/network-address/-/network-address-1.1.2.tgz#4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"
-
 nice-try@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
@@ -7385,17 +7381,17 @@ yauzl@2.4.1:
     fd-slicer "~1.0.1"
 
 "zipkin-javascript-opentracing@file:../..":
-  version "2.0.1"
+  version "2.1.0"
 
 zipkin-transport-http@0.10.1:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/zipkin-transport-http/-/zipkin-transport-http-0.10.1.tgz#615e2bbb3150b3ec0885caf98f6ad013a62ae5bb"
   dependencies:
     node-fetch "^1.5.3"
 
-zipkin@0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/zipkin/-/zipkin-0.10.1.tgz#98d2472f897b6c532b02cb9f2866139399664036"
+zipkin@0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/zipkin/-/zipkin-0.19.2.tgz#bfc4d9a3dc175751434327c686d86530faa6ad8f"
   dependencies:
     base64-js "^1.1.2"
-    network-address "^1.1.0"
+    is-promise "^2.1.0"

package.json

@@ -62,7 +62,7 @@
     "nodemon": "1.17.3",
     "opentracing": "0.14.3",
     "prettier": "1.12.0",
-    "zipkin": "0.10.1",
+    "zipkin": "0.19.2",
     "zipkin-transport-http": "0.10.1"
   },
   "lint-staged": {

yarn.lock

@@ -3332,10 +3332,6 @@ negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
-network-address@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/network-address/-/network-address-1.1.2.tgz#4aa7bfd43f03f0b81c9702b13d6a858ddb326f3e"
-
 node-fetch@^1.5.3:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -4941,9 +4937,9 @@ zipkin-transport-http@0.10.1:
   dependencies:
     node-fetch "^1.5.3"
 
-zipkin@0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/zipkin/-/zipkin-0.10.1.tgz#98d2472f897b6c532b02cb9f2866139399664036"
+zipkin@0.19.2:
+  version "0.19.2"
+  resolved "https://registry.yarnpkg.com/zipkin/-/zipkin-0.19.2.tgz#bfc4d9a3dc175751434327c686d86530faa6ad8f"
   dependencies:
     base64-js "^1.1.2"
-    network-address "^1.1.0"
+    is-promise "^2.1.0"