From 07676991275e7ab800c599fa8a02f7fcd1ead362 Mon Sep 17 00:00:00 2001
From: Alexander T <alexander.tarasyuk@outlook.com>
Date: Fri, 1 Nov 2019 17:04:57 +0200
Subject: [PATCH] zipkin-instrumentation-express: Provides its own types
 (#39445)

---
 notNeededPackages.json                        |  6 +++++
 .../zipkin-instrumentation-express/index.d.ts | 14 -----------
 .../package.json                              |  6 -----
 .../tsconfig.json                             | 23 -------------------
 .../tslint.json                               |  1 -
 .../zipkin-instrumentation-express-tests.ts   | 12 ----------
 6 files changed, 6 insertions(+), 56 deletions(-)
 delete mode 100644 types/zipkin-instrumentation-express/index.d.ts
 delete mode 100644 types/zipkin-instrumentation-express/package.json
 delete mode 100644 types/zipkin-instrumentation-express/tsconfig.json
 delete mode 100644 types/zipkin-instrumentation-express/tslint.json
 delete mode 100644 types/zipkin-instrumentation-express/zipkin-instrumentation-express-tests.ts

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 46bc7dbea1..f1128f8379 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -4674,6 +4674,12 @@
             "sourceRepoURL": "https://github.com/zetapush/zetapush-js",
             "asOfVersion": "3.1.2"
         },
+        {
+            "libraryName": "zipkin-instrumentation-express",
+            "typingsPackageName": "zipkin-instrumentation-express",
+            "sourceRepoURL": "https://github.com/openzipkin/zipkin-js#readme",
+            "asOfVersion": "0.12.0"
+        },
         {
             "libraryName": "Zone.js",
             "typingsPackageName": "zone.js",
diff --git a/types/zipkin-instrumentation-express/index.d.ts b/types/zipkin-instrumentation-express/index.d.ts
deleted file mode 100644
index 14ebabf140..0000000000
--- a/types/zipkin-instrumentation-express/index.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// Type definitions for zipkin-instrumentation-express 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 express = require('express');
-import { Tracer } from 'zipkin';
-
-export interface Options {
-    tracer: Tracer;
-}
-
-export function expressMiddleware(options: Options): express.RequestHandler;
diff --git a/types/zipkin-instrumentation-express/package.json b/types/zipkin-instrumentation-express/package.json
deleted file mode 100644
index 07bdb0d223..0000000000
--- a/types/zipkin-instrumentation-express/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "private": true,
-  "dependencies": {
-    "zipkin": ">=0.11.0"
-  }
-}
diff --git a/types/zipkin-instrumentation-express/tsconfig.json b/types/zipkin-instrumentation-express/tsconfig.json
deleted file mode 100644
index fe28fc0e75..0000000000
--- a/types/zipkin-instrumentation-express/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "lib": [
-            "es6"
-        ],
-        "noImplicitAny": true,
-        "noImplicitThis": true,
-        "strictNullChecks": true,
-        "strictFunctionTypes": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "zipkin-instrumentation-express-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/types/zipkin-instrumentation-express/tslint.json b/types/zipkin-instrumentation-express/tslint.json
deleted file mode 100644
index 3db14f85ea..0000000000
--- a/types/zipkin-instrumentation-express/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json" }
diff --git a/types/zipkin-instrumentation-express/zipkin-instrumentation-express-tests.ts b/types/zipkin-instrumentation-express/zipkin-instrumentation-express-tests.ts
deleted file mode 100644
index bcfb82ec46..0000000000
--- a/types/zipkin-instrumentation-express/zipkin-instrumentation-express-tests.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import express = require('express');
-import { Tracer, ExplicitContext, ConsoleRecorder } from 'zipkin';
-import { expressMiddleware as zipkinMiddleware } from 'zipkin-instrumentation-express';
-
-const ctxImpl = new ExplicitContext();
-const recorder = new ConsoleRecorder();
-const localServiceName = 'service-a';
-const tracer = new Tracer({ ctxImpl, recorder, localServiceName });
-
-const app = express();
-
-app.use(zipkinMiddleware({ tracer }));