From f0dc893b79ae7268f7fc80b7e133d0cdbb5a294c Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Mon, 27 Sep 2021 16:30:07 -0400 Subject: [PATCH] chore: mark otlp exporters experimental (#2490) --- .gitmodules | 8 +++---- examples/otlp-exporter-node/README.md | 4 ++-- .../.eslintignore | 0 .../.eslintrc.js | 2 +- .../.npmignore | 0 .../opentelemetry-exporter-otlp-grpc/LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../opentelemetry-exporter-otlp-grpc/protos | 0 .../src/OTLPExporterNodeBase.ts | 0 .../src/OTLPMetricExporter.ts | 0 .../src/OTLPTraceExporter.ts | 0 .../src/index.ts | 0 .../src/types.ts | 0 .../src/util.ts | 0 .../submodule.md | 0 .../test/OTLPExporterNodeBase.test.ts | 0 .../test/OTLPMetricExporter.test.ts | 0 .../test/OTLPTraceExporter.test.ts | 0 .../test/certs/ca.crt | 0 .../test/certs/ca.key | 0 .../test/certs/client.crt | 0 .../test/certs/client.csr | 0 .../test/certs/client.key | 0 .../test/certs/regenerate.sh | 0 .../test/certs/server.crt | 0 .../test/certs/server.csr | 0 .../test/certs/server.key | 0 .../test/helper.ts | 0 .../test/util.test.ts | 0 .../tsconfig.json | 9 +++----- .../.eslintignore | 0 .../.eslintrc.js | 2 +- .../.npmignore | 0 .../opentelemetry-exporter-otlp-http/LICENSE | 0 .../README.md | 0 .../karma.conf.js | 4 ++-- .../package.json | 2 +- .../src/OTLPExporterBase.ts | 0 .../src/index.ts | 0 .../browser/OTLPExporterBrowserBase.ts | 0 .../platform/browser/OTLPMetricExporter.ts | 0 .../src/platform/browser/OTLPTraceExporter.ts | 0 .../src/platform/browser/index.ts | 0 .../src/platform/browser/util.ts | 0 .../src/platform/index.ts | 0 .../src/platform/node/OTLPExporterNodeBase.ts | 0 .../src/platform/node/OTLPMetricExporter.ts | 0 .../src/platform/node/OTLPTraceExporter.ts | 0 .../src/platform/node/index.ts | 0 .../src/platform/node/types.ts | 0 .../src/platform/node/util.ts | 0 .../src/transform.ts | 0 .../src/transformMetrics.ts | 0 .../src/types.ts | 0 .../src/util.ts | 0 .../browser/CollectorMetricExporter.test.ts | 0 .../browser/CollectorTraceExporter.test.ts | 0 .../test/browser/index-webpack.ts | 0 .../test/browser/util.test.ts | 0 .../test/certs/ca.crt | 0 .../test/certs/ca.key | 0 .../test/certs/client.crt | 0 .../test/certs/client.csr | 0 .../test/certs/client.key | 0 .../test/certs/regenerate.sh | 0 .../test/certs/server.crt | 0 .../test/certs/server.csr | 0 .../test/certs/server.key | 0 .../common/CollectorMetricExporter.test.ts | 0 .../common/CollectorTraceExporter.test.ts | 0 .../test/common/transform.test.ts | 0 .../test/common/transformMetrics.test.ts | 0 .../test/common/utils.test.ts | 0 .../test/helper.ts | 0 .../test/node/CollectorMetricExporter.test.ts | 0 .../test/node/CollectorTraceExporter.test.ts | 0 .../test/node/nodeHelpers.ts | 0 .../tsconfig.esm.json | 19 ++++++++++++++++ .../tsconfig.json | 19 ++++++++++++++++ .../.eslintignore | 0 .../.eslintrc.js | 2 +- .../.npmignore | 0 .../opentelemetry-exporter-otlp-proto/LICENSE | 0 .../README.md | 0 .../package.json | 2 +- .../opentelemetry-exporter-otlp-proto/protos | 0 .../src/OTLPExporterNodeBase.ts | 0 .../src/OTLPMetricExporter.ts | 0 .../src/OTLPTraceExporter.ts | 0 .../src/index.ts | 0 .../src/types.ts | 0 .../src/util.ts | 0 .../submodule.md | 0 .../test/OTLPMetricExporter.test.ts | 0 .../test/OTLPTraceExporter.test.ts | 0 .../test/certs/ca.crt | 0 .../test/certs/ca.key | 0 .../test/certs/client.crt | 0 .../test/certs/client.csr | 0 .../test/certs/client.key | 0 .../test/certs/regenerate.sh | 0 .../test/certs/server.crt | 0 .../test/certs/server.csr | 0 .../test/certs/server.key | 0 .../test/helper.ts | 0 .../tsconfig.json | 9 +++----- .../tsconfig.json | 3 +++ experimental/tsconfig.esm.json | 12 ++++++++++ experimental/tsconfig.json | 12 ++++++++++ .../tsconfig.esm.json | 22 ------------------- .../tsconfig.json | 22 ------------------- tsconfig.esm.json | 9 -------- tsconfig.json | 15 +++---------- 114 files changed, 88 insertions(+), 91 deletions(-) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/.eslintignore (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/.eslintrc.js (71%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/.npmignore (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/LICENSE (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/README.md (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/package.json (97%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/protos (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/OTLPExporterNodeBase.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/OTLPMetricExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/OTLPTraceExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/index.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/types.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/src/util.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/submodule.md (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/OTLPExporterNodeBase.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/OTLPMetricExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/OTLPTraceExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/ca.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/ca.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/client.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/client.csr (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/client.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/regenerate.sh (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/server.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/server.csr (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/certs/server.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/helper.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/test/util.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-grpc/tsconfig.json (57%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/.eslintignore (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/.eslintrc.js (75%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/.npmignore (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/LICENSE (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/README.md (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/karma.conf.js (87%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/package.json (98%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/OTLPExporterBase.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/index.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPMetricExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/OTLPTraceExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/index.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/browser/util.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/index.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/OTLPExporterNodeBase.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/OTLPMetricExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/OTLPTraceExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/index.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/types.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/platform/node/util.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/transform.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/transformMetrics.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/types.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/src/util.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/CollectorMetricExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/CollectorTraceExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/index-webpack.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/browser/util.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/ca.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/ca.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/client.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/client.csr (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/client.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/regenerate.sh (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/server.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/server.csr (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/certs/server.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/CollectorMetricExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/CollectorTraceExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/transform.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/transformMetrics.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/common/utils.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/helper.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/node/CollectorMetricExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/node/CollectorTraceExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-http/test/node/nodeHelpers.ts (100%) create mode 100644 experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json create mode 100644 experimental/packages/opentelemetry-exporter-otlp-http/tsconfig.json rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/.eslintignore (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/.eslintrc.js (71%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/.npmignore (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/LICENSE (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/README.md (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/package.json (97%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/protos (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/OTLPExporterNodeBase.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/OTLPMetricExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/OTLPTraceExporter.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/index.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/types.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/src/util.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/submodule.md (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/OTLPMetricExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/OTLPTraceExporter.test.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/ca.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/ca.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/client.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/client.csr (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/client.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/regenerate.sh (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/server.crt (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/server.csr (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/certs/server.key (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/test/helper.ts (100%) rename {packages => experimental/packages}/opentelemetry-exporter-otlp-proto/tsconfig.json (57%) delete mode 100644 packages/opentelemetry-exporter-otlp-http/tsconfig.esm.json delete mode 100644 packages/opentelemetry-exporter-otlp-http/tsconfig.json diff --git a/.gitmodules b/.gitmodules index f66e08a1b8..ac506a776f 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/examples/otlp-exporter-node/README.md b/examples/otlp-exporter-node/README.md index abfa241965..21fea5422f 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/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-grpc/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js similarity index 71% rename from packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js rename to experimental/packages/opentelemetry-exporter-otlp-grpc/.eslintrc.js index fc4d038120..3ed0fbeba3 100644 --- a/packages/opentelemetry-exporter-otlp-grpc/.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 97% rename from packages/opentelemetry-exporter-otlp-grpc/package.json rename to experimental/packages/opentelemetry-exporter-otlp-grpc/package.json index e4a7e9411b..5a2f4c86fe 100644 --- a/packages/opentelemetry-exporter-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-grpc/package.json @@ -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" 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 cfc7b73a48..caced6b4e8 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 9dfe62f9b8..e41d9a9299 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 455b1437c8..4c60b54edb 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 98% rename from packages/opentelemetry-exporter-otlp-http/package.json rename to experimental/packages/opentelemetry-exporter-otlp-http/package.json index 3a03727c43..00e2bcdf76 100644 --- a/packages/opentelemetry-exporter-otlp-http/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-http/package.json @@ -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" 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 100% 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 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 100% 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 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 0000000000..7b09613481 --- /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 0000000000..3c062d3feb --- /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-proto/.eslintrc.js b/experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js similarity index 71% rename from packages/opentelemetry-exporter-otlp-proto/.eslintrc.js rename to experimental/packages/opentelemetry-exporter-otlp-proto/.eslintrc.js index fc4d038120..3ed0fbeba3 100644 --- a/packages/opentelemetry-exporter-otlp-proto/.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 97% rename from packages/opentelemetry-exporter-otlp-proto/package.json rename to experimental/packages/opentelemetry-exporter-otlp-proto/package.json index b890fd32d9..f8fb5c5e07 100644 --- a/packages/opentelemetry-exporter-otlp-proto/package.json +++ b/experimental/packages/opentelemetry-exporter-otlp-proto/package.json @@ -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" 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 cfc7b73a48..caced6b4e8 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/tsconfig.json b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json index 948abef3ce..3c062d3feb 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/tsconfig.esm.json b/experimental/tsconfig.esm.json index cd3052ad27..c37493f8e7 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" }, diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json index a4220672a8..6571f7fa7c 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" }, 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 7a9bb54ea7..0000000000 --- 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 1d7ba827ac..0000000000 --- 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/tsconfig.esm.json b/tsconfig.esm.json index 57f33c032a..528d200ba5 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -26,15 +26,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 8c9f7c196a..be14fd4643 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", @@ -65,15 +65,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" },