From d728ea97f172e60656d851b257ff2bc1ba878b97 Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Thu, 7 Nov 2019 19:37:13 +0200
Subject: [PATCH] zipkin-transport-http: Provides its own types (#39577)

---
 notNeededPackages.json                        |  6 +++++
 .../zipkin-instrumentation-fetch/package.json |  3 ++-
 types/zipkin-transport-http/index.d.ts        | 19 ---------------
 types/zipkin-transport-http/package.json      |  6 -----
 types/zipkin-transport-http/tsconfig.json     | 24 -------------------
 types/zipkin-transport-http/tslint.json       |  1 -
 .../zipkin-transport-http-tests.ts            | 20 ----------------
 7 files changed, 8 insertions(+), 71 deletions(-)
 delete mode 100644 types/zipkin-transport-http/index.d.ts
 delete mode 100644 types/zipkin-transport-http/package.json
 delete mode 100644 types/zipkin-transport-http/tsconfig.json
 delete mode 100644 types/zipkin-transport-http/tslint.json
 delete mode 100644 types/zipkin-transport-http/zipkin-transport-http-tests.ts

diff --git a/notNeededPackages.json b/notNeededPackages.json
index f10b04a694..3e64cf3558 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -5178,6 +5178,12 @@
             "sourceRepoURL": "https://github.com/zetapush/zetapush-js",
             "asOfVersion": "3.1.2"
         },
+        {
+            "libraryName": "zipkin-transport-http",
+            "typingsPackageName": "zipkin-transport-http",
+            "sourceRepoURL": "https://github.com/openzipkin/zipkin-js#readme",
+            "asOfVersion": "0.12.0"
+        },
         {
             "libraryName": "zipkin-instrumentation-express",
             "typingsPackageName": "zipkin-instrumentation-express",
diff --git a/types/zipkin-instrumentation-fetch/package.json b/types/zipkin-instrumentation-fetch/package.json
index 07bdb0d223..65ca67e38e 100644
--- a/types/zipkin-instrumentation-fetch/package.json
+++ b/types/zipkin-instrumentation-fetch/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "dependencies": {
-    "zipkin": ">=0.11.0"
+    "zipkin": ">=0.11.0",
+    "zipkin-transport-http": "^0.12.0"
   }
 }
diff --git a/types/zipkin-transport-http/index.d.ts b/types/zipkin-transport-http/index.d.ts
deleted file mode 100644
index ef31856286..0000000000
--- a/types/zipkin-transport-http/index.d.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// Type definitions for zipkin-transport-http 0.11
-// Project: https://github.com/openzipkin/zipkin-js#readme
-// Definitions by: York Yao <https://github.com/plantain-00>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import { JsonEncoder, Logger, model } from 'zipkin';
-
-export interface Options {
-    endpoint: string;
-    jsonEncoder?: JsonEncoder;
-    httpInterval?: number;
-    headers?: { [name: string]: string };
-}
-
-export class HttpLogger implements Logger {
-    logSpan(span: model.Span): void;
-    constructor(options: Options)
-}
diff --git a/types/zipkin-transport-http/package.json b/types/zipkin-transport-http/package.json
deleted file mode 100644
index 07bdb0d223..0000000000
--- a/types/zipkin-transport-http/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "private": true,
-  "dependencies": {
-    "zipkin": ">=0.11.0"
-  }
-}
diff --git a/types/zipkin-transport-http/tsconfig.json b/types/zipkin-transport-http/tsconfig.json
deleted file mode 100644
index be30a49dab..0000000000
--- a/types/zipkin-transport-http/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "zipkin-transport-http-tests.ts"
-    ]
-}
diff --git a/types/zipkin-transport-http/tslint.json b/types/zipkin-transport-http/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/zipkin-transport-http/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/zipkin-transport-http/zipkin-transport-http-tests.ts b/types/zipkin-transport-http/zipkin-transport-http-tests.ts
deleted file mode 100644
index 4b5b91d218..0000000000
--- a/types/zipkin-transport-http/zipkin-transport-http-tests.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import {
-    Tracer,
-    BatchRecorder,
-    jsonEncoder,
-} from 'zipkin';
-
-import CLSContext = require('zipkin-context-cls');
-import { HttpLogger } from 'zipkin-transport-http';
-
-// Setup the tracer to use http and implicit trace context
-const tracer = new Tracer({
-    ctxImpl: new CLSContext('zipkin'),
-    recorder: new BatchRecorder({
-        logger: new HttpLogger({
-            endpoint: 'http://localhost:9411/api/v2/spans',
-            jsonEncoder: jsonEncoder.JSON_V2
-        })
-    }),
-    localServiceName: 'service-a'
-});