diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index e4a4a6d90ee..6352235f8bf 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -103,7 +103,7 @@ jobs: with: path: | experimental/node_modules - experimental/packages/*/node_modules + experimental/*/*/node_modules key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('experimental/**/package.json') }} - name: Bootstrap @@ -143,7 +143,7 @@ jobs: with: path: | experimental/node_modules - experimental/packages/*/node_modules + experimental/*/*/node_modules key: browser-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }} - name: Bootstrap diff --git a/.github/workflows/w3c-integration-test.yml b/.github/workflows/w3c-integration-test.yml index 4b514356134..f00cacf0c1e 100644 --- a/.github/workflows/w3c-integration-test.yml +++ b/.github/workflows/w3c-integration-test.yml @@ -22,7 +22,6 @@ jobs: package-lock.json packages/*/package-lock.json benchmark/*/package-lock.json - backwards-compatability/*/package-lock.json metapackages/*/package-lock.json packages/*/package-lock.json integration-tests/*/package-lock.json diff --git a/.gitmodules b/.gitmodules index f66e08a1b88..ac506a776f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "packages/opentelemetry-exporter-otlp-grpc/protos"] - path = packages/opentelemetry-exporter-otlp-grpc/protos +[submodule "experimental/packages/opentelemetry-exporter-otlp-proto/protos"] + path = experimental/packages/opentelemetry-exporter-otlp-proto/protos url = /~https://github.com/open-telemetry/opentelemetry-proto.git -[submodule "packages/opentelemetry-exporter-otlp-proto/protos"] - path = packages/opentelemetry-exporter-otlp-proto/protos +[submodule "experimental/packages/opentelemetry-exporter-otlp-grpc/protos"] + path = experimental/packages/opentelemetry-exporter-otlp-grpc/protos url = /~https://github.com/open-telemetry/opentelemetry-proto.git diff --git a/CHANGELOG.md b/CHANGELOG.md index b361fd135b6..48c1bb849f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,96 @@ All notable changes to this project will be documented in this file. ## Unreleased +## 1.0.0 + +No changes + +## 0.26.0 + +### :boom: Breaking Change + +* `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-otlp-grpc`, `opentelemetry-exporter-otlp-http`, `opentelemetry-exporter-otlp-proto` + * [#2476](/~https://github.com/open-telemetry/opentelemetry-js/pull/2476) chore!: rename collector exporters ([@dyladan](/~https://github.com/dyladan)) +* `opentelemetry-core`, `opentelemetry-instrumentation-grpc`, `opentelemetry-sdk-trace-base`, `opentelemetry-shim-opentracing` + * [#2429](/~https://github.com/open-telemetry/opentelemetry-js/pull/2429) fix!: remove 'Http' from W3C propagator names ([@aabmass](/~https://github.com/aabmass)) + +### :rocket: (Enhancement) + +* `opentelemetry-core`, `opentelemetry-sdk-trace-base` + * [#2430](/~https://github.com/open-telemetry/opentelemetry-js/pull/2430) feat(opentelemetry-sdk-trace-base): implemented general limits of attributes ([@banothurameshnaik](/~https://github.com/banothurameshnaik)) + * [#2418](/~https://github.com/open-telemetry/opentelemetry-js/pull/2418) feat(opentelemetry-sdk-trace-base): implemented option to limit length of values of attributes ([@banothurameshnaik](/~https://github.com/banothurameshnaik)) +* `opentelemetry-instrumentation` + * [#2450](/~https://github.com/open-telemetry/opentelemetry-js/pull/2450) fix: handle missing package.json file when checking for version ([@nozik](/~https://github.com/nozik)) +* `opentelemetry-semantic-conventions` + * [#2456](/~https://github.com/open-telemetry/opentelemetry-js/pull/2456) feat: upgrade semantic conventions to the latest 1.6.1 version ([@weyert](/~https://github.com/weyert)) +* `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector` + * [#2438](/~https://github.com/open-telemetry/opentelemetry-js/pull/2438) feat: OTEL_EXPORTER_OTLP_ENDPOINT append version and signal ([@longility](/~https://github.com/longility)) + +### :bug: (Bug Fix) + +* Other + * [#2494](/~https://github.com/open-telemetry/opentelemetry-js/pull/2494) fix: remove setting http.route in http span attributes ([@mustafain117](/~https://github.com/mustafain117)) +* `opentelemetry-instrumentation-fetch` + * [#2426](/~https://github.com/open-telemetry/opentelemetry-js/pull/2426) fix(opentelemetry-instrumentation-fetch): fixed override of headers ([@philipszalla](/~https://github.com/philipszalla)) +* `opentelemetry-sdk-trace-base` + * [#2434](/~https://github.com/open-telemetry/opentelemetry-js/pull/2434) fix: ReferenceError when OTEL_TRACES_SAMPLER used without OTEL_TRACES_SAMPLER_ARG ([@hermanbanken](/~https://github.com/hermanbanken)) + +### :books: (Refine Doc) + +* [#2478](/~https://github.com/open-telemetry/opentelemetry-js/pull/2478) Update links to packages moved to experimental ([@jessitron](/~https://github.com/jessitron)) +* [#2463](/~https://github.com/open-telemetry/opentelemetry-js/pull/2463) docs(README): Fix links in README.md ([@JamesJHPark](/~https://github.com/JamesJHPark)) +* [#2437](/~https://github.com/open-telemetry/opentelemetry-js/pull/2437) docs(examples): updated examples readme links ([@banothurameshnaik](/~https://github.com/banothurameshnaik)) +* [#2421](/~https://github.com/open-telemetry/opentelemetry-js/pull/2421) docs(website): support GH page links to canonical src ([@chalin](/~https://github.com/chalin)) +* [#2408](/~https://github.com/open-telemetry/opentelemetry-js/pull/2408) docs: make link to exporters filter only exporters ([@Rauno56](/~https://github.com/Rauno56)) +* [#2297](/~https://github.com/open-telemetry/opentelemetry-js/pull/2297) eslint configuration for getting-started examples ([@alisabzevari](/~https://github.com/alisabzevari)) + +### :house: (Internal) + +* `opentelemetry-exporter-otlp-http` + * [#2490](/~https://github.com/open-telemetry/opentelemetry-js/pull/2490) chore: mark otlp exporters experimental ([@dyladan](/~https://github.com/dyladan)) + * [#2491](/~https://github.com/open-telemetry/opentelemetry-js/pull/2491) fix: remove usage of serviceName property in tests for otel collector ([@mustafain117](/~https://github.com/mustafain117)) +* `opentelemetry-sdk-node` + * [#2473](/~https://github.com/open-telemetry/opentelemetry-js/pull/2473) chore: move sdk-node to experimental ([@dyladan](/~https://github.com/dyladan)) + * [#2453](/~https://github.com/open-telemetry/opentelemetry-js/pull/2453) chore(sdk-node): fix lint warnings ([@alisabzevari](/~https://github.com/alisabzevari)) +* Other + * [#2469](/~https://github.com/open-telemetry/opentelemetry-js/pull/2469) Drop website_docs folder ([@chalin](/~https://github.com/chalin)) + * [#2474](/~https://github.com/open-telemetry/opentelemetry-js/pull/2474) chore: move missed test file to its package ([@dyladan](/~https://github.com/dyladan)) + * [#2435](/~https://github.com/open-telemetry/opentelemetry-js/pull/2435) chore: simplify unit test cache ([@dyladan](/~https://github.com/dyladan)) +* `opentelemetry-context-zone`, `opentelemetry-core`, `opentelemetry-exporter-collector-grpc`, `opentelemetry-exporter-collector-proto`, `opentelemetry-exporter-collector`, `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-instrumentation-fetch`, `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-xml-http-request`, `opentelemetry-propagator-b3`, `opentelemetry-propagator-jaeger`, `opentelemetry-resources`, `opentelemetry-sdk-metrics-base`, `opentelemetry-sdk-node`, `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-web` + * [#2462](/~https://github.com/open-telemetry/opentelemetry-js/pull/2462) chore: split stable and experimental packages into groups using directories ([@dyladan](/~https://github.com/dyladan)) +* `opentelemetry-instrumentation-http` + * [#2126](/~https://github.com/open-telemetry/opentelemetry-js/pull/2126) feat(instrumentation-http): add diag debug on http request events ([@Asafb26](/~https://github.com/Asafb26)) + * [#2455](/~https://github.com/open-telemetry/opentelemetry-js/pull/2455) chore(instrumentation-http): fix lint warnings ([@alisabzevari](/~https://github.com/alisabzevari)) +* `opentelemetry-instrumentation-fetch` + * [#2454](/~https://github.com/open-telemetry/opentelemetry-js/pull/2454) chore(instrumentation-fetch): fix lint warnings ([@alisabzevari](/~https://github.com/alisabzevari)) +* `opentelemetry-exporter-collector` + * [#2452](/~https://github.com/open-telemetry/opentelemetry-js/pull/2452) chore(exporter-collector): fix lint warnings ([@alisabzevari](/~https://github.com/alisabzevari)) +* `opentelemetry-sdk-trace-base`, `opentelemetry-sdk-trace-node` + * [#2446](/~https://github.com/open-telemetry/opentelemetry-js/pull/2446) chore(sdk-trace): fix lint warnings ([@alisabzevari](/~https://github.com/alisabzevari)) +* `opentelemetry-exporter-prometheus`, `opentelemetry-exporter-zipkin`, `opentelemetry-shim-opentracing` + * [#2447](/~https://github.com/open-telemetry/opentelemetry-js/pull/2447) chore(exporter): fix lint warnings ([@alisabzevari](/~https://github.com/alisabzevari)) + +### Committers: 18 + +* Aaron Abbott ([@aabmass](/~https://github.com/aabmass)) +* Ali Sabzevari ([@alisabzevari](/~https://github.com/alisabzevari)) +* Asaf Ben Aharon ([@Asafb26](/~https://github.com/Asafb26)) +* Banothu Ramesh Naik ([@banothurameshnaik](/~https://github.com/banothurameshnaik)) +* Daniel Dyla ([@dyladan](/~https://github.com/dyladan)) +* Gerhard Stöbich ([@Flarna](/~https://github.com/Flarna)) +* Herman ([@hermanbanken](/~https://github.com/hermanbanken)) +* James ([@JamesJHPark](/~https://github.com/JamesJHPark)) +* Jessica Kerr ([@jessitron](/~https://github.com/jessitron)) +* Long Mai ([@longility](/~https://github.com/longility)) +* Mustafain Ali Khan ([@mustafain117](/~https://github.com/mustafain117)) +* Patrice Chalin ([@chalin](/~https://github.com/chalin)) +* Philip Szalla ([@philipszalla](/~https://github.com/philipszalla)) +* Ran Nozik ([@nozik](/~https://github.com/nozik)) +* Rauno Viskus ([@Rauno56](/~https://github.com/Rauno56)) +* Siim Kallas ([@seemk](/~https://github.com/seemk)) +* Weyert de Boer ([@weyert](/~https://github.com/weyert)) +* legendecas ([@legendecas](/~https://github.com/legendecas)) + ## 0.25.0 ### :boom: Breaking Change @@ -20,6 +110,8 @@ All notable changes to this project will be documented in this file. ### :bug: (Bug Fix) +* `opentelemetry-instrumentation-grpc`, `opentelemetry-instrumentation-http`, `opentelemetry-instrumentation-jaeger`, `opentelemetry-exporter-zipkin`, `opentelemetry-sdk-trace-base` + * [#2499](/~https://github.com/open-telemetry/opentelemetry-js/pull/2499) fix: 2389- replaced logger unformatted strings with template literals ([@PaurushGarg](/~https://github.com/PaurushGarg)) * `opentelemetry-instrumentation-fetch` * [#2411](/~https://github.com/open-telemetry/opentelemetry-js/pull/2411) fix(instrumentation-fetch): `fetch(string, Request)` silently drops request body ([@t2t2](/~https://github.com/t2t2)) * `opentelemetry-sdk-trace-base` diff --git a/README.md b/README.md index d0e06cc564e..d5e2f0d9173 100644 --- a/README.md +++ b/README.md @@ -47,23 +47,25 @@ This is the JavaScript version of [OpenTelemetry](https://opentelemetry.io/), a ## Compatibility Matrix -| API Version | Core version | Contrib Version | -| ----------- |--------------|-------------------------| -| 1.0.x | 0.25.x | ------ | -| 1.0.x | 0.24.x | 0.24.x | -| 1.0.x | 0.23.x | 0.23.x | -| 1.0.x | 0.22.x | 0.22.x | -| 0.21.x | 0.21.x | 0.21.x | -| 0.20.x | 0.20.x | 0.20.x | -| v1.0.0-rc.3 | 0.19.x | 0.16.x | -| 0.18.x | 0.18.x | 0.14.x | -| | 0.17.x | ------ | -| | 0.16.x | ------ | -| | 0.15.x | 0.13.x | -| | 0.14.x | 0.12.x | -| | 0.13.x | ------ | -| | 0.12.x | 0.11.x | -| | 0.11.x | 0.10.x | +| API Version | Core version | Experimental Packages | Contrib Version | +| ----------- |--------------| --------------------- |-------------------------| +| 1.0.x | 1.x | 0.26.x | ------ | +| 1.0.x | 0.26.x | ----- | ------ | +| 1.0.x | 0.25.x | ----- | ------ | +| 1.0.x | 0.24.x | ----- | 0.24.x | +| 1.0.x | 0.23.x | ----- | 0.23.x | +| 1.0.x | 0.22.x | ----- | 0.22.x | +| 0.21.x | 0.21.x | ----- | 0.21.x | +| 0.20.x | 0.20.x | ----- | 0.20.x | +| v1.0.0-rc.3 | 0.19.x | ----- | 0.16.x | +| 0.18.x | 0.18.x | ----- | 0.14.x | +| | 0.17.x | ----- | ------ | +| | 0.16.x | ----- | ------ | +| | 0.15.x | ----- | 0.13.x | +| | 0.14.x | ----- | 0.12.x | +| | 0.13.x | ----- | ------ | +| | 0.12.x | ----- | 0.11.x | +| | 0.11.x | ----- | 0.10.x | ## Versioning diff --git a/examples/otlp-exporter-node/README.md b/examples/otlp-exporter-node/README.md index abfa241965c..21fea5422f0 100644 --- a/examples/otlp-exporter-node/README.md +++ b/examples/otlp-exporter-node/README.md @@ -1,8 +1,8 @@ # Overview -This example shows how to use [@opentelemetry/exporter-otlp-http](/~https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application. +This example shows how to use [@opentelemetry/exporter-otlp-http](/~https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) to instrument a simple Node.js application. -This example will export spans data simultaneously using [Exporter Collector](/~https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](/~https://github.com/open-telemetry/opentelemetry-proto). +This example will export spans data simultaneously using [Exporter Collector](/~https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-otlp-http) and grpc. It will use [proto format](/~https://github.com/open-telemetry/opentelemetry-proto). ## Installation diff --git a/backwards-compatability/node10/index.ts b/experimental/backwards-compatability/node10/index.ts similarity index 100% rename from backwards-compatability/node10/index.ts rename to experimental/backwards-compatability/node10/index.ts diff --git a/backwards-compatability/node10/package.json b/experimental/backwards-compatability/node10/package.json similarity index 64% rename from backwards-compatability/node10/package.json rename to experimental/backwards-compatability/node10/package.json index 44969816b7a..6f1fbd01829 100644 --- a/backwards-compatability/node10/package.json +++ b/experimental/backwards-compatability/node10/package.json @@ -1,15 +1,15 @@ { "name": "backcompat-node10", - "version": "0.25.0", + "version": "0.26.0", "private": true, "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK", "main": "index.js", "scripts": { - "test:backcompat": "tsc --noEmit index.ts" + "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts" }, "dependencies": { - "@opentelemetry/sdk-node": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0" + "@opentelemetry/sdk-node": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0" }, "devDependencies": { "@types/node": "10.17.60", diff --git a/backwards-compatability/node8/tsconfig.json b/experimental/backwards-compatability/node10/tsconfig.json similarity index 58% rename from backwards-compatability/node8/tsconfig.json rename to experimental/backwards-compatability/node10/tsconfig.json index 557ca620428..049617e92fe 100644 --- a/backwards-compatability/node8/tsconfig.json +++ b/experimental/backwards-compatability/node10/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.es5.json", + "extends": "../../../tsconfig.es5.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -9,7 +9,7 @@ ], "references": [ { - "path": "../../packages/opentelemetry-sdk-trace-base" + "path": "../../packages/opentelemetry-sdk-node" } ] } diff --git a/backwards-compatability/node12/index.ts b/experimental/backwards-compatability/node12/index.ts similarity index 100% rename from backwards-compatability/node12/index.ts rename to experimental/backwards-compatability/node12/index.ts diff --git a/backwards-compatability/node12/package.json b/experimental/backwards-compatability/node12/package.json similarity index 64% rename from backwards-compatability/node12/package.json rename to experimental/backwards-compatability/node12/package.json index afbf0d8b4a2..ca9bc34ae72 100644 --- a/backwards-compatability/node12/package.json +++ b/experimental/backwards-compatability/node12/package.json @@ -1,15 +1,15 @@ { "name": "backcompat-node12", - "version": "0.25.0", + "version": "0.26.0", "private": true, "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK", "main": "index.js", "scripts": { - "test:backcompat": "tsc --noEmit index.ts" + "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts" }, "dependencies": { - "@opentelemetry/sdk-node": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0" + "@opentelemetry/sdk-node": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0" }, "devDependencies": { "@types/node": "12.20.20", diff --git a/backwards-compatability/node10/tsconfig.json b/experimental/backwards-compatability/node12/tsconfig.json similarity index 58% rename from backwards-compatability/node10/tsconfig.json rename to experimental/backwards-compatability/node12/tsconfig.json index 557ca620428..049617e92fe 100644 --- a/backwards-compatability/node10/tsconfig.json +++ b/experimental/backwards-compatability/node12/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.es5.json", + "extends": "../../../tsconfig.es5.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -9,7 +9,7 @@ ], "references": [ { - "path": "../../packages/opentelemetry-sdk-trace-base" + "path": "../../packages/opentelemetry-sdk-node" } ] } diff --git a/backwards-compatability/node8/index.ts b/experimental/backwards-compatability/node8/index.ts similarity index 100% rename from backwards-compatability/node8/index.ts rename to experimental/backwards-compatability/node8/index.ts diff --git a/backwards-compatability/node8/package.json b/experimental/backwards-compatability/node8/package.json similarity index 64% rename from backwards-compatability/node8/package.json rename to experimental/backwards-compatability/node8/package.json index 37a66f6652a..e5607fcf77d 100644 --- a/backwards-compatability/node8/package.json +++ b/experimental/backwards-compatability/node8/package.json @@ -1,15 +1,15 @@ { "name": "backcompat-node8", - "version": "0.25.0", + "version": "0.26.0", "private": true, "description": "Backwards compatability app for node8 types and the OpenTelemetry Node.js SDK", "main": "index.js", "scripts": { - "test:backcompat": "tsc --noEmit index.ts" + "test:backcompat": "tsc --noEmit index.ts && tsc --noEmit --esModuleInterop index.ts" }, "dependencies": { - "@opentelemetry/sdk-node": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0" + "@opentelemetry/sdk-node": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0" }, "devDependencies": { "@types/node": "8.10.66", diff --git a/backwards-compatability/node12/tsconfig.json b/experimental/backwards-compatability/node8/tsconfig.json similarity index 58% rename from backwards-compatability/node12/tsconfig.json rename to experimental/backwards-compatability/node8/tsconfig.json index 557ca620428..049617e92fe 100644 --- a/backwards-compatability/node12/tsconfig.json +++ b/experimental/backwards-compatability/node8/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.es5.json", + "extends": "../../../tsconfig.es5.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -9,7 +9,7 @@ ], "references": [ { - "path": "../../packages/opentelemetry-sdk-trace-base" + "path": "../../packages/opentelemetry-sdk-node" } ] } diff --git a/experimental/lerna.json b/experimental/lerna.json index 99276cc155d..dd8377ce722 100644 --- a/experimental/lerna.json +++ b/experimental/lerna.json @@ -1,8 +1,9 @@ { "lerna": "3.13.4", - "version": "0.25.0", + "version": "0.26.0", "npmClient": "npm", "packages": [ - "packages/*" + "packages/*", + "backwards-compatability/*" ] } diff --git a/experimental/packages/opentelemetry-api-metrics/package.json b/experimental/packages/opentelemetry-api-metrics/package.json index 83950b2687b..5cb9e1503b4 100644 --- a/experimental/packages/opentelemetry-api-metrics/package.json +++ b/experimental/packages/opentelemetry-api-metrics/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/api-metrics", - "version": "0.25.0", + "version": "0.26.0", "description": "Public metrics API for OpenTelemetry", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-exporter-otlp-grpc/.eslintignore b/experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintignore similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/.eslintignore rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintignore diff --git a/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js similarity index 71% rename from packages/opentelemetry-exporter-otlp-proto/.eslintrc.js rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js index fc4d0381204..3ed0fbeba38 100644 --- a/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-exporter-otlp-grpc/.npmignore b/experimental/packages/opentelemetry-exporter-otlp-grpc/.npmignore similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/.npmignore rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.npmignore diff --git a/packages/opentelemetry-exporter-otlp-grpc/LICENSE b/experimental/packages/opentelemetry-exporter-otlp-grpc/LICENSE similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/LICENSE rename to experimental/packages/opentelemetry-exporter-otlp-grpc/LICENSE diff --git a/packages/opentelemetry-exporter-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-otlp-grpc/README.md similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/README.md rename to experimental/packages/opentelemetry-exporter-otlp-grpc/README.md diff --git a/packages/opentelemetry-exporter-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json similarity index 85% rename from packages/opentelemetry-exporter-otlp-grpc/package.json rename to experimental/packages/opentelemetry-exporter-otlp-grpc/package.json index e4a7e9411b6..0e169d818b4 100644 --- a/packages/opentelemetry-exporter-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-otlp-grpc", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -15,7 +15,7 @@ "submodule": "git submodule sync --recursive && git submodule update --init --recursive", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "npm run protos:copy && tsc -w", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" @@ -49,7 +49,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/api-metrics": "0.25.0", + "@opentelemetry/api-metrics": "0.26.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/sinon": "10.0.2", @@ -69,10 +69,10 @@ "dependencies": { "@grpc/grpc-js": "^1.3.7", "@grpc/proto-loader": "^0.6.4", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/exporter-otlp-http": "0.25.0", - "@opentelemetry/sdk-metrics-base": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0" + "@opentelemetry/core": "1.0.0", + "@opentelemetry/exporter-otlp-http": "0.26.0", + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/sdk-metrics-base": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0" } } diff --git a/packages/opentelemetry-exporter-otlp-grpc/protos b/experimental/packages/opentelemetry-exporter-otlp-grpc/protos similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/protos rename to experimental/packages/opentelemetry-exporter-otlp-grpc/protos diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/index.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/index.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/src/index.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/index.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/types.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/types.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/src/types.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/types.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/src/util.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/src/util.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/src/util.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/src/util.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/submodule.md b/experimental/packages/opentelemetry-exporter-otlp-grpc/submodule.md similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/submodule.md rename to experimental/packages/opentelemetry-exporter-otlp-grpc/submodule.md diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/ca.key diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.crt diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.csr diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/client.key diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.crt diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.csr diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/certs/server.key diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/helper.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/helper.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts b/experimental/packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-grpc/test/util.test.ts diff --git a/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json similarity index 57% rename from packages/opentelemetry-exporter-otlp-grpc/tsconfig.json rename to experimental/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json index cfc7b73a484..caced6b4e8b 100644 --- a/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-otlp-grpc/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -10,16 +10,13 @@ ], "references": [ { - "path": "../opentelemetry-core" + "path": "../opentelemetry-api-metrics" }, { "path": "../opentelemetry-exporter-otlp-http" }, { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-sdk-metrics-base" } ] } diff --git a/packages/opentelemetry-exporter-otlp-http/.eslintignore b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintignore similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/.eslintignore rename to experimental/packages/opentelemetry-exporter-otlp-http/.eslintignore diff --git a/packages/opentelemetry-exporter-otlp-http/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js similarity index 75% rename from packages/opentelemetry-exporter-otlp-http/.eslintrc.js rename to experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js index 9dfe62f9b8c..e41d9a9299b 100644 --- a/packages/opentelemetry-exporter-otlp-http/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-otlp-http/.eslintrc.js @@ -5,5 +5,5 @@ module.exports = { "node": true, "browser": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-exporter-otlp-http/.npmignore b/experimental/packages/opentelemetry-exporter-otlp-http/.npmignore similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/.npmignore rename to experimental/packages/opentelemetry-exporter-otlp-http/.npmignore diff --git a/packages/opentelemetry-exporter-otlp-http/LICENSE b/experimental/packages/opentelemetry-exporter-otlp-http/LICENSE similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/LICENSE rename to experimental/packages/opentelemetry-exporter-otlp-http/LICENSE diff --git a/packages/opentelemetry-exporter-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-otlp-http/README.md similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/README.md rename to experimental/packages/opentelemetry-exporter-otlp-http/README.md diff --git a/packages/opentelemetry-exporter-otlp-http/karma.conf.js b/experimental/packages/opentelemetry-exporter-otlp-http/karma.conf.js similarity index 87% rename from packages/opentelemetry-exporter-otlp-http/karma.conf.js rename to experimental/packages/opentelemetry-exporter-otlp-http/karma.conf.js index 455b1437c87..4c60b54edba 100644 --- a/packages/opentelemetry-exporter-otlp-http/karma.conf.js +++ b/experimental/packages/opentelemetry-exporter-otlp-http/karma.conf.js @@ -14,8 +14,8 @@ * limitations under the License. */ -const karmaWebpackConfig = require('../../karma.webpack'); -const karmaBaseConfig = require('../../karma.base'); +const karmaWebpackConfig = require('../../../karma.webpack'); +const karmaBaseConfig = require('../../../karma.base'); module.exports = (config) => { config.set(Object.assign({}, karmaBaseConfig, { diff --git a/packages/opentelemetry-exporter-otlp-http/package.json b/experimental/packages/opentelemetry-exporter-otlp-http/package.json similarity index 90% rename from packages/opentelemetry-exporter-otlp-http/package.json rename to experimental/packages/opentelemetry-exporter-otlp-http/package.json index 3a03727c437..91399c51a8d 100644 --- a/packages/opentelemetry-exporter-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-otlp-http", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -21,7 +21,7 @@ "tdd:browser": "karma start", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'", "test:browser": "nyc karma start --single-run", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch tsconfig.json tsconfig.esm.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" @@ -86,10 +86,10 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/api-metrics": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/sdk-metrics-base": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0" + "@opentelemetry/api-metrics": "0.26.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/sdk-metrics-base": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0" } } diff --git a/packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/index.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/index.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/index.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/index.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/index.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/index.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/index.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/types.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/platform/node/util.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/transform.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/transform.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/transform.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/transform.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/transformMetrics.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/types.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/types.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/types.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/types.ts diff --git a/packages/opentelemetry-exporter-otlp-http/src/util.ts b/experimental/packages/opentelemetry-exporter-otlp-http/src/util.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/src/util.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/src/util.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/browser/util.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.crt diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/ca.key rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/ca.key diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/client.crt rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.crt diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.csr similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/client.csr rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.csr diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/client.key b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/client.key rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/client.key diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/server.crt rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.crt diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.csr similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/server.csr rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.csr diff --git a/packages/opentelemetry-exporter-otlp-http/test/certs/server.key b/experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/certs/server.key rename to experimental/packages/opentelemetry-exporter-otlp-http/test/certs/server.key diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/transform.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/common/utils.test.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/helper.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/helper.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/helper.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/helper.ts diff --git a/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts similarity index 99% rename from packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts index 2fd9e04a360..4937ef37370 100644 --- a/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts @@ -72,7 +72,6 @@ describe('OTLPMetricExporter - node with json over http', () => { // Need to stub/spy on the underlying logger as the "diag" instance is global const spyLoggerWarn = sinon.stub(diag, 'warn'); collectorExporter = new OTLPMetricExporter({ - serviceName: 'basic-service', url: address, metadata, } as any); diff --git a/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts similarity index 99% rename from packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts index 7ccf6a97f13..8988572b67c 100644 --- a/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts +++ b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts @@ -58,7 +58,6 @@ describe('OTLPTraceExporter - node with json over http', () => { // Need to stub/spy on the underlying logger as the "diag" instance is global const spyLoggerWarn = sinon.stub(diag, 'warn'); collectorExporter = new OTLPTraceExporter({ - serviceName: 'basic-service', metadata, url: address, } as any); diff --git a/packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts b/experimental/packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts rename to experimental/packages/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json new file mode 100644 index 00000000000..7b09613481b --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json @@ -0,0 +1,19 @@ +{ + "extends": "../../../tsconfig.base.esm.json", + "compilerOptions": { + "rootDir": "src", + "outDir": "build/esm", + "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" + }, + "include": [ + "src/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics/tsconfig.esm.json" + }, + { + "path": "../opentelemetry-sdk-metrics-base/tsconfig.esm.json" + } + ] +} diff --git a/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json new file mode 100644 index 00000000000..3c062d3feb2 --- /dev/null +++ b/experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json @@ -0,0 +1,19 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "rootDir": ".", + "outDir": "build" + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "references": [ + { + "path": "../opentelemetry-api-metrics" + }, + { + "path": "../opentelemetry-sdk-metrics-base" + } + ] +} diff --git a/packages/opentelemetry-exporter-otlp-proto/.eslintignore b/experimental/packages/opentelemetry-exporter-otlp-proto/.eslintignore similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/.eslintignore rename to experimental/packages/opentelemetry-exporter-otlp-proto/.eslintignore diff --git a/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js similarity index 71% rename from packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js rename to experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js index fc4d0381204..3ed0fbeba38 100644 --- a/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js @@ -4,5 +4,5 @@ module.exports = { "commonjs": true, "node": true, }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-exporter-otlp-proto/.npmignore b/experimental/packages/opentelemetry-exporter-otlp-proto/.npmignore similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/.npmignore rename to experimental/packages/opentelemetry-exporter-otlp-proto/.npmignore diff --git a/packages/opentelemetry-exporter-otlp-proto/LICENSE b/experimental/packages/opentelemetry-exporter-otlp-proto/LICENSE similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/LICENSE rename to experimental/packages/opentelemetry-exporter-otlp-proto/LICENSE diff --git a/packages/opentelemetry-exporter-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-otlp-proto/README.md similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/README.md rename to experimental/packages/opentelemetry-exporter-otlp-proto/README.md diff --git a/packages/opentelemetry-exporter-otlp-proto/package.json b/experimental/packages/opentelemetry-exporter-otlp-proto/package.json similarity index 85% rename from packages/opentelemetry-exporter-otlp-proto/package.json rename to experimental/packages/opentelemetry-exporter-otlp-proto/package.json index b890fd32d9b..a8f7ff5afa7 100644 --- a/packages/opentelemetry-exporter-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-otlp-proto", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry Collector Exporter allows user to send collected traces to the OpenTelemetry Collector using protobuf over HTTP", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -15,7 +15,7 @@ "submodule": "git submodule sync --recursive && git submodule update --init --recursive", "tdd": "npm run test -- --watch-extensions ts --watch", "test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts'", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "npm run protos:copy && tsc -w", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" @@ -49,7 +49,7 @@ "devDependencies": { "@babel/core": "7.15.0", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/api-metrics": "0.25.0", + "@opentelemetry/api-metrics": "0.26.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/sinon": "10.0.2", @@ -68,11 +68,11 @@ }, "dependencies": { "@grpc/proto-loader": "^0.6.4", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/exporter-otlp-http": "0.25.0", - "@opentelemetry/sdk-metrics-base": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/exporter-otlp-http": "0.26.0", + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/sdk-metrics-base": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "protobufjs": "^6.9.0" } } diff --git a/packages/opentelemetry-exporter-otlp-proto/protos b/experimental/packages/opentelemetry-exporter-otlp-proto/protos similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/protos rename to experimental/packages/opentelemetry-exporter-otlp-proto/protos diff --git a/packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/src/index.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/index.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/src/index.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/index.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/src/types.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/types.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/src/types.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/types.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/src/util.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/src/util.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/src/util.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/src/util.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/submodule.md b/experimental/packages/opentelemetry-exporter-otlp-proto/submodule.md similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/submodule.md rename to experimental/packages/opentelemetry-exporter-otlp-proto/submodule.md diff --git a/packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.crt diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/ca.key diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.crt diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.csr diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/client.key b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/client.key rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/client.key diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.crt diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.csr diff --git a/packages/opentelemetry-exporter-otlp-proto/test/certs/server.key b/experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.key similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/certs/server.key rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/certs/server.key diff --git a/packages/opentelemetry-exporter-otlp-proto/test/helper.ts b/experimental/packages/opentelemetry-exporter-otlp-proto/test/helper.ts similarity index 100% rename from packages/opentelemetry-exporter-otlp-proto/test/helper.ts rename to experimental/packages/opentelemetry-exporter-otlp-proto/test/helper.ts diff --git a/packages/opentelemetry-exporter-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-otlp-proto/tsconfig.json similarity index 57% rename from packages/opentelemetry-exporter-otlp-proto/tsconfig.json rename to experimental/packages/opentelemetry-exporter-otlp-proto/tsconfig.json index cfc7b73a484..caced6b4e8b 100644 --- a/packages/opentelemetry-exporter-otlp-proto/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-otlp-proto/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../tsconfig.base.json", + "extends": "../../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -10,16 +10,13 @@ ], "references": [ { - "path": "../opentelemetry-core" + "path": "../opentelemetry-api-metrics" }, { "path": "../opentelemetry-exporter-otlp-http" }, { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" + "path": "../opentelemetry-sdk-metrics-base" } ] } diff --git a/experimental/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json index ec6fbb75711..a8af029d50e 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-prometheus", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry Exporter Prometheus provides a metrics endpoint for Prometheus", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -57,8 +57,8 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/api-metrics": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/sdk-metrics-base": "0.25.0" + "@opentelemetry/api-metrics": "0.26.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/sdk-metrics-base": "0.26.0" } } diff --git a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json index 948abef3ceb..3c062d3feb2 100644 --- a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json @@ -11,6 +11,9 @@ "references": [ { "path": "../opentelemetry-api-metrics" + }, + { + "path": "../opentelemetry-sdk-metrics-base" } ] } diff --git a/experimental/packages/opentelemetry-instrumentation-fetch/package.json b/experimental/packages/opentelemetry-instrumentation-fetch/package.json index 97a2f00eade..40b652afb5d 100644 --- a/experimental/packages/opentelemetry-instrumentation-fetch/package.json +++ b/experimental/packages/opentelemetry-instrumentation-fetch/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-fetch", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry fetch automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -50,9 +50,9 @@ "devDependencies": { "@babel/core": "7.15.0", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-zone": "0.25.0", - "@opentelemetry/propagator-b3": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/context-zone": "1.0.0", + "@opentelemetry/propagator-b3": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/sinon": "10.0.2", @@ -81,9 +81,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/sdk-trace-web": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0" + "@opentelemetry/core": "1.0.0", + "@opentelemetry/instrumentation": "0.26.0", + "@opentelemetry/sdk-trace-web": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/package.json b/experimental/packages/opentelemetry-instrumentation-grpc/package.json index f415b0db58b..158588b7fbc 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/package.json +++ b/experimental/packages/opentelemetry-instrumentation-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-grpc", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry grpc automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -46,10 +46,10 @@ "@grpc/grpc-js": "1.3.7", "@grpc/proto-loader": "0.6.4", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-async-hooks": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", - "@opentelemetry/sdk-trace-node": "0.25.0", + "@opentelemetry/context-async-hooks": "1.0.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", + "@opentelemetry/sdk-trace-node": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/semver": "7.3.8", @@ -69,8 +69,8 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/api-metrics": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0" + "@opentelemetry/api-metrics": "0.26.0", + "@opentelemetry/instrumentation": "0.26.0", + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts index 0cf2114891e..ba4f46e3516 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts @@ -185,7 +185,7 @@ export class GrpcJsInstrumentation extends InstrumentationBase { kind: SpanKind.SERVER, }; - instrumentation._diag.debug('patch func: %s', JSON.stringify(spanOptions)); + instrumentation._diag.debug(`patch func: ${JSON.stringify(spanOptions)}`); context.with( propagation.extract(ROOT_CONTEXT, call.metadata, { diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts index 87486ef157f..18b649b95ca 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts @@ -190,7 +190,7 @@ export class GrpcNativeInstrumentation extends InstrumentationBase< kind: SpanKind.SERVER, }; - instrumentation._diag.debug('patch func: %s', JSON.stringify(spanOptions)); + instrumentation._diag.debug(`patch func: ${JSON.stringify(spanOptions)}`); context.with( propagation.extract(context.active(), call.metadata, { diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts index 559b9acf062..5a39f3fd68c 100644 --- a/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts +++ b/experimental/packages/opentelemetry-instrumentation-grpc/test/helper.ts @@ -19,7 +19,7 @@ import { SpanKind, propagation, trace, } from '@opentelemetry/api'; -import { HttpTraceContextPropagator } from '@opentelemetry/core'; +import { W3CTraceContextPropagator } from '@opentelemetry/core'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks'; import { ContextManager } from '@opentelemetry/api'; @@ -386,7 +386,7 @@ export const runTests = ( let contextManager: ContextManager; before(() => { - propagation.setGlobalPropagator(new HttpTraceContextPropagator()); + propagation.setGlobalPropagator(new W3CTraceContextPropagator()); }); beforeEach(() => { diff --git a/experimental/packages/opentelemetry-instrumentation-http/README.md b/experimental/packages/opentelemetry-instrumentation-http/README.md index 139014304f3..6d5fb9a073b 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/README.md +++ b/experimental/packages/opentelemetry-instrumentation-http/README.md @@ -57,6 +57,7 @@ Http instrumentation has few options available to choose from. You can set the f | [`serverName`](/~https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L101) | `string` | The primary server name of the matched virtual host. | | [`requireParentforOutgoingSpans`](/~https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L103) | Boolean | Require that is a parent span to create new span for outgoing requests. | | [`requireParentforIncomingSpans`](/~https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L105) | Boolean | Require that is a parent span to create new span for incoming requests. | +| [`headersToSpanAttributes`](/~https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/types.ts#L107) | `object` | List of case insensitive HTTP headers to convert to span attributes. Client (outgoing requests, incoming responses) and server (incoming requests, outgoing responses) headers will be converted to span attributes in the form of `http.{request\|response}.header.header_name`, e.g. `http.response.header.content_length` | ## Useful links diff --git a/experimental/packages/opentelemetry-instrumentation-http/package.json b/experimental/packages/opentelemetry-instrumentation-http/package.json index 4b2e4280671..41abcbab84b 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/package.json +++ b/experimental/packages/opentelemetry-instrumentation-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-http", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry http/https automatic instrumentation package.", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,9 +44,9 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-async-hooks": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", - "@opentelemetry/sdk-trace-node": "0.25.0", + "@opentelemetry/context-async-hooks": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", + "@opentelemetry/sdk-trace-node": "1.0.0", "@types/got": "9.6.12", "@types/mocha": "8.2.3", "@types/node": "14.17.11", @@ -72,9 +72,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/instrumentation": "0.26.0", + "@opentelemetry/semantic-conventions": "1.0.0", "semver": "^7.3.5" } } diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts index 2229ae92c7e..6c889b40664 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts @@ -58,6 +58,7 @@ export class HttpInstrumentation extends InstrumentationBase { /** keep track on spans not ended */ private readonly _spanNotEnded: WeakSet = new WeakSet(); private readonly _version = process.versions.node; + private _headerCapture; constructor(config: HttpInstrumentationConfig & InstrumentationConfig = {}) { super( @@ -65,6 +66,8 @@ export class HttpInstrumentation extends InstrumentationBase { VERSION, Object.assign({}, config) ); + + this._headerCapture = this._createHeaderCapture(); } private _getConfig(): HttpInstrumentationConfig { @@ -73,6 +76,7 @@ export class HttpInstrumentation extends InstrumentationBase { override setConfig(config: HttpInstrumentationConfig & InstrumentationConfig = {}): void { this._config = Object.assign({}, config); + this._headerCapture = this._createHeaderCapture(); } init(): [InstrumentationNodeModuleDefinition, InstrumentationNodeModuleDefinition] { @@ -296,6 +300,9 @@ export class HttpInstrumentation extends InstrumentationBase { this._callResponseHook(span, response); } + this._headerCapture.client.captureRequestHeaders(span, header => request.getHeader(header)); + this._headerCapture.client.captureResponseHeaders(span, header => response.headers[header]); + context.bind(context.active(), response); this._diag.debug('outgoingRequest on response()'); response.on('end', () => { @@ -370,7 +377,7 @@ export class HttpInstrumentation extends InstrumentationBase { : '/'; const method = request.method || 'GET'; - instrumentation._diag.debug('%s instrumentation incomingRequest', component); + instrumentation._diag.debug(`${component} instrumentation incomingRequest`); if ( utils.isIgnored( @@ -424,6 +431,8 @@ export class HttpInstrumentation extends InstrumentationBase { instrumentation._callResponseHook(span, response); } + instrumentation._headerCapture.server.captureRequestHeaders(span, header => request.headers[header]); + // Wraps end (inspired by: // /~https://github.com/GoogleCloudPlatform/cloud-trace-nodejs/blob/master/src/instrumentations/instrumentation-connect.ts#L75) const originalEnd = response.end; @@ -449,6 +458,8 @@ export class HttpInstrumentation extends InstrumentationBase { response ); + instrumentation._headerCapture.server.captureResponseHeaders(span, header => response.getHeader(header)); + span .setAttributes(attributes) .setStatus(utils.parseResponseStatus(response.statusCode)); @@ -580,7 +591,7 @@ export class HttpInstrumentation extends InstrumentationBase { } ); - instrumentation._diag.debug('%s instrumentation outgoingRequest', component); + instrumentation._diag.debug(`${component} instrumentation outgoingRequest`); context.bind(parentContext, request); return instrumentation._traceClientRequest( request, @@ -662,4 +673,19 @@ export class HttpInstrumentation extends InstrumentationBase { ); } } + + private _createHeaderCapture() { + const config = this._getConfig(); + + return { + client: { + captureRequestHeaders: utils.headerCapture('request', config.headersToSpanAttributes?.client?.requestHeaders ?? []), + captureResponseHeaders: utils.headerCapture('response', config.headersToSpanAttributes?.client?.responseHeaders ?? []) + }, + server: { + captureRequestHeaders: utils.headerCapture('request', config.headersToSpanAttributes?.server?.requestHeaders ?? []), + captureResponseHeaders: utils.headerCapture('response', config.headersToSpanAttributes?.server?.responseHeaders ?? []), + } + } + } } diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts index 7be9999d8b6..79f4e844cd2 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/types.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/types.ts @@ -103,6 +103,11 @@ export interface HttpInstrumentationConfig extends InstrumentationConfig { requireParentforOutgoingSpans?: boolean; /** Require parent to create span for incoming requests */ requireParentforIncomingSpans?: boolean; + /** Map the following HTTP headers to span attributes. */ + headersToSpanAttributes?: { + client?: { requestHeaders?: string[]; responseHeaders?: string[]; }, + server?: { requestHeaders?: string[]; responseHeaders?: string[]; }, + } } export interface Err extends Error { diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts index a24ff6f12a9..4f8a03c7af8 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/src/utils.ts @@ -453,7 +453,6 @@ export const getIncomingRequestAttributes = ( } if (requestUrl) { - attributes[SemanticAttributes.HTTP_ROUTE] = requestUrl.pathname || '/'; attributes[SemanticAttributes.HTTP_TARGET] = requestUrl.pathname || '/'; } @@ -495,3 +494,27 @@ export const getIncomingRequestAttributesOnResponse = ( } return attributes; }; + +export function headerCapture(type: 'request' | 'response', headers: string[]) { + const normalizedHeaders = new Map(headers.map(header => [header.toLowerCase(), header.toLowerCase().replace(/-/g, '_')])); + + return (span: Span, getHeader: (key: string) => undefined | string | string[] | number) => { + for (const [capturedHeader, normalizedHeader] of normalizedHeaders) { + const value = getHeader(capturedHeader); + + if (value === undefined) { + continue; + } + + const key = `http.${type}.header.${normalizedHeader}`; + + if (typeof value === 'string') { + span.setAttribute(key, [value]); + } else if (Array.isArray(value)) { + span.setAttribute(key, value); + } else { + span.setAttribute(key, [value]); + } + } + }; +} diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts index 9f62d807b1c..7658bfa65b9 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts @@ -908,4 +908,87 @@ describe('HttpInstrumentation', () => { }); }); }); + + describe('capturing headers as span attributes', () => { + beforeEach(() => { + memoryExporter.reset(); + }); + + before(() => { + instrumentation.setConfig({ + headersToSpanAttributes: { + client: { requestHeaders: ['X-Client-Header1'], responseHeaders: ['X-Server-Header1'] }, + server: { requestHeaders: ['X-Client-Header2'], responseHeaders: ['X-Server-Header2'] }, + } + }); + instrumentation.enable(); + server = http.createServer((request, response) => { + response.setHeader('X-ServeR-header1', 'server123'); + response.setHeader('X-Server-header2', '123server'); + response.end('Test Server Response'); + }); + + server.listen(serverPort); + }); + + after(() => { + server.close(); + instrumentation.disable(); + }); + + it('should convert headers to span attributes', async () => { + await httpRequest.get( + `${protocol}://${hostname}:${serverPort}${pathname}`, + { + headers: { + 'X-client-header1': 'client123', + 'X-CLIENT-HEADER2': '123client', + } + } + ); + const spans = memoryExporter.getFinishedSpans(); + const [incomingSpan, outgoingSpan] = spans; + + assert.strictEqual(spans.length, 2); + + assert.deepStrictEqual( + incomingSpan.attributes['http.request.header.x_client_header2'], + ['123client'] + ); + + assert.deepStrictEqual( + incomingSpan.attributes['http.response.header.x_server_header2'], + ['123server'] + ); + + assert.strictEqual( + incomingSpan.attributes['http.request.header.x_client_header1'], + undefined + ); + + assert.strictEqual( + incomingSpan.attributes['http.response.header.x_server_header1'], + undefined + ); + + assert.deepStrictEqual( + outgoingSpan.attributes['http.request.header.x_client_header1'], + ['client123'] + ); + assert.deepStrictEqual( + outgoingSpan.attributes['http.response.header.x_server_header1'], + ['server123'] + ); + + assert.strictEqual( + outgoingSpan.attributes['http.request.header.x_client_header2'], + undefined + ); + + assert.strictEqual( + outgoingSpan.attributes['http.response.header.x_server_header2'], + undefined + ); + }); + }); }); diff --git a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts index d530fac61ca..7b8a2e8d1ef 100644 --- a/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts +++ b/experimental/packages/opentelemetry-instrumentation-http/test/functionals/utils.test.ts @@ -465,4 +465,80 @@ describe('Utility', () => { verifyValueInAttributes(attributes, undefined, 1200); }); }); + + describe('getIncomingRequestAttributes()', () => { + it('should not set http.route in http span attributes', () => { + const request = { + url: 'http://hostname/user/:id', + method: 'GET' + } as IncomingMessage; + request.headers = { + 'user-agent': 'chrome', + 'x-forwarded-for': ', , ' + } + const attributes = utils.getIncomingRequestAttributes(request, { component: 'http'}) + assert.strictEqual(attributes[SemanticAttributes.HTTP_ROUTE], undefined) + }); + }); + + describe('headers to span attributes capture', () => { + let span: Span; + + beforeEach(() => { + span = new Span( + new BasicTracerProvider().getTracer('default'), + ROOT_CONTEXT, + 'test', + { spanId: '', traceId: '', traceFlags: TraceFlags.SAMPLED }, + SpanKind.INTERNAL + ); + }); + + it('should set attributes for request and response keys', () => { + utils.headerCapture('request', ['Origin'])(span, () => 'localhost'); + utils.headerCapture('response', ['Cookie'])(span, () => 'token=123'); + assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost']); + assert.deepStrictEqual(span.attributes['http.response.header.cookie'], ['token=123']); + }); + + it('should set attributes for multiple values', () => { + utils.headerCapture('request', ['Origin'])(span, () => ['localhost', 'www.example.com']); + assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost', 'www.example.com']); + }); + + it('sets attributes for multiple headers', () => { + utils.headerCapture('request', ['Origin', 'Foo'])(span, header => { + if (header === 'origin') { + return 'localhost'; + } + + if (header === 'foo') { + return 42; + } + + return undefined; + }); + + assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost']); + assert.deepStrictEqual(span.attributes['http.request.header.foo'], [42]); + }); + + it('should normalize header names', () => { + utils.headerCapture('request', ['X-Forwarded-For'])(span, () => 'foo'); + assert.deepStrictEqual(span.attributes['http.request.header.x_forwarded_for'], ['foo']); + }); + + it('ignores non-existent headers', () => { + utils.headerCapture('request', ['Origin', 'Accept'])(span, header => { + if (header === 'origin') { + return 'localhost'; + } + + return undefined; + }); + + assert.deepStrictEqual(span.attributes['http.request.header.origin'], ['localhost']); + assert.deepStrictEqual(span.attributes['http.request.header.accept'], undefined); + }) + }); }); diff --git a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json index 29fdfbb9f63..66d3c85f331 100644 --- a/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json +++ b/experimental/packages/opentelemetry-instrumentation-xml-http-request/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation-xml-http-request", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry XMLHttpRequest automatic instrumentation package.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -50,9 +50,9 @@ "devDependencies": { "@babel/core": "7.15.0", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-zone": "0.25.0", - "@opentelemetry/propagator-b3": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/context-zone": "1.0.0", + "@opentelemetry/propagator-b3": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/sinon": "10.0.2", @@ -81,9 +81,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/sdk-trace-web": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0" + "@opentelemetry/core": "1.0.0", + "@opentelemetry/instrumentation": "0.26.0", + "@opentelemetry/sdk-trace-web": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/experimental/packages/opentelemetry-instrumentation/package.json b/experimental/packages/opentelemetry-instrumentation/package.json index a4b21cc46f1..7204d0e3911 100644 --- a/experimental/packages/opentelemetry-instrumentation/package.json +++ b/experimental/packages/opentelemetry-instrumentation/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/instrumentation", - "version": "0.25.0", + "version": "0.26.0", "description": "Base class for node which OpenTelemetry instrumentation modules extend", "author": "OpenTelemetry Authors", "homepage": "/~https://github.com/open-telemetry/opentelemetry-js#readme", @@ -61,7 +61,7 @@ "url": "/~https://github.com/open-telemetry/opentelemetry-js/issues" }, "dependencies": { - "@opentelemetry/api-metrics": "0.25.0", + "@opentelemetry/api-metrics": "0.26.0", "require-in-the-middle": "^5.0.3", "semver": "^7.3.2", "shimmer": "^1.2.1" diff --git a/experimental/packages/opentelemetry-sdk-metrics-base/package.json b/experimental/packages/opentelemetry-sdk-metrics-base/package.json index 773ff1e9f3c..862e167d1d7 100644 --- a/experimental/packages/opentelemetry-sdk-metrics-base/package.json +++ b/experimental/packages/opentelemetry-sdk-metrics-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-metrics-base", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry metrics SDK", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -63,9 +63,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/api-metrics": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/resources": "0.25.0", + "@opentelemetry/api-metrics": "0.26.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/resources": "1.0.0", "lodash.merge": "^4.6.2" } } diff --git a/experimental/packages/opentelemetry-sdk-node/package.json b/experimental/packages/opentelemetry-sdk-node/package.json index c4a18e84ac2..dddf6d0845f 100644 --- a/experimental/packages/opentelemetry-sdk-node/package.json +++ b/experimental/packages/opentelemetry-sdk-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-node", - "version": "0.25.0", + "version": "0.26.0", "description": "OpenTelemetry SDK for Node.js", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -42,22 +42,22 @@ "access": "public" }, "dependencies": { - "@opentelemetry/api-metrics": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/instrumentation": "0.25.0", + "@opentelemetry/api-metrics": "0.26.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/instrumentation": "0.26.0", "@opentelemetry/resource-detector-aws": "0.24.0", "@opentelemetry/resource-detector-gcp": "0.24.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/sdk-metrics-base": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", - "@opentelemetry/sdk-trace-node": "0.25.0" + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/sdk-metrics-base": "0.26.0", + "@opentelemetry/sdk-trace-base": "1.0.0", + "@opentelemetry/sdk-trace-node": "1.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.2" }, "devDependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-async-hooks": "0.25.0", + "@opentelemetry/context-async-hooks": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/semver": "7.3.8", diff --git a/experimental/tsconfig.esm.json b/experimental/tsconfig.esm.json index cd3052ad278..a233a3b76d1 100644 --- a/experimental/tsconfig.esm.json +++ b/experimental/tsconfig.esm.json @@ -5,6 +5,18 @@ { "path": "packages/opentelemetry-api-metrics/tsconfig.esm.json" }, + { + "path": "packages/opentelemetry-exporter-otlp-grpc" + }, + { + "path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json" + }, + { + "path": "packages/opentelemetry-exporter-otlp-proto" + }, + { + "path": "packages/opentelemetry-exporter-prometheus" + }, { "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json" }, @@ -25,6 +37,15 @@ }, { "path": "packages/opentelemetry-sdk-node" + }, + { + "path": "backwards-compatability/node10" + }, + { + "path": "backwards-compatability/node12" + }, + { + "path": "backwards-compatability/node8" } ] } diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json index a4220672a87..3ae14512e28 100644 --- a/experimental/tsconfig.json +++ b/experimental/tsconfig.json @@ -5,6 +5,18 @@ { "path": "packages/opentelemetry-api-metrics" }, + { + "path": "packages/opentelemetry-exporter-otlp-grpc" + }, + { + "path": "packages/opentelemetry-exporter-otlp-http" + }, + { + "path": "packages/opentelemetry-exporter-otlp-proto" + }, + { + "path": "packages/opentelemetry-exporter-prometheus" + }, { "path": "packages/opentelemetry-instrumentation-fetch" }, @@ -25,6 +37,15 @@ }, { "path": "packages/opentelemetry-sdk-node" + }, + { + "path": "backwards-compatability/node10" + }, + { + "path": "backwards-compatability/node12" + }, + { + "path": "backwards-compatability/node8" } ] } diff --git a/getting-started/traced-example/package.json b/getting-started/traced-example/package.json index b51de03f72c..8268cd9ddc8 100644 --- a/getting-started/traced-example/package.json +++ b/getting-started/traced-example/package.json @@ -9,13 +9,13 @@ "author": "OpenTelemetry Authors", "license": "Apache-2.0", "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/exporter-zipkin": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/exporter-zipkin": "1.0.0", "@opentelemetry/instrumentation-express": "^0.24.0", "@opentelemetry/instrumentation-http": "0.25.0", "@opentelemetry/instrumentation": "0.25.0", - "@opentelemetry/sdk-trace-node": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/sdk-trace-node": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/getting-started/ts-example/README.md b/getting-started/ts-example/README.md index 49da9bc4a51..a1ccd6a1cb6 100644 --- a/getting-started/ts-example/README.md +++ b/getting-started/ts-example/README.md @@ -54,15 +54,17 @@ This guide uses the example application provided in the [example directory](exam ([link to JavaScript version](../README.md#install-the-required-opentelemetry-libraries)) -To create traces on NodeJS, you will need `@opentelemetry/sdk-trace-node`, `@opentelemetry/core`, and any plugins required by your application such as gRPC, or HTTP. If you are using the example application, you will need to install `@opentelemetry/plugin-http`. +To create traces on NodeJS, you will need `@opentelemetry/sdk-trace-node`, `@opentelemetry/api`, and any plugins required by your application such as gRPC, or HTTP. If you are using the example application, you will need to install `@opentelemetry/instrumentation-http` and `@opentelemetry/instrumentation-express`. ```sh $ npm install \ - @opentelemetry/core \ + @opentelemetry/api \ @opentelemetry/sdk-trace-node \ @opentelemetry/instrumentation \ @opentelemetry/instrumentation-http \ - @opentelemetry/instrumentation-express + @opentelemetry/instrumentation-express \ + @@opentelemetry/resources \ + @opentelemetry/semantic-conventions ``` #### Initialize a global tracer @@ -74,16 +76,16 @@ All tracing initialization should happen before your application’s code runs. Create a file named `tracing.ts` and add the following code: ```typescript -import { LogLevel } from '@opentelemetry/core'; +import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; import { registerInstrumentations } from '@opentelemetry/instrumentation'; import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'; import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'; -const provider: NodeTracerProvider = new NodeTracerProvider({ - logLevel: LogLevel.ERROR, -}); +const provider: NodeTracerProvider = new NodeTracerProvider(); + +diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL); provider.register(); @@ -120,26 +122,26 @@ $ # npm install @opentelemetry/exporter-jaeger After these dependencies are installed, we will need to initialize and register them. Modify `tracing.ts` so that it matches the following code snippet, replacing the service name `"getting-started"` with your own service name if you wish. ```typescript -import { LogLevel } from '@opentelemetry/core'; +import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; - +import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'; +import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'; +import { Resource } from '@opentelemetry/resources' +import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions' import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; // For Jaeger, use the following line instead: // import { JaegerExporter } from '@opentelemetry/exporter-jaeger'; -import { registerInstrumentations } from '@opentelemetry/instrumentation'; -import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'; -import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'; -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; - const provider: NodeTracerProvider = new NodeTracerProvider({ - logLevel: LogLevel.ERROR, resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'getting-started', }), }); +diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL); + provider.addSpanProcessor( new SimpleSpanProcessor( new ZipkinExporter({ @@ -151,7 +153,6 @@ provider.addSpanProcessor( }), ), ); - provider.register(); registerInstrumentations({ @@ -161,7 +162,6 @@ registerInstrumentations({ ], }); - console.log('tracing initialized'); ``` diff --git a/getting-started/ts-example/traced-example/package.json b/getting-started/ts-example/traced-example/package.json index 3739e79b062..f157176404f 100644 --- a/getting-started/ts-example/traced-example/package.json +++ b/getting-started/ts-example/traced-example/package.json @@ -14,13 +14,13 @@ "ts-node": "10.2.1" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/exporter-zipkin": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/exporter-zipkin": "1.0.0", "@opentelemetry/instrumentation": "0.25.0", "@opentelemetry/instrumentation-express": "^0.24.0", - "@opentelemetry/sdk-trace-node": "0.25.0", + "@opentelemetry/sdk-trace-node": "1.0.0", "@opentelemetry/instrumentation-http": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "axios": "^0.21.0", "express": "^4.17.1" } diff --git a/getting-started/ts-example/traced-example/tracing.ts b/getting-started/ts-example/traced-example/tracing.ts index 4426da25f98..8d4628a06e9 100644 --- a/getting-started/ts-example/traced-example/tracing.ts +++ b/getting-started/ts-example/traced-example/tracing.ts @@ -1,22 +1,23 @@ +import { diag, DiagConsoleLogger, DiagLogLevel } from '@opentelemetry/api'; import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'; - +import { registerInstrumentations } from '@opentelemetry/instrumentation'; +import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express'; +import { HttpInstrumentation } from '@opentelemetry/instrumentation-http'; +import { Resource } from '@opentelemetry/resources' +import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions' import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-base'; import { ZipkinExporter } from '@opentelemetry/exporter-zipkin'; - -const { Resource } = require('@opentelemetry/resources'); -const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions'); // For Jaeger, use the following line instead: // import { JaegerExporter } from '@opentelemetry/exporter-jaeger'; -const { registerInstrumentations } = require('@opentelemetry/instrumentation'); -const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express'); -const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http'); - const provider: NodeTracerProvider = new NodeTracerProvider({ resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'getting-started', }), }); + +diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.ALL); + provider.addSpanProcessor( new SimpleSpanProcessor( new ZipkinExporter({ @@ -37,4 +38,4 @@ registerInstrumentations({ ], }); -console.log('tracing initialized'); +console.log('tracing initialized'); \ No newline at end of file diff --git a/integration-tests/propagation-validation-server/package.json b/integration-tests/propagation-validation-server/package.json index 47e540e6c5e..7c11eb10b11 100644 --- a/integration-tests/propagation-validation-server/package.json +++ b/integration-tests/propagation-validation-server/package.json @@ -1,6 +1,6 @@ { "name": "propagation-validation-server", - "version": "0.25.0", + "version": "1.0.0", "description": "server for w3c tests", "main": "validation_server.js", "private": true, @@ -12,9 +12,9 @@ }, "dependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-async-hooks": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/context-async-hooks": "1.0.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "axios": "0.21.1", "body-parser": "1.19.0", "express": "4.17.1" diff --git a/lerna.json b/lerna.json index 5f3df4e8bd0..b530144ffcd 100644 --- a/lerna.json +++ b/lerna.json @@ -1,10 +1,9 @@ { "lerna": "3.13.4", - "version": "0.25.0", + "version": "1.0.0", "npmClient": "npm", "packages": [ "benchmark/*", - "backwards-compatability/*", "packages/*", "integration-tests/*" ] diff --git a/packages/opentelemetry-context-async-hooks/package.json b/packages/opentelemetry-context-async-hooks/package.json index f276c6dd191..67b4751d957 100644 --- a/packages/opentelemetry-context-async-hooks/package.json +++ b/packages/opentelemetry-context-async-hooks/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-async-hooks", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry AsyncHooks-based Context Manager", "main": "build/src/index.js", "types": "build/src/index.d.ts", diff --git a/packages/opentelemetry-context-zone-peer-dep/package.json b/packages/opentelemetry-context-zone-peer-dep/package.json index 49b8f5be455..94c21e2a089 100644 --- a/packages/opentelemetry-context-zone-peer-dep/package.json +++ b/packages/opentelemetry-context-zone-peer-dep/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone-peer-dep", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Context Zone with peer dependency for zone.js", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-context-zone/package.json b/packages/opentelemetry-context-zone/package.json index d1521bc420f..f844a972d53 100644 --- a/packages/opentelemetry-context-zone/package.json +++ b/packages/opentelemetry-context-zone/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/context-zone", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Context Zone", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -68,7 +68,7 @@ "webpack-merge": "5.8.0" }, "dependencies": { - "@opentelemetry/context-zone-peer-dep": "0.25.0", + "@opentelemetry/context-zone-peer-dep": "1.0.0", "zone.js": "^0.11.0" }, "sideEffects": true diff --git a/packages/opentelemetry-core/package.json b/packages/opentelemetry-core/package.json index 38b843ddd12..9eecc139df7 100644 --- a/packages/opentelemetry-core/package.json +++ b/packages/opentelemetry-core/package.json @@ -1,7 +1,7 @@ { "name": "@opentelemetry/core", - "version": "0.25.0", - "description": "OpenTelemetry Core provides default and no-op implementations of the OpenTelemetry types for trace and metrics", + "version": "1.0.0", + "description": "OpenTelemetry Core provides constants and utilities shared by all OpenTelemetry SDK packages.", "main": "build/src/index.js", "module": "build/esm/index.js", "browser": { @@ -60,7 +60,6 @@ "@opentelemetry/api": "^1.0.2", "@types/mocha": "8.2.3", "@types/node": "14.17.11", - "@types/semver": "7.3.8", "@types/sinon": "10.0.2", "@types/webpack-env": "1.16.2", "codecov": "3.8.3", @@ -84,7 +83,6 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/semantic-conventions": "0.25.0", - "semver": "^7.3.5" + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/packages/opentelemetry-exporter-jaeger/package.json b/packages/opentelemetry-exporter-jaeger/package.json index dd36ce26922..e2988c1869a 100644 --- a/packages/opentelemetry-exporter-jaeger/package.json +++ b/packages/opentelemetry-exporter-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-jaeger", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Exporter Jaeger allows user to send collected traces to Jaeger", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -43,7 +43,7 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/resources": "0.25.0", + "@opentelemetry/resources": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/sinon": "10.0.2", @@ -60,9 +60,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0", "jaeger-client": "^3.15.0" } } diff --git a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts index 614871d0198..319d99ce377 100644 --- a/packages/opentelemetry-exporter-jaeger/src/jaeger.ts +++ b/packages/opentelemetry-exporter-jaeger/src/jaeger.ts @@ -124,7 +124,7 @@ export class JaegerExporter implements SpanExporter { if (done) return done({ code: ExportResultCode.FAILED, error }); } } - diag.debug('successful append for : %s', thriftSpan.length); + diag.debug(`successful append for : ${thriftSpan.length}`); // Flush all spans on each export. No-op if span buffer is empty await this._flush(); @@ -177,7 +177,7 @@ export class JaegerExporter implements SpanExporter { if (err) { return reject(new Error(err)); } - diag.debug('successful flush for %s spans', _count); + diag.debug(`successful flush for ${_count} spans`); resolve(); }); }); diff --git a/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json b/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json deleted file mode 100644 index 7a9bb54ea7d..00000000000 --- a/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.esm.json", - "compilerOptions": { - "rootDir": "src", - "outDir": "build/esm", - "tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo" - }, - "include": [ - "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-resources/tsconfig.esm.json" - }, - { - "path": "../opentelemetry-sdk-trace-base/tsconfig.esm.json" - } - ] -} diff --git a/packages/opentelemetry-exporter-otlp-http/tsconfig.json b/packages/opentelemetry-exporter-otlp-http/tsconfig.json deleted file mode 100644 index 1d7ba827ac5..00000000000 --- a/packages/opentelemetry-exporter-otlp-http/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "rootDir": ".", - "outDir": "build" - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-core" - }, - { - "path": "../opentelemetry-resources" - }, - { - "path": "../opentelemetry-sdk-trace-base" - } - ] -} diff --git a/packages/opentelemetry-exporter-zipkin/package.json b/packages/opentelemetry-exporter-zipkin/package.json index 12342223f55..653dc8a3215 100644 --- a/packages/opentelemetry-exporter-zipkin/package.json +++ b/packages/opentelemetry-exporter-zipkin/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-zipkin", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Zipkin Exporter allows the user to send collected traces to Zipkin.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -84,9 +84,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0" + "@opentelemetry/core": "1.0.0", + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts b/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts index 2b0ef76b2e7..222f138d070 100644 --- a/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts +++ b/packages/opentelemetry-exporter-zipkin/src/platform/browser/util.ts @@ -103,7 +103,7 @@ function sendWithXhr( xhr.onreadystatechange = () => { if (xhr.readyState === XMLHttpRequest.DONE) { const statusCode = xhr.status || 0; - diag.debug('Zipkin response status code: %d, body: %s', statusCode, data); + diag.debug(`Zipkin response status code: ${statusCode}, body: ${data}`); if (xhr.status >= 200 && xhr.status < 400) { return done({ code: ExportResultCode.SUCCESS }); @@ -124,6 +124,6 @@ function sendWithXhr( }; // Issue request to remote service - diag.debug('Zipkin request payload: %s', data); + diag.debug(`Zipkin request payload: ${data}`); xhr.send(data); } diff --git a/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts b/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts index 1d19b8dd3d5..ca0af75886c 100644 --- a/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts +++ b/packages/opentelemetry-exporter-zipkin/src/platform/node/util.ts @@ -61,11 +61,7 @@ export function prepareSend(urlStr: string, headers?: Record): z }); res.on('end', () => { const statusCode = res.statusCode || 0; - diag.debug( - 'Zipkin response status code: %d, body: %s', - statusCode, - rawData - ); + diag.debug(`Zipkin response status code: ${statusCode}, body: ${rawData}`); // Consider 2xx and 3xx as success. if (statusCode < 400) { @@ -91,7 +87,7 @@ export function prepareSend(urlStr: string, headers?: Record): z // Issue request to remote service const payload = JSON.stringify(zipkinSpans); - diag.debug('Zipkin request payload: %s', payload); + diag.debug(`Zipkin request payload: ${payload}`); req.write(payload, 'utf8'); req.end(); }; diff --git a/packages/opentelemetry-exporter-zipkin/src/transform.ts b/packages/opentelemetry-exporter-zipkin/src/transform.ts index 64e4b48bbf6..9ffd48ecce7 100644 --- a/packages/opentelemetry-exporter-zipkin/src/transform.ts +++ b/packages/opentelemetry-exporter-zipkin/src/transform.ts @@ -29,8 +29,8 @@ const ZIPKIN_SPAN_KIND_MAPPING = { [api.SpanKind.INTERNAL]: undefined, }; -export const defaultStatusCodeTagName = 'ot.status_code'; -export const defaultStatusDescriptionTagName = 'ot.status_description'; +export const defaultStatusCodeTagName = 'otel.status_code'; +export const defaultStatusErrorTagName = 'error'; /** * Translate OpenTelemetry ReadableSpan to ZipkinSpan format @@ -40,7 +40,7 @@ export function toZipkinSpan( span: ReadableSpan, serviceName: string, statusCodeTagName: string, - statusDescriptionTagName: string + statusErrorTagName: string ): zipkinTypes.Span { const zipkinSpan: zipkinTypes.Span = { traceId: span.spanContext().traceId, @@ -55,7 +55,7 @@ export function toZipkinSpan( span.attributes, span.status, statusCodeTagName, - statusDescriptionTagName, + statusErrorTagName, span.resource ), annotations: span.events.length @@ -71,16 +71,18 @@ export function _toZipkinTags( attributes: api.SpanAttributes, status: api.SpanStatus, statusCodeTagName: string, - statusDescriptionTagName: string, + statusErrorTagName: string, resource: Resource ): zipkinTypes.Tags { const tags: { [key: string]: string } = {}; for (const key of Object.keys(attributes)) { tags[key] = String(attributes[key]); } - tags[statusCodeTagName] = String(api.SpanStatusCode[status.code]); - if (status.message) { - tags[statusDescriptionTagName] = status.message; + if (status.code !== api.SpanStatusCode.UNSET) { + tags[statusCodeTagName] = String(api.SpanStatusCode[status.code]); + } + if (status.code === api.SpanStatusCode.ERROR && status.message) { + tags[statusErrorTagName] = status.message; } Object.keys(resource.attributes).forEach( diff --git a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts index ef43cff0f89..614d728cb5b 100644 --- a/packages/opentelemetry-exporter-zipkin/src/zipkin.ts +++ b/packages/opentelemetry-exporter-zipkin/src/zipkin.ts @@ -22,7 +22,7 @@ import * as zipkinTypes from './types'; import { toZipkinSpan, defaultStatusCodeTagName, - defaultStatusDescriptionTagName, + defaultStatusErrorTagName, } from './transform'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; import { prepareGetHeaders } from './utils'; @@ -47,7 +47,7 @@ export class ZipkinExporter implements SpanExporter { this._serviceName = config.serviceName; this._statusCodeTagName = config.statusCodeTagName || defaultStatusCodeTagName; this._statusDescriptionTagName = - config.statusDescriptionTagName || defaultStatusDescriptionTagName; + config.statusDescriptionTagName || defaultStatusErrorTagName; this._isShutdown = false; if (typeof config.getExportRequestHeaders === 'function') { this._getHeaders = prepareGetHeaders(config.getExportRequestHeaders); diff --git a/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts b/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts index ca8d37aa752..3c7b5a5ddb2 100644 --- a/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/common/transform.test.ts @@ -26,7 +26,7 @@ import * as assert from 'assert'; import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions'; import { defaultStatusCodeTagName, - defaultStatusDescriptionTagName, + defaultStatusErrorTagName, toZipkinSpan, _toZipkinAnnotations, _toZipkinTags, @@ -79,7 +79,7 @@ describe('transform', () => { span, 'my-service', defaultStatusCodeTagName, - defaultStatusDescriptionTagName + defaultStatusErrorTagName ); assert.deepStrictEqual(zipkinSpan, { kind: 'SERVER', @@ -101,7 +101,6 @@ describe('transform', () => { tags: { key1: 'value1', key2: 'value2', - [defaultStatusCodeTagName]: 'UNSET', [SemanticResourceAttributes.SERVICE_NAME]: 'zipkin-test', 'telemetry.sdk.language': language, 'telemetry.sdk.name': 'opentelemetry', @@ -125,7 +124,7 @@ describe('transform', () => { span, 'my-service', defaultStatusCodeTagName, - defaultStatusDescriptionTagName + defaultStatusErrorTagName ); assert.deepStrictEqual(zipkinSpan, { kind: 'SERVER', @@ -140,7 +139,6 @@ describe('transform', () => { name: span.name, parentId: undefined, tags: { - [defaultStatusCodeTagName]: 'UNSET', [SemanticResourceAttributes.SERVICE_NAME]: 'zipkin-test', 'telemetry.sdk.language': language, 'telemetry.sdk.name': 'opentelemetry', @@ -174,7 +172,7 @@ describe('transform', () => { span, 'my-service', defaultStatusCodeTagName, - defaultStatusDescriptionTagName + defaultStatusErrorTagName ); assert.deepStrictEqual(zipkinSpan, { kind: item.zipkin, @@ -189,7 +187,6 @@ describe('transform', () => { name: span.name, parentId: undefined, tags: { - [defaultStatusCodeTagName]: 'UNSET', [SemanticResourceAttributes.SERVICE_NAME]: 'zipkin-test', 'telemetry.sdk.language': language, 'telemetry.sdk.name': 'opentelemetry', @@ -220,14 +217,13 @@ describe('transform', () => { span.attributes, span.status, defaultStatusCodeTagName, - defaultStatusDescriptionTagName, + defaultStatusErrorTagName, DUMMY_RESOURCE ); assert.deepStrictEqual(tags, { key1: 'value1', key2: 'value2', - [defaultStatusCodeTagName]: 'UNSET', cost: '112.12', service: 'ui', version: '1', @@ -255,7 +251,7 @@ describe('transform', () => { span.attributes, span.status, defaultStatusCodeTagName, - defaultStatusDescriptionTagName, + defaultStatusErrorTagName, Resource.empty().merge( new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'zipkin-test', @@ -292,7 +288,7 @@ describe('transform', () => { span.attributes, span.status, defaultStatusCodeTagName, - defaultStatusDescriptionTagName, + defaultStatusErrorTagName, Resource.empty().merge( new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: 'zipkin-test', @@ -304,7 +300,7 @@ describe('transform', () => { key1: 'value1', key2: 'value2', [defaultStatusCodeTagName]: 'ERROR', - [defaultStatusDescriptionTagName]: status.message, + [defaultStatusErrorTagName]: status.message, [SemanticResourceAttributes.SERVICE_NAME]: 'zipkin-test', }); }); diff --git a/packages/opentelemetry-exporter-zipkin/test/helper.ts b/packages/opentelemetry-exporter-zipkin/test/helper.ts index b6896313296..c2e13dcdd8d 100644 --- a/packages/opentelemetry-exporter-zipkin/test/helper.ts +++ b/packages/opentelemetry-exporter-zipkin/test/helper.ts @@ -71,7 +71,7 @@ export function ensureSpanIsCorrect(span: Span) { localEndpoint: { serviceName: 'OpenTelemetry Service' }, tags: { component: 'foo', - 'ot.status_code': 'OK', + 'otel.status_code': 'OK', service: 'ui', version: '1', cost: '112.12', diff --git a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts index 8749917fe91..d78b46159c7 100644 --- a/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts +++ b/packages/opentelemetry-exporter-zipkin/test/node/zipkin.test.ts @@ -215,7 +215,7 @@ describe('Zipkin Exporter - node', () => { tags: { key1: 'value1', key2: 'value2', - 'ot.status_code': 'OK', + 'otel.status_code': 'OK', }, timestamp: startTime * MICROS_PER_SECS, traceId: span1.spanContext().traceId, @@ -230,7 +230,7 @@ describe('Zipkin Exporter - node', () => { }, name: span2.name, tags: { - 'ot.status_code': 'OK', + 'otel.status_code': 'OK', }, timestamp: hrTimeToMicroseconds([startTime, 0]), traceId: span2.spanContext().traceId, diff --git a/packages/opentelemetry-propagator-b3/package.json b/packages/opentelemetry-propagator-b3/package.json index 24fe03b7d75..5015c0a74bb 100644 --- a/packages/opentelemetry-propagator-b3/package.json +++ b/packages/opentelemetry-propagator-b3/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-b3", - "version": "0.25.0", + "version": "1.0.0", "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", @@ -45,7 +45,7 @@ "access": "public" }, "dependencies": { - "@opentelemetry/core": "0.25.0" + "@opentelemetry/core": "1.0.0" }, "peerDependencies": { "@opentelemetry/api": "^1.0.2" diff --git a/packages/opentelemetry-propagator-jaeger/package.json b/packages/opentelemetry-propagator-jaeger/package.json index 0d793bc93e1..16fe0436903 100644 --- a/packages/opentelemetry-propagator-jaeger/package.json +++ b/packages/opentelemetry-propagator-jaeger/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/propagator-jaeger", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Jaeger propagator provides HTTP header propagation for systems that are using Jaeger HTTP header format.", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -75,6 +75,6 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0" + "@opentelemetry/core": "1.0.0" } } diff --git a/packages/opentelemetry-resources/package.json b/packages/opentelemetry-resources/package.json index 4e71f7f23a5..2eb290aa59e 100644 --- a/packages/opentelemetry-resources/package.json +++ b/packages/opentelemetry-resources/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/resources", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry SDK resources", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -67,7 +67,7 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0" + "@opentelemetry/core": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/packages/opentelemetry-sdk-trace-base/package.json b/packages/opentelemetry-sdk-trace-base/package.json index 2d7a0102bd1..2926cd3a6ab 100644 --- a/packages/opentelemetry-sdk-trace-base/package.json +++ b/packages/opentelemetry-sdk-trace-base/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-base", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Tracing", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -82,9 +82,9 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0", "lodash.merge": "^4.6.2" } } diff --git a/packages/opentelemetry-sdk-trace-base/src/Span.ts b/packages/opentelemetry-sdk-trace-base/src/Span.ts index 429bf06e8d5..c4bd66b20cd 100644 --- a/packages/opentelemetry-sdk-trace-base/src/Span.ts +++ b/packages/opentelemetry-sdk-trace-base/src/Span.ts @@ -229,11 +229,7 @@ export class Span implements api.Span, ReadableSpan { private _isSpanEnded(): boolean { if (this._ended) { - api.diag.warn( - 'Can not execute the operation on ended Span {traceId: %s, spanId: %s}', - this._spanContext.traceId, - this._spanContext.spanId - ); + api.diag.warn(`Can not execute the operation on ended Span {traceId: ${this._spanContext.traceId}, spanId: ${this._spanContext.spanId}}`); } return this._ended; } diff --git a/packages/opentelemetry-sdk-trace-node/package.json b/packages/opentelemetry-sdk-trace-node/package.json index b8ecc09d730..69d5195d6d1 100644 --- a/packages/opentelemetry-sdk-trace-node/package.json +++ b/packages/opentelemetry-sdk-trace-node/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-node", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Node SDK provides automatic telemetry (tracing, metrics, etc) for Node.js applications", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -44,8 +44,8 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/resources": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", + "@opentelemetry/resources": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "@types/semver": "7.3.8", @@ -62,11 +62,11 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/context-async-hooks": "0.25.0", - "@opentelemetry/core": "0.25.0", - "@opentelemetry/propagator-b3": "0.25.0", - "@opentelemetry/propagator-jaeger": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/context-async-hooks": "1.0.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/propagator-b3": "1.0.0", + "@opentelemetry/propagator-jaeger": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "semver": "^7.3.5" } } diff --git a/packages/opentelemetry-sdk-trace-web/package.json b/packages/opentelemetry-sdk-trace-web/package.json index 8e6c82616d9..ca9cb926434 100644 --- a/packages/opentelemetry-sdk-trace-web/package.json +++ b/packages/opentelemetry-sdk-trace-web/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/sdk-trace-web", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry Web Tracer", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -49,9 +49,9 @@ "devDependencies": { "@babel/core": "7.15.0", "@opentelemetry/api": "^1.0.2", - "@opentelemetry/context-zone": "0.25.0", - "@opentelemetry/propagator-b3": "0.25.0", - "@opentelemetry/resources": "0.25.0", + "@opentelemetry/context-zone": "1.0.0", + "@opentelemetry/propagator-b3": "1.0.0", + "@opentelemetry/resources": "1.0.0", "@types/jquery": "3.5.6", "@types/mocha": "8.2.3", "@types/node": "14.17.11", @@ -82,8 +82,8 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0" + "@opentelemetry/core": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0" } } diff --git a/packages/opentelemetry-semantic-conventions/package.json b/packages/opentelemetry-semantic-conventions/package.json index fda3f4f4147..54114b923c7 100644 --- a/packages/opentelemetry-semantic-conventions/package.json +++ b/packages/opentelemetry-semantic-conventions/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/semantic-conventions", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTelemetry semantic conventions", "main": "build/src/index.js", "module": "build/esm/index.js", diff --git a/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts b/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts index eb7260c0738..48fecf29bed 100644 --- a/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts +++ b/packages/opentelemetry-semantic-conventions/src/trace/SemanticAttributes.ts @@ -372,7 +372,9 @@ clear whether the exception will escape. HTTP_TARGET: 'http.target', /** - * The value of the [HTTP host header](https://tools.ietf.org/html/rfc7230#section-5.4). When the header is empty or not present, this attribute should be the same. + * The value of the [HTTP host header](https://tools.ietf.org/html/rfc7230#section-5.4). An empty Host header should also be reported, see note. + * + * Note: When the header is present but empty the attribute SHOULD be set to the empty string. Note that this is a valid situation that is expected in certain cases, according the aforementioned [section of RFC 7230](https://tools.ietf.org/html/rfc7230#section-5.4). When the header is not set the attribute MUST NOT be set. */ HTTP_HOST: 'http.host', @@ -433,7 +435,17 @@ clear whether the exception will escape. /** * The IP address of the original client behind all proxies, if known (e.g. from [X-Forwarded-For](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For)). * - * Note: This is not necessarily the same as `net.peer.ip`, which would identify the network-level peer, which may be a proxy. + * Note: This is not necessarily the same as `net.peer.ip`, which would +identify the network-level peer, which may be a proxy. + +This attribute should be set when a source of information different +from the one used for `net.peer.ip`, is available even if that other +source just confirms the same value as `net.peer.ip`. +Rationale: For `net.peer.ip`, one typically does not know if it +comes from a proxy, reverse proxy, or the actual client. Setting +`http.client_ip` when it's the same as `net.peer.ip` means that +one is at least somewhat confident that the address is not that of +the closest proxy. */ HTTP_CLIENT_IP: 'http.client_ip', @@ -607,6 +619,11 @@ clear whether the exception will escape. */ MESSAGING_OPERATION: 'messaging.operation', + /** + * The identifier for the consumer receiving a message. For Kafka, set it to `{messaging.kafka.consumer_group} - {messaging.kafka.client_id}`, if both are present, or only `messaging.kafka.consumer_group`. For brokers, such as RabbitMQ and Artemis, set it to the `client_id` of the client consuming the message. + */ + MESSAGING_CONSUMER_ID: 'messaging.consumer_id', + /** * RabbitMQ message routing key. */ @@ -682,6 +699,28 @@ clear whether the exception will escape. * `error.message` property of response if it is an error response. */ RPC_JSONRPC_ERROR_MESSAGE: 'rpc.jsonrpc.error_message', + + /** + * Whether this is a received or sent message. + */ + MESSAGE_TYPE: 'message.type', + + /** + * MUST be calculated as two different counters starting from `1` one for sent messages and one for received message. + * + * Note: This way we guarantee that the values will be consistent between different implementations. + */ + MESSAGE_ID: 'message.id', + + /** + * Compressed size of the message in bytes. + */ + MESSAGE_COMPRESSED_SIZE: 'message.compressed_size', + + /** + * Uncompressed size of the message in bytes. + */ + MESSAGE_UNCOMPRESSED_SIZE: 'message.uncompressed_size', } // Enum definitions @@ -1014,3 +1053,13 @@ export enum RpcGrpcStatusCodeValues { UNAUTHENTICATED = 16, } + + + +export enum MessageTypeValues { + /** sent. */ + SENT = 'SENT', + /** received. */ + RECEIVED = 'RECEIVED', +} + diff --git a/packages/opentelemetry-shim-opentracing/package.json b/packages/opentelemetry-shim-opentracing/package.json index 6c1348d80c1..496657c20ab 100644 --- a/packages/opentelemetry-shim-opentracing/package.json +++ b/packages/opentelemetry-shim-opentracing/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/shim-opentracing", - "version": "0.25.0", + "version": "1.0.0", "description": "OpenTracing to OpenTelemetry shim", "main": "build/src/index.js", "types": "build/src/index.d.ts", @@ -41,9 +41,9 @@ }, "devDependencies": { "@opentelemetry/api": "^1.0.2", - "@opentelemetry/propagator-b3": "0.25.0", - "@opentelemetry/propagator-jaeger": "0.25.0", - "@opentelemetry/sdk-trace-base": "0.25.0", + "@opentelemetry/propagator-b3": "1.0.0", + "@opentelemetry/propagator-jaeger": "1.0.0", + "@opentelemetry/sdk-trace-base": "1.0.0", "@types/mocha": "8.2.3", "@types/node": "14.17.11", "codecov": "3.8.3", @@ -57,8 +57,8 @@ "@opentelemetry/api": "^1.0.2" }, "dependencies": { - "@opentelemetry/core": "0.25.0", - "@opentelemetry/semantic-conventions": "0.25.0", + "@opentelemetry/core": "1.0.0", + "@opentelemetry/semantic-conventions": "1.0.0", "opentracing": "^0.14.4" } } diff --git a/packages/template/package.json b/packages/template/package.json index dea1646f165..861fb6c69d0 100644 --- a/packages/template/package.json +++ b/packages/template/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/template", - "version": "0.25.0", + "version": "1.0.0", "private": true, "publishConfig": { "access": "restricted" diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh index 89718f52e1b..dbd99464eac 100755 --- a/scripts/semconv/generate.sh +++ b/scripts/semconv/generate.sh @@ -4,8 +4,8 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_DIR="${SCRIPT_DIR}/../../" # freeze the spec version to make SpanAttributess generation reproducible -SPEC_VERSION=v1.6.1 -GENERATOR_VERSION=0.5.0 +SPEC_VERSION=v1.7.0 +GENERATOR_VERSION=0.7.0 cd ${SCRIPT_DIR} diff --git a/tsconfig.base.json b/tsconfig.base.json index b2d1a3bd96f..2d628cad8de 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -6,19 +6,20 @@ "declaration": true, "declarationMap": true, "forceConsistentCasingInFileNames": true, + "incremental": true, + "inlineSources": true, "module": "commonjs", + "newLine": "LF", "noEmitOnError": true, "noFallthroughCasesInSwitch": true, + "noImplicitOverride": true, "noImplicitReturns": true, "noUnusedLocals": true, - "noImplicitOverride": true, "pretty": true, "sourceMap": true, "strict": true, "strictNullChecks": true, - "target": "es2017", - "incremental": true, - "newLine": "LF" + "target": "es2017" }, "exclude": [ "node_modules" diff --git a/tsconfig.esm.json b/tsconfig.esm.json index 57f33c032a0..4bbf108bfcf 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -2,15 +2,6 @@ "extends": "./tsconfig.base.esm.json", "files": [], "references": [ - { - "path": "backwards-compatability/node10" - }, - { - "path": "backwards-compatability/node12" - }, - { - "path": "backwards-compatability/node8" - }, { "path": "packages/opentelemetry-context-async-hooks" }, @@ -26,15 +17,6 @@ { "path": "packages/opentelemetry-exporter-jaeger" }, - { - "path": "packages/opentelemetry-exporter-otlp-grpc" - }, - { - "path": "packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json" - }, - { - "path": "packages/opentelemetry-exporter-otlp-proto" - }, { "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json" }, diff --git a/tsconfig.json b/tsconfig.json index 8c9f7c196ae..17cfa102617 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,9 @@ "typedocOptions": { "packages": [ "experimental/packages/opentelemetry-api-metrics", + "experimental/packages/opentelemetry-exporter-otlp-grpc", + "experimental/packages/opentelemetry-exporter-otlp-http", + "experimental/packages/opentelemetry-exporter-otlp-proto", "experimental/packages/opentelemetry-exporter-prometheus", "experimental/packages/opentelemetry-instrumentation-fetch", "experimental/packages/opentelemetry-instrumentation-grpc", @@ -16,9 +19,6 @@ "packages/opentelemetry-context-zone", "packages/opentelemetry-core", "packages/opentelemetry-exporter-jaeger", - "packages/opentelemetry-exporter-otlp-grpc", - "packages/opentelemetry-exporter-otlp-http", - "packages/opentelemetry-exporter-otlp-proto", "packages/opentelemetry-exporter-zipkin", "packages/opentelemetry-propagator-b3", "packages/opentelemetry-propagator-jaeger", @@ -41,15 +41,6 @@ "excludePrivate": true }, "references": [ - { - "path": "backwards-compatability/node10" - }, - { - "path": "backwards-compatability/node12" - }, - { - "path": "backwards-compatability/node8" - }, { "path": "packages/opentelemetry-context-async-hooks" }, @@ -65,15 +56,6 @@ { "path": "packages/opentelemetry-exporter-jaeger" }, - { - "path": "packages/opentelemetry-exporter-otlp-grpc" - }, - { - "path": "packages/opentelemetry-exporter-otlp-http" - }, - { - "path": "packages/opentelemetry-exporter-otlp-proto" - }, { "path": "packages/opentelemetry-exporter-zipkin" },