From b8df001379db237c2c8d0c4800635c1178494296 Mon Sep 17 00:00:00 2001 From: legendecas Date: Thu, 24 Feb 2022 16:32:46 +0800 Subject: [PATCH 1/2] chore: target to es2017 in the no-polyfill target (#2765) Co-authored-by: Valentin Marchaud --- .../opentelemetry-api-metrics/package.json | 10 +++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 11 ------- .../tsconfig.esnext.json | 11 +++++++ .../package.json | 10 +++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 11 ------- .../tsconfig.esnext.json | 11 +++++++ .../package.json | 8 ++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 16 ---------- .../tsconfig.esnext.json | 16 ++++++++++ .../package.json | 8 ++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 16 ---------- .../tsconfig.esnext.json | 16 ++++++++++ .../package.json | 4 +-- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 16 ---------- .../tsconfig.esnext.json | 16 ++++++++++ .../package.json | 8 ++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 16 ---------- .../tsconfig.esnext.json | 16 ++++++++++ experimental/tsconfig.json | 12 +++---- .../exporter-trace-otlp-http/package.json | 10 +++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 11 ------- .../tsconfig.esnext.json | 11 +++++++ .../package.json | 8 ++--- .../tsconfig.all.json | 2 +- ...nfig.esm2015.json => tsconfig.esnext.json} | 6 ++-- .../opentelemetry-context-zone/package.json | 8 ++--- .../tsconfig.all.json | 2 +- ...nfig.esm2015.json => tsconfig.esnext.json} | 8 ++--- packages/opentelemetry-core/package.json | 10 +++--- packages/opentelemetry-core/tsconfig.all.json | 2 +- ...nfig.esm2015.json => tsconfig.esnext.json} | 8 ++--- .../package.json | 10 +++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 25 --------------- .../tsconfig.esnext.json | 25 +++++++++++++++ .../opentelemetry-propagator-b3/package.json | 8 ++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 16 ---------- .../tsconfig.esnext.json | 16 ++++++++++ packages/opentelemetry-resources/package.json | 10 +++--- .../opentelemetry-resources/tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 19 ------------ .../tsconfig.esnext.json | 19 ++++++++++++ .../opentelemetry-sdk-trace-base/package.json | 10 +++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 22 ------------- .../tsconfig.esnext.json | 22 +++++++++++++ .../opentelemetry-sdk-trace-web/package.json | 8 ++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 31 ------------------- .../tsconfig.esnext.json | 31 +++++++++++++++++++ .../package.json | 8 ++--- .../tsconfig.all.json | 2 +- .../tsconfig.esm2015.json | 11 ------- .../tsconfig.esnext.json | 11 +++++++ tsconfig.base.esm2015.json | 8 ----- tsconfig.base.esnext.json | 9 ++++++ tsconfig.json | 20 ++++++------ 65 files changed, 342 insertions(+), 341 deletions(-) delete mode 100644 experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json create mode 100644 experimental/packages/opentelemetry-api-metrics/tsconfig.esnext.json delete mode 100644 experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json create mode 100644 experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json delete mode 100644 experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json create mode 100644 experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json delete mode 100644 experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json create mode 100644 experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json delete mode 100644 experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json create mode 100644 experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json delete mode 100644 experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json create mode 100644 experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esnext.json delete mode 100644 packages/exporter-trace-otlp-http/tsconfig.esm2015.json create mode 100644 packages/exporter-trace-otlp-http/tsconfig.esnext.json rename packages/opentelemetry-context-zone-peer-dep/{tsconfig.esm2015.json => tsconfig.esnext.json} (50%) rename packages/opentelemetry-context-zone/{tsconfig.esm2015.json => tsconfig.esnext.json} (54%) rename packages/opentelemetry-core/{tsconfig.esm2015.json => tsconfig.esnext.json} (54%) delete mode 100644 packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json create mode 100644 packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json delete mode 100644 packages/opentelemetry-propagator-b3/tsconfig.esm2015.json create mode 100644 packages/opentelemetry-propagator-b3/tsconfig.esnext.json delete mode 100644 packages/opentelemetry-resources/tsconfig.esm2015.json create mode 100644 packages/opentelemetry-resources/tsconfig.esnext.json delete mode 100644 packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json create mode 100644 packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json delete mode 100644 packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json create mode 100644 packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json delete mode 100644 packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json create mode 100644 packages/opentelemetry-semantic-conventions/tsconfig.esnext.json delete mode 100644 tsconfig.base.esm2015.json create mode 100644 tsconfig.base.esnext.json diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json index 1f26f27ffe..eae1a83de5 100644 --- a/experimental/packages/opentelemetry-api-metrics/package.json +++ b/experimental/packages/opentelemetry-api-metrics/package.json @@ -5,12 +5,12 @@ "description": "Public metrics API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "repository": "open-telemetry/opentelemetry-js", @@ -47,9 +47,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json index 1a2f9e96aa..06c5491334 100644 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json deleted file mode 100644 index b1a5a79f6b..0000000000 --- a/experimental/packages/opentelemetry-api-metrics/tsconfig.esm2015.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/experimental/packages/opentelemetry-api-metrics/tsconfig.esnext.json b/experimental/packages/opentelemetry-api-metrics/tsconfig.esnext.json new file mode 100644 index 0000000000..cb78dd6ff3 --- /dev/null +++ b/experimental/packages/opentelemetry-api-metrics/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json index 8394246d80..495d21ae1a 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json @@ -4,13 +4,13 @@ "description": "OpenTelemetry Collector Metrics Exporter allows user to send collected metrics to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "scripts": { @@ -46,9 +46,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json index 1a2f9e96aa..06c5491334 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json deleted file mode 100644 index a00e018fe3..0000000000 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} \ No newline at end of file diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json new file mode 100644 index 0000000000..cb78dd6ff3 --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 146db3a3fe..ed3abadff8 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -38,9 +38,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json index 1a2f9e96aa..06c5491334 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json deleted file mode 100644 index b309182079..0000000000 --- a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esm2015.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-instrumentation/tsconfig.esm2015.json" - } - ] -} diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json new file mode 100644 index 0000000000..1289248d95 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-fetch/tsconfig.esnext.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.esnext.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 119ae4e6e7..8e7c32d1d4 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -38,9 +38,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json index 1a2f9e96aa..06c5491334 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json deleted file mode 100644 index b309182079..0000000000 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm2015.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-instrumentation/tsconfig.esm2015.json" - } - ] -} diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json new file mode 100644 index 0000000000..1289248d95 --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esnext.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-instrumentation/tsconfig.esnext.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index 5b7dcd1bc9..ca1b1d39f2 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -7,7 +7,7 @@ "license": "Apache-2.0", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "publishConfig": { "access": "public" @@ -19,7 +19,7 @@ "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "files": [ diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json index 1a2f9e96aa..06c5491334 100644 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json deleted file mode 100644 index 90055f46c9..0000000000 --- a/experimental/packages/opentelemetry-instrumentation/tsconfig.esm2015.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-api-metrics/tsconfig.esm2015.json" - } - ] -} diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json new file mode 100644 index 0000000000..5b297a614a --- /dev/null +++ b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esnext.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/package.json index a7319e298b..4d25223b17 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/package.json @@ -5,7 +5,7 @@ "description": "Work in progress OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -39,9 +39,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.all.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.all.json index 1a2f9e96aa..06c5491334 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.all.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json deleted file mode 100644 index 90055f46c9..0000000000 --- a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esm2015.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-api-metrics/tsconfig.esm2015.json" - } - ] -} diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esnext.json b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esnext.json new file mode 100644 index 0000000000..5b297a614a --- /dev/null +++ b/experimental/packages/opentelemetry-sdk-metrics-base/tsconfig.esnext.json @@ -0,0 +1,16 @@ +{ + "extends": "../../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esnext.json" + } + ] +} diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json index e7c2b6886c..27e09c3056 100644 --- a/experimental/tsconfig.json +++ b/experimental/tsconfig.json @@ -3,13 +3,13 @@ "files": [], "references": [ { - "path": "packages/opentelemetry-api-metrics/tsconfig.all.json" + "path": "packages/opentelemetry-api-metrics" }, { "path": "packages/opentelemetry-exporter-metrics-otlp-grpc" }, { - "path": "packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.all.json" + "path": "packages/opentelemetry-exporter-metrics-otlp-http" }, { "path": "packages/opentelemetry-exporter-metrics-otlp-proto" @@ -18,7 +18,7 @@ "path": "packages/opentelemetry-exporter-prometheus" }, { - "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.all.json" + "path": "packages/opentelemetry-instrumentation-fetch" }, { "path": "packages/opentelemetry-instrumentation-grpc" @@ -27,13 +27,13 @@ "path": "packages/opentelemetry-instrumentation-http" }, { - "path": "packages/opentelemetry-instrumentation-xml-http-request/tsconfig.all.json" + "path": "packages/opentelemetry-instrumentation-xml-http-request" }, { - "path": "packages/opentelemetry-instrumentation/tsconfig.all.json" + "path": "packages/opentelemetry-instrumentation" }, { - "path": "packages/opentelemetry-sdk-metrics-base/tsconfig.all.json" + "path": "packages/opentelemetry-sdk-metrics-base" }, { "path": "packages/opentelemetry-sdk-node" diff --git a/packages/exporter-trace-otlp-http/package.json b/packages/exporter-trace-otlp-http/package.json index 56d2ed0ce3..166db5a471 100644 --- a/packages/exporter-trace-otlp-http/package.json +++ b/packages/exporter-trace-otlp-http/package.json @@ -4,13 +4,13 @@ "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "scripts": { @@ -46,9 +46,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/exporter-trace-otlp-http/tsconfig.all.json b/packages/exporter-trace-otlp-http/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/exporter-trace-otlp-http/tsconfig.all.json +++ b/packages/exporter-trace-otlp-http/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/exporter-trace-otlp-http/tsconfig.esm2015.json b/packages/exporter-trace-otlp-http/tsconfig.esm2015.json deleted file mode 100644 index 06f2e5a873..0000000000 --- a/packages/exporter-trace-otlp-http/tsconfig.esm2015.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/packages/exporter-trace-otlp-http/tsconfig.esnext.json b/packages/exporter-trace-otlp-http/tsconfig.esnext.json new file mode 100644 index 0000000000..65a918cf6b --- /dev/null +++ b/packages/exporter-trace-otlp-http/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 3f479298be..7f108baa38 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -37,9 +37,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json b/packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json similarity index 50% rename from packages/opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json rename to packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json index e95e9f15fa..a16a4467ad 100644 --- a/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json +++ b/packages/opentelemetry-context-zone-peer-dep/tsconfig.esnext.json @@ -1,9 +1,9 @@ { - "extends": "../../tsconfig.base.esm2015.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" }, "files": [ "node_modules/zone.js/dist/zone.js.d.ts" diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index c827a5d122..3425a2ba92 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -34,9 +34,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-context-zone/tsconfig.all.json b/packages/opentelemetry-context-zone/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-context-zone/tsconfig.all.json +++ b/packages/opentelemetry-context-zone/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-context-zone/tsconfig.esm2015.json b/packages/opentelemetry-context-zone/tsconfig.esnext.json similarity index 54% rename from packages/opentelemetry-context-zone/tsconfig.esm2015.json rename to packages/opentelemetry-context-zone/tsconfig.esnext.json index 862efe751b..65674b8c67 100644 --- a/packages/opentelemetry-context-zone/tsconfig.esm2015.json +++ b/packages/opentelemetry-context-zone/tsconfig.esnext.json @@ -1,16 +1,16 @@ { - "extends": "../../tsconfig.base.esm2015.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" }, "include": [ "src/**/*.ts" ], "references": [ { - "path": "../opentelemetry-context-zone-peer-dep/tsconfig.esm2015.json" + "path": "../opentelemetry-context-zone-peer-dep/tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index d70a9e64bf..303f4adaaa 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -4,11 +4,11 @@ "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", @@ -48,9 +48,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-core/tsconfig.all.json b/packages/opentelemetry-core/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-core/tsconfig.all.json +++ b/packages/opentelemetry-core/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-core/tsconfig.esm2015.json b/packages/opentelemetry-core/tsconfig.esnext.json similarity index 54% rename from packages/opentelemetry-core/tsconfig.esm2015.json rename to packages/opentelemetry-core/tsconfig.esnext.json index 3f985ee8b6..3931d37fb6 100644 --- a/packages/opentelemetry-core/tsconfig.esm2015.json +++ b/packages/opentelemetry-core/tsconfig.esnext.json @@ -1,16 +1,16 @@ { - "extends": "../../tsconfig.base.esm2015.json", + "extends": "../../tsconfig.base.esnext.json", "compilerOptions": { "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" }, "include": [ "src/**/*.ts" ], "references": [ { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" + "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 9e67e4a87e..0ee6a22fd9 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -4,13 +4,13 @@ "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "scripts": { @@ -44,9 +44,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.all.json b/packages/opentelemetry-exporter-zipkin/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.all.json +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json deleted file mode 100644 index 6e8bbb4a5f..0000000000 --- a/packages/opentelemetry-exporter-zipkin/tsconfig.esm2015.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" - } - ] -} diff --git a/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json b/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json new file mode 100644 index 0000000000..a8750d0b62 --- /dev/null +++ b/packages/opentelemetry-exporter-zipkin/tsconfig.esnext.json @@ -0,0 +1,25 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" + } + ] +} diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index c143e3c7a2..ca423f78d6 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry B3 propagator provides context propagation for systems that are using the B3 header format", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -36,9 +36,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-propagator-b3/tsconfig.all.json b/packages/opentelemetry-propagator-b3/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-propagator-b3/tsconfig.all.json +++ b/packages/opentelemetry-propagator-b3/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-propagator-b3/tsconfig.esm2015.json b/packages/opentelemetry-propagator-b3/tsconfig.esm2015.json deleted file mode 100644 index f5d6279909..0000000000 --- a/packages/opentelemetry-propagator-b3/tsconfig.esm2015.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm2015.json" - } - ] -} diff --git a/packages/opentelemetry-propagator-b3/tsconfig.esnext.json b/packages/opentelemetry-propagator-b3/tsconfig.esnext.json new file mode 100644 index 0000000000..14b360b653 --- /dev/null +++ b/packages/opentelemetry-propagator-b3/tsconfig.esnext.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esnext.json" + } + ] +} diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 39441bf0ed..7c7d3c4808 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -4,11 +4,11 @@ "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", @@ -43,9 +43,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-resources/tsconfig.all.json b/packages/opentelemetry-resources/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-resources/tsconfig.all.json +++ b/packages/opentelemetry-resources/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-resources/tsconfig.esm2015.json b/packages/opentelemetry-resources/tsconfig.esm2015.json deleted file mode 100644 index 6a8b824e52..0000000000 --- a/packages/opentelemetry-resources/tsconfig.esm2015.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" - } - ] -} diff --git a/packages/opentelemetry-resources/tsconfig.esnext.json b/packages/opentelemetry-resources/tsconfig.esnext.json new file mode 100644 index 0000000000..458395ca17 --- /dev/null +++ b/packages/opentelemetry-resources/tsconfig.esnext.json @@ -0,0 +1,19 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index bcd301a7d4..c5e3ca7ed2 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -4,11 +4,11 @@ "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "browser": { "./src/platform/index.ts": "./src/platform/browser/index.ts", "./build/esm/platform/index.js": "./build/esm/platform/browser/index.js", - "./build/esm2015/platform/index.js": "./build/esm2015/platform/browser/index.js", + "./build/esnext/platform/index.js": "./build/esnext/platform/browser/index.js", "./build/src/platform/index.js": "./build/src/platform/browser/index.js" }, "types": "build/src/index.d.ts", @@ -46,9 +46,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.all.json b/packages/opentelemetry-sdk-trace-base/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.all.json +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json deleted file mode 100644 index b3d6da6c4c..0000000000 --- a/packages/opentelemetry-sdk-trace-base/tsconfig.esm2015.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" - } - ] -} diff --git a/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json b/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json new file mode 100644 index 0000000000..09baee3e80 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-base/tsconfig.esnext.json @@ -0,0 +1,22 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-core/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" + } + ] +} diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 4b49e74670..aac861079e 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -39,9 +39,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.all.json b/packages/opentelemetry-sdk-trace-web/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.all.json +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json deleted file mode 100644 index d9c25d1fca..0000000000 --- a/packages/opentelemetry-sdk-trace-web/tsconfig.esm2015.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-context-zone/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-core/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-propagator-b3/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esm2015.json" - }, - { - "path": "../opentelemetry-semantic-conventions/tsconfig.esm2015.json" - } - ] -} diff --git a/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json b/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json new file mode 100644 index 0000000000..0dd807e866 --- /dev/null +++ b/packages/opentelemetry-sdk-trace-web/tsconfig.esnext.json @@ -0,0 +1,31 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-context-zone/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-core/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-propagator-b3/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-resources/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-sdk-trace-base/tsconfig.esnext.json" + }, + { + "path": "../opentelemetry-semantic-conventions/tsconfig.esnext.json" + } + ] +} diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index 116e34923b..f87cd86761 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -4,7 +4,7 @@ "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", - "esm2015": "build/esm2015/index.js", + "esnext": "build/esnext/index.js", "types": "build/src/index.d.ts", "repository": "open-telemetry/opentelemetry-js", "scripts": { @@ -35,9 +35,9 @@ "build/esm/**/*.js", "build/esm/**/*.js.map", "build/esm/**/*.d.ts", - "build/esm2015/**/*.js", - "build/esm2015/**/*.js.map", - "build/esm2015/**/*.d.ts", + "build/esnext/**/*.js", + "build/esnext/**/*.js.map", + "build/esnext/**/*.d.ts", "build/src/**/*.js", "build/src/**/*.js.map", "build/src/**/*.d.ts", diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.all.json b/packages/opentelemetry-semantic-conventions/tsconfig.all.json index 7414597cb3..4d28a993d3 100644 --- a/packages/opentelemetry-semantic-conventions/tsconfig.all.json +++ b/packages/opentelemetry-semantic-conventions/tsconfig.all.json @@ -4,6 +4,6 @@ "references": [ { "path": "./tsconfig.json" }, { "path": "./tsconfig.esm.json" }, - { "path": "./tsconfig.esm2015.json" } + { "path": "./tsconfig.esnext.json" } ] } diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json b/packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json deleted file mode 100644 index 06f2e5a873..0000000000 --- a/packages/opentelemetry-semantic-conventions/tsconfig.esm2015.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm2015.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm2015", - "tsBuildInfoFile": "build/esm2015/tsconfig.esm2015.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ] -} diff --git a/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json b/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json new file mode 100644 index 0000000000..65a918cf6b --- /dev/null +++ b/packages/opentelemetry-semantic-conventions/tsconfig.esnext.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.base.esnext.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esnext", + "tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ] +} diff --git a/tsconfig.base.esm2015.json b/tsconfig.base.esm2015.json deleted file mode 100644 index 39d76c9a7e..0000000000 --- a/tsconfig.base.esm2015.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "./tsconfig.base.json", - "compilerOptions": { - "module": "es6", - "target": "es6", - "moduleResolution": "node" - }, -} diff --git a/tsconfig.base.esnext.json b/tsconfig.base.esnext.json new file mode 100644 index 0000000000..7875da812e --- /dev/null +++ b/tsconfig.base.esnext.json @@ -0,0 +1,9 @@ +{ + "extends": "./tsconfig.base.json", + "compilerOptions": { + "module": "esnext", + // target should be aligned with tsconfig.base.json + "target": "es2017", + "moduleResolution": "node" + }, +} diff --git a/tsconfig.json b/tsconfig.json index 2a2648786c..e6b6a20a30 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -47,7 +47,7 @@ "path": "packages/exporter-trace-otlp-grpc" }, { - "path": "packages/exporter-trace-otlp-http/tsconfig.all.json" + "path": "packages/exporter-trace-otlp-http" }, { "path": "packages/exporter-trace-otlp-proto" @@ -56,40 +56,40 @@ "path": "packages/opentelemetry-context-async-hooks" }, { - "path": "packages/opentelemetry-context-zone-peer-dep/tsconfig.all.json" + "path": "packages/opentelemetry-context-zone-peer-dep" }, { - "path": "packages/opentelemetry-context-zone/tsconfig.all.json" + "path": "packages/opentelemetry-context-zone" }, { - "path": "packages/opentelemetry-core/tsconfig.all.json" + "path": "packages/opentelemetry-core" }, { "path": "packages/opentelemetry-exporter-jaeger" }, { - "path": "packages/opentelemetry-exporter-zipkin/tsconfig.all.json" + "path": "packages/opentelemetry-exporter-zipkin" }, { - "path": "packages/opentelemetry-propagator-b3/tsconfig.all.json" + "path": "packages/opentelemetry-propagator-b3" }, { "path": "packages/opentelemetry-propagator-jaeger" }, { - "path": "packages/opentelemetry-resources/tsconfig.all.json" + "path": "packages/opentelemetry-resources" }, { - "path": "packages/opentelemetry-sdk-trace-base/tsconfig.all.json" + "path": "packages/opentelemetry-sdk-trace-base" }, { "path": "packages/opentelemetry-sdk-trace-node" }, { - "path": "packages/opentelemetry-sdk-trace-web/tsconfig.all.json" + "path": "packages/opentelemetry-sdk-trace-web" }, { - "path": "packages/opentelemetry-semantic-conventions/tsconfig.all.json" + "path": "packages/opentelemetry-semantic-conventions" }, { "path": "packages/opentelemetry-shim-opentracing" From def9ba3ea59d29b66085f0532ca62ecd85671cca Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Thu, 24 Feb 2022 13:56:08 -0500 Subject: [PATCH 2/2] fix(deps): use 1.x trace otlp http exporter (#2788) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Gerhard Stöbich --- packages/exporter-trace-otlp-grpc/package.json | 2 +- packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts | 4 +--- packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts | 3 +++ packages/exporter-trace-otlp-proto/package.json | 2 +- .../exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts | 3 +-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/exporter-trace-otlp-grpc/package.json b/packages/exporter-trace-otlp-grpc/package.json index dba48e1593..d089e1d441 100644 --- a/packages/exporter-trace-otlp-grpc/package.json +++ b/packages/exporter-trace-otlp-grpc/package.json @@ -69,7 +69,7 @@ "@grpc/grpc-js": "^1.3.7", "@grpc/proto-loader": "^0.6.4", "@opentelemetry/core": "1.0.1", - "@opentelemetry/exporter-trace-otlp-http": "0.27.0", + "@opentelemetry/exporter-trace-otlp-http": "1.0.1", "@opentelemetry/resources": "1.0.1", "@opentelemetry/sdk-trace-base": "1.0.1" } diff --git a/packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts b/packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts index a992a4f259..28da1ae341 100644 --- a/packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts +++ b/packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts @@ -75,7 +75,6 @@ export abstract class OTLPExporterNodeBase< } onInit(config: OTLPExporterConfigNode): void { - this._isShutdown = false; // defer to next tick and lazy load to avoid loading grpc too early // and making this impossible to be instrumented setImmediate(() => { @@ -90,7 +89,7 @@ export abstract class OTLPExporterNodeBase< onSuccess: () => void, onError: (error: otlpTypes.OTLPExporterError) => void ): void { - if (this._isShutdown) { + if (this._shutdownOnce.isCalled) { diag.debug('Shutdown already started. Cannot send objects'); return; } @@ -110,7 +109,6 @@ export abstract class OTLPExporterNodeBase< } onShutdown(): void { - this._isShutdown = true; if (this.serviceClient) { this.serviceClient.close(); } diff --git a/packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts b/packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts index 2dc095bcc5..1679aae11e 100644 --- a/packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts +++ b/packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts @@ -109,6 +109,9 @@ export abstract class OTLPExporterBase< return this._shutdownOnce.call(); } + /** + * Called by _shutdownOnce with BindOnceFuture + */ private _shutdown(): Promise { diag.debug('shutdown started'); this.onShutdown(); diff --git a/packages/exporter-trace-otlp-proto/package.json b/packages/exporter-trace-otlp-proto/package.json index 7e3a58e522..926ff494ad 100644 --- a/packages/exporter-trace-otlp-proto/package.json +++ b/packages/exporter-trace-otlp-proto/package.json @@ -68,7 +68,7 @@ "dependencies": { "@grpc/proto-loader": "^0.6.4", "@opentelemetry/core": "1.0.1", - "@opentelemetry/exporter-trace-otlp-http": "0.27.0", + "@opentelemetry/exporter-trace-otlp-http": "1.0.1", "@opentelemetry/resources": "1.0.1", "@opentelemetry/sdk-trace-base": "1.0.1", "protobufjs": "^6.9.0" diff --git a/packages/exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts b/packages/exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts index 19ddc423bf..eb9d6b766c 100644 --- a/packages/exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts +++ b/packages/exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts @@ -61,7 +61,6 @@ export abstract class OTLPExporterNodeBase< } override onInit(config: OTLPExporterNodeConfigBase): void { - this._isShutdown = false; // defer to next tick and lazy load to avoid loading protobufjs too early // and making this impossible to be instrumented setImmediate(() => { @@ -76,7 +75,7 @@ export abstract class OTLPExporterNodeBase< onSuccess: () => void, onError: (error: otlpTypes.OTLPExporterError) => void ): void { - if (this._isShutdown) { + if (this._shutdownOnce.isCalled) { diag.debug('Shutdown already started. Cannot send objects'); return; }