diff --git a/.gitmodules b/.gitmodules index 278e2d9a57..2a5d6c4ac7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ -[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos"] - path = experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos +[submodule "packages/exporter-trace-otlp-proto/protos"] + path = packages/exporter-trace-otlp-proto/protos url = https://github.com/open-telemetry/opentelemetry-proto.git -[submodule "experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos"] - path = experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos +[submodule "packages/exporter-trace-otlp-grpc/protos"] + path = packages/exporter-trace-otlp-grpc/protos url = https://github.com/open-telemetry/opentelemetry-proto.git [submodule "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos"] path = experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/protos diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md index 1ab397a2e9..99f13136be 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/README.md @@ -68,4 +68,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-grpc.svg [opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector [semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service -[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-grpc +[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-grpc diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json index d68000d005..715b7748f3 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json @@ -67,7 +67,7 @@ "@opentelemetry/api": "^1.0.3" }, "dependencies": { - "@grpc/grpc-js": "^1.3.7", + "@grpc/grpc-js": "1.4.4", "@grpc/proto-loader": "^0.6.4", "@opentelemetry/core": "1.0.1", "@opentelemetry/exporter-metrics-otlp-http": "0.27.0", diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json index c899b0fb43..72219a62cd 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json @@ -11,12 +11,6 @@ "references": [ { "path": "../opentelemetry-exporter-metrics-otlp-http" - }, - { - "path": "../opentelemetry-exporter-trace-otlp-grpc" - }, - { - "path": "../opentelemetry-exporter-trace-otlp-http" } ] } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md index 70b39441d4..fc7efb7732 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/README.md @@ -122,4 +122,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector [opentelemetry-spec-protocol-exporter]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/protocol/exporter.md#configuration-options [semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service -[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-http +[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-http diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json index 1334f123db..379f547a46 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json" - } ] } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json index 709c58f870..a00e018fe3 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.esm2015.json @@ -7,10 +7,5 @@ }, "include": [ "src/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-exporter-trace-otlp-http/tsconfig.esm2015.json" - } ] } \ No newline at end of file diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json index 075a501621..ed9d0830bd 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json @@ -7,10 +7,5 @@ "include": [ "src/**/*.ts", "test/**/*.ts" - ], - "references": [ - { - "path": "../opentelemetry-exporter-trace-otlp-http" - } ] } diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md index 9a53e00458..ff033a00f0 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/README.md @@ -62,4 +62,4 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-metrics-otlp-proto.svg [opentelemetry-collector-url]: https://github.com/open-telemetry/opentelemetry-collector [semconv-resource-service-name]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/resource/semantic_conventions/README.md#service -[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-trace-otlp-http +[trace-exporter-url]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/exporter-trace-otlp-http diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json index 408cd8004a..72219a62cd 100644 --- a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json @@ -11,12 +11,6 @@ "references": [ { "path": "../opentelemetry-exporter-metrics-otlp-http" - }, - { - "path": "../opentelemetry-exporter-trace-otlp-http" - }, - { - "path": "../opentelemetry-exporter-trace-otlp-proto" } ] } diff --git a/experimental/tsconfig.json b/experimental/tsconfig.json index 641b1e1833..e7c2b6886c 100644 --- a/experimental/tsconfig.json +++ b/experimental/tsconfig.json @@ -17,15 +17,6 @@ { "path": "packages/opentelemetry-exporter-prometheus" }, - { - "path": "packages/opentelemetry-exporter-trace-otlp-grpc" - }, - { - "path": "packages/opentelemetry-exporter-trace-otlp-http/tsconfig.all.json" - }, - { - "path": "packages/opentelemetry-exporter-trace-otlp-proto" - }, { "path": "packages/opentelemetry-instrumentation-fetch/tsconfig.all.json" }, diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.eslintignore b/packages/exporter-trace-otlp-grpc/.eslintignore similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.eslintignore rename to packages/exporter-trace-otlp-grpc/.eslintignore diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.eslintrc.js b/packages/exporter-trace-otlp-grpc/.eslintrc.js similarity index 71% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.eslintrc.js rename to packages/exporter-trace-otlp-grpc/.eslintrc.js index 3ed0fbeba3..fc4d038120 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.eslintrc.js +++ b/packages/exporter-trace-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/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.npmignore b/packages/exporter-trace-otlp-grpc/.npmignore similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/.npmignore rename to packages/exporter-trace-otlp-grpc/.npmignore diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/LICENSE b/packages/exporter-trace-otlp-grpc/LICENSE similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/LICENSE rename to packages/exporter-trace-otlp-grpc/LICENSE diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/README.md b/packages/exporter-trace-otlp-grpc/README.md similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/README.md rename to packages/exporter-trace-otlp-grpc/README.md diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/package.json b/packages/exporter-trace-otlp-grpc/package.json similarity index 96% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/package.json rename to packages/exporter-trace-otlp-grpc/package.json index 6b3dfe980f..9f410d18f2 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/package.json +++ b/packages/exporter-trace-otlp-grpc/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-grpc", - "version": "0.27.0", + "version": "1.0.1", "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" diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos b/packages/exporter-trace-otlp-grpc/protos similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/protos rename to packages/exporter-trace-otlp-grpc/protos diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts b/packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts rename to packages/exporter-trace-otlp-grpc/src/OTLPExporterNodeBase.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts rename to packages/exporter-trace-otlp-grpc/src/OTLPTraceExporter.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/index.ts b/packages/exporter-trace-otlp-grpc/src/index.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/index.ts rename to packages/exporter-trace-otlp-grpc/src/index.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/types.ts b/packages/exporter-trace-otlp-grpc/src/types.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/types.ts rename to packages/exporter-trace-otlp-grpc/src/types.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/util.ts b/packages/exporter-trace-otlp-grpc/src/util.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/src/util.ts rename to packages/exporter-trace-otlp-grpc/src/util.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/submodule.md b/packages/exporter-trace-otlp-grpc/submodule.md similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/submodule.md rename to packages/exporter-trace-otlp-grpc/submodule.md diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/OTLPExporterNodeBase.test.ts b/packages/exporter-trace-otlp-grpc/test/OTLPExporterNodeBase.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/OTLPExporterNodeBase.test.ts rename to packages/exporter-trace-otlp-grpc/test/OTLPExporterNodeBase.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts b/packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts rename to packages/exporter-trace-otlp-grpc/test/OTLPTraceExporter.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/ca.crt b/packages/exporter-trace-otlp-grpc/test/certs/ca.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/ca.crt rename to packages/exporter-trace-otlp-grpc/test/certs/ca.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/ca.key b/packages/exporter-trace-otlp-grpc/test/certs/ca.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/ca.key rename to packages/exporter-trace-otlp-grpc/test/certs/ca.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/client.crt b/packages/exporter-trace-otlp-grpc/test/certs/client.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/client.crt rename to packages/exporter-trace-otlp-grpc/test/certs/client.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/client.csr b/packages/exporter-trace-otlp-grpc/test/certs/client.csr similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/client.csr rename to packages/exporter-trace-otlp-grpc/test/certs/client.csr diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/client.key b/packages/exporter-trace-otlp-grpc/test/certs/client.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/client.key rename to packages/exporter-trace-otlp-grpc/test/certs/client.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/regenerate.sh b/packages/exporter-trace-otlp-grpc/test/certs/regenerate.sh similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/regenerate.sh rename to packages/exporter-trace-otlp-grpc/test/certs/regenerate.sh diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/server.crt b/packages/exporter-trace-otlp-grpc/test/certs/server.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/server.crt rename to packages/exporter-trace-otlp-grpc/test/certs/server.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/server.csr b/packages/exporter-trace-otlp-grpc/test/certs/server.csr similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/server.csr rename to packages/exporter-trace-otlp-grpc/test/certs/server.csr diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/server.key b/packages/exporter-trace-otlp-grpc/test/certs/server.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/certs/server.key rename to packages/exporter-trace-otlp-grpc/test/certs/server.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/traceHelper.ts b/packages/exporter-trace-otlp-grpc/test/traceHelper.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/traceHelper.ts rename to packages/exporter-trace-otlp-grpc/test/traceHelper.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/util.test.ts b/packages/exporter-trace-otlp-grpc/test/util.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/test/util.test.ts rename to packages/exporter-trace-otlp-grpc/test/util.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json b/packages/exporter-trace-otlp-grpc/tsconfig.json similarity index 61% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json rename to packages/exporter-trace-otlp-grpc/tsconfig.json index 075a501621..e95e7e3c76 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/tsconfig.json +++ b/packages/exporter-trace-otlp-grpc/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../opentelemetry-exporter-trace-otlp-http" + "path": "../exporter-trace-otlp-http" } ] } diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/.eslintignore b/packages/exporter-trace-otlp-http/.eslintignore similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/.eslintignore rename to packages/exporter-trace-otlp-http/.eslintignore diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/.eslintrc.js b/packages/exporter-trace-otlp-http/.eslintrc.js similarity index 75% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/.eslintrc.js rename to packages/exporter-trace-otlp-http/.eslintrc.js index e41d9a9299..9dfe62f9b8 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/.eslintrc.js +++ b/packages/exporter-trace-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/experimental/packages/opentelemetry-exporter-trace-otlp-http/.npmignore b/packages/exporter-trace-otlp-http/.npmignore similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/.npmignore rename to packages/exporter-trace-otlp-http/.npmignore diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/LICENSE b/packages/exporter-trace-otlp-http/LICENSE similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/LICENSE rename to packages/exporter-trace-otlp-http/LICENSE diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/README.md b/packages/exporter-trace-otlp-http/README.md similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/README.md rename to packages/exporter-trace-otlp-http/README.md diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/karma.conf.js b/packages/exporter-trace-otlp-http/karma.conf.js similarity index 87% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/karma.conf.js rename to packages/exporter-trace-otlp-http/karma.conf.js index 4c60b54edb..455b1437c8 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/karma.conf.js +++ b/packages/exporter-trace-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/experimental/packages/opentelemetry-exporter-trace-otlp-http/package.json b/packages/exporter-trace-otlp-http/package.json similarity index 97% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/package.json rename to packages/exporter-trace-otlp-http/package.json index 490a7ee07c..e3eb9afe55 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/package.json +++ b/packages/exporter-trace-otlp-http/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-http", - "version": "0.27.0", + "version": "1.0.1", "description": "OpenTelemetry Collector Trace Exporter allows user to send collected traces to the OpenTelemetry Collector", "main": "build/src/index.js", "module": "build/esm/index.js", @@ -23,7 +23,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.all.json", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/OTLPExporterBase.ts b/packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/OTLPExporterBase.ts rename to packages/exporter-trace-otlp-http/src/OTLPExporterBase.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/index.ts b/packages/exporter-trace-otlp-http/src/index.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/index.ts rename to packages/exporter-trace-otlp-http/src/index.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts b/packages/exporter-trace-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts rename to packages/exporter-trace-otlp-http/src/platform/browser/OTLPExporterBrowserBase.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts rename to packages/exporter-trace-otlp-http/src/platform/browser/OTLPTraceExporter.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/index.ts b/packages/exporter-trace-otlp-http/src/platform/browser/index.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/index.ts rename to packages/exporter-trace-otlp-http/src/platform/browser/index.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/util.ts b/packages/exporter-trace-otlp-http/src/platform/browser/util.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/browser/util.ts rename to packages/exporter-trace-otlp-http/src/platform/browser/util.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/index.ts b/packages/exporter-trace-otlp-http/src/platform/index.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/index.ts rename to packages/exporter-trace-otlp-http/src/platform/index.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/OTLPExporterNodeBase.ts b/packages/exporter-trace-otlp-http/src/platform/node/OTLPExporterNodeBase.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/OTLPExporterNodeBase.ts rename to packages/exporter-trace-otlp-http/src/platform/node/OTLPExporterNodeBase.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts rename to packages/exporter-trace-otlp-http/src/platform/node/OTLPTraceExporter.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/index.ts b/packages/exporter-trace-otlp-http/src/platform/node/index.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/index.ts rename to packages/exporter-trace-otlp-http/src/platform/node/index.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/types.ts b/packages/exporter-trace-otlp-http/src/platform/node/types.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/types.ts rename to packages/exporter-trace-otlp-http/src/platform/node/types.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/util.ts b/packages/exporter-trace-otlp-http/src/platform/node/util.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/platform/node/util.ts rename to packages/exporter-trace-otlp-http/src/platform/node/util.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/transform.ts b/packages/exporter-trace-otlp-http/src/transform.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/transform.ts rename to packages/exporter-trace-otlp-http/src/transform.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/types.ts b/packages/exporter-trace-otlp-http/src/types.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/types.ts rename to packages/exporter-trace-otlp-http/src/types.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/src/util.ts b/packages/exporter-trace-otlp-http/src/util.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/src/util.ts rename to packages/exporter-trace-otlp-http/src/util.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts b/packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts rename to packages/exporter-trace-otlp-http/test/browser/CollectorTraceExporter.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/browser/index-webpack.ts b/packages/exporter-trace-otlp-http/test/browser/index-webpack.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/browser/index-webpack.ts rename to packages/exporter-trace-otlp-http/test/browser/index-webpack.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/browser/util.test.ts b/packages/exporter-trace-otlp-http/test/browser/util.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/browser/util.test.ts rename to packages/exporter-trace-otlp-http/test/browser/util.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/ca.crt b/packages/exporter-trace-otlp-http/test/certs/ca.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/ca.crt rename to packages/exporter-trace-otlp-http/test/certs/ca.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/ca.key b/packages/exporter-trace-otlp-http/test/certs/ca.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/ca.key rename to packages/exporter-trace-otlp-http/test/certs/ca.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/client.crt b/packages/exporter-trace-otlp-http/test/certs/client.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/client.crt rename to packages/exporter-trace-otlp-http/test/certs/client.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/client.csr b/packages/exporter-trace-otlp-http/test/certs/client.csr similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/client.csr rename to packages/exporter-trace-otlp-http/test/certs/client.csr diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/client.key b/packages/exporter-trace-otlp-http/test/certs/client.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/client.key rename to packages/exporter-trace-otlp-http/test/certs/client.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/regenerate.sh b/packages/exporter-trace-otlp-http/test/certs/regenerate.sh similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/regenerate.sh rename to packages/exporter-trace-otlp-http/test/certs/regenerate.sh diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/server.crt b/packages/exporter-trace-otlp-http/test/certs/server.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/server.crt rename to packages/exporter-trace-otlp-http/test/certs/server.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/server.csr b/packages/exporter-trace-otlp-http/test/certs/server.csr similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/server.csr rename to packages/exporter-trace-otlp-http/test/certs/server.csr diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/server.key b/packages/exporter-trace-otlp-http/test/certs/server.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/certs/server.key rename to packages/exporter-trace-otlp-http/test/certs/server.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/common/CollectorTraceExporter.test.ts b/packages/exporter-trace-otlp-http/test/common/CollectorTraceExporter.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/common/CollectorTraceExporter.test.ts rename to packages/exporter-trace-otlp-http/test/common/CollectorTraceExporter.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/common/transform.test.ts b/packages/exporter-trace-otlp-http/test/common/transform.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/common/transform.test.ts rename to packages/exporter-trace-otlp-http/test/common/transform.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/common/utils.test.ts b/packages/exporter-trace-otlp-http/test/common/utils.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/common/utils.test.ts rename to packages/exporter-trace-otlp-http/test/common/utils.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts b/packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts rename to packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/node/nodeHelpers.ts b/packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/node/nodeHelpers.ts rename to packages/exporter-trace-otlp-http/test/node/nodeHelpers.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/test/traceHelper.ts b/packages/exporter-trace-otlp-http/test/traceHelper.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/test/traceHelper.ts rename to packages/exporter-trace-otlp-http/test/traceHelper.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.all.json b/packages/exporter-trace-otlp-http/tsconfig.all.json similarity index 78% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.all.json rename to packages/exporter-trace-otlp-http/tsconfig.all.json index 1a2f9e96aa..7414597cb3 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.all.json +++ b/packages/exporter-trace-otlp-http/tsconfig.all.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "files": [], "references": [ { "path": "./tsconfig.json" }, diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json b/packages/exporter-trace-otlp-http/tsconfig.esm.json similarity index 78% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json rename to packages/exporter-trace-otlp-http/tsconfig.esm.json index 379f547a46..a94adff6aa 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm.json +++ b/packages/exporter-trace-otlp-http/tsconfig.esm.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm.json", + "extends": "../../tsconfig.base.esm.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm", diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm2015.json b/packages/exporter-trace-otlp-http/tsconfig.esm2015.json similarity index 78% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm2015.json rename to packages/exporter-trace-otlp-http/tsconfig.esm2015.json index b1a5a79f6b..06f2e5a873 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.esm2015.json +++ b/packages/exporter-trace-otlp-http/tsconfig.esm2015.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.esm2015.json", + "extends": "../../tsconfig.base.esm2015.json", "compilerOptions": { "rootDir": "src", "outDir": "build/esm2015", diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json b/packages/exporter-trace-otlp-http/tsconfig.json similarity index 74% rename from experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json rename to packages/exporter-trace-otlp-http/tsconfig.json index ed9d0830bd..bdc94d2213 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-http/tsconfig.json +++ b/packages/exporter-trace-otlp-http/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/.eslintignore b/packages/exporter-trace-otlp-proto/.eslintignore similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/.eslintignore rename to packages/exporter-trace-otlp-proto/.eslintignore diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/.eslintrc.js b/packages/exporter-trace-otlp-proto/.eslintrc.js similarity index 71% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/.eslintrc.js rename to packages/exporter-trace-otlp-proto/.eslintrc.js index 3ed0fbeba3..fc4d038120 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/.eslintrc.js +++ b/packages/exporter-trace-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/experimental/packages/opentelemetry-exporter-trace-otlp-proto/.npmignore b/packages/exporter-trace-otlp-proto/.npmignore similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/.npmignore rename to packages/exporter-trace-otlp-proto/.npmignore diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/LICENSE b/packages/exporter-trace-otlp-proto/LICENSE similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/LICENSE rename to packages/exporter-trace-otlp-proto/LICENSE diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/README.md b/packages/exporter-trace-otlp-proto/README.md similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/README.md rename to packages/exporter-trace-otlp-proto/README.md diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/package.json b/packages/exporter-trace-otlp-proto/package.json similarity index 96% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/package.json rename to packages/exporter-trace-otlp-proto/package.json index c46489af96..71e22f062f 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/package.json +++ b/packages/exporter-trace-otlp-proto/package.json @@ -1,6 +1,6 @@ { "name": "@opentelemetry/exporter-trace-otlp-proto", - "version": "0.27.0", + "version": "1.0.1", "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" diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos b/packages/exporter-trace-otlp-proto/protos similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/protos rename to packages/exporter-trace-otlp-proto/protos diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts b/packages/exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts rename to packages/exporter-trace-otlp-proto/src/OTLPExporterNodeBase.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/OTLPTraceExporter.ts b/packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/OTLPTraceExporter.ts rename to packages/exporter-trace-otlp-proto/src/OTLPTraceExporter.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/index.ts b/packages/exporter-trace-otlp-proto/src/index.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/index.ts rename to packages/exporter-trace-otlp-proto/src/index.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/types.ts b/packages/exporter-trace-otlp-proto/src/types.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/types.ts rename to packages/exporter-trace-otlp-proto/src/types.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/util.ts b/packages/exporter-trace-otlp-proto/src/util.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/src/util.ts rename to packages/exporter-trace-otlp-proto/src/util.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/submodule.md b/packages/exporter-trace-otlp-proto/submodule.md similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/submodule.md rename to packages/exporter-trace-otlp-proto/submodule.md diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/OTLPTraceExporter.test.ts b/packages/exporter-trace-otlp-proto/test/OTLPTraceExporter.test.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/OTLPTraceExporter.test.ts rename to packages/exporter-trace-otlp-proto/test/OTLPTraceExporter.test.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/ca.crt b/packages/exporter-trace-otlp-proto/test/certs/ca.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/ca.crt rename to packages/exporter-trace-otlp-proto/test/certs/ca.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/ca.key b/packages/exporter-trace-otlp-proto/test/certs/ca.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/ca.key rename to packages/exporter-trace-otlp-proto/test/certs/ca.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/client.crt b/packages/exporter-trace-otlp-proto/test/certs/client.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/client.crt rename to packages/exporter-trace-otlp-proto/test/certs/client.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/client.csr b/packages/exporter-trace-otlp-proto/test/certs/client.csr similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/client.csr rename to packages/exporter-trace-otlp-proto/test/certs/client.csr diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/client.key b/packages/exporter-trace-otlp-proto/test/certs/client.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/client.key rename to packages/exporter-trace-otlp-proto/test/certs/client.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/regenerate.sh b/packages/exporter-trace-otlp-proto/test/certs/regenerate.sh similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/regenerate.sh rename to packages/exporter-trace-otlp-proto/test/certs/regenerate.sh diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/server.crt b/packages/exporter-trace-otlp-proto/test/certs/server.crt similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/server.crt rename to packages/exporter-trace-otlp-proto/test/certs/server.crt diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/server.csr b/packages/exporter-trace-otlp-proto/test/certs/server.csr similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/server.csr rename to packages/exporter-trace-otlp-proto/test/certs/server.csr diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/server.key b/packages/exporter-trace-otlp-proto/test/certs/server.key similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/certs/server.key rename to packages/exporter-trace-otlp-proto/test/certs/server.key diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/traceHelper.ts b/packages/exporter-trace-otlp-proto/test/traceHelper.ts similarity index 100% rename from experimental/packages/opentelemetry-exporter-trace-otlp-proto/test/traceHelper.ts rename to packages/exporter-trace-otlp-proto/test/traceHelper.ts diff --git a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json b/packages/exporter-trace-otlp-proto/tsconfig.json similarity index 61% rename from experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json rename to packages/exporter-trace-otlp-proto/tsconfig.json index 075a501621..e95e7e3c76 100644 --- a/experimental/packages/opentelemetry-exporter-trace-otlp-grpc/tsconfig.json +++ b/packages/exporter-trace-otlp-proto/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { "rootDir": ".", "outDir": "build" @@ -10,7 +10,7 @@ ], "references": [ { - "path": "../opentelemetry-exporter-trace-otlp-http" + "path": "../exporter-trace-otlp-http" } ] } diff --git a/tsconfig.json b/tsconfig.json index 642d15e794..0bae1a80be 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,22 +4,22 @@ "typedocOptions": { "packages": [ "experimental/packages/opentelemetry-api-metrics", - "experimental/packages/opentelemetry-exporter-trace-otlp-grpc", - "experimental/packages/opentelemetry-exporter-trace-otlp-http", - "experimental/packages/opentelemetry-exporter-trace-otlp-proto", + "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", + "experimental/packages/opentelemetry-exporter-metrics-otlp-http", + "experimental/packages/opentelemetry-exporter-metrics-otlp-proto", "experimental/packages/opentelemetry-exporter-prometheus", + "experimental/packages/opentelemetry-instrumentation", "experimental/packages/opentelemetry-instrumentation-fetch", "experimental/packages/opentelemetry-instrumentation-grpc", "experimental/packages/opentelemetry-instrumentation-http", "experimental/packages/opentelemetry-instrumentation-xml-http-request", - "experimental/packages/opentelemetry-instrumentation", "experimental/packages/opentelemetry-sdk-node", - "experimental/packages/opentelemetry-exporter-metrics-otlp-http", - "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc", - "experimental/packages/opentelemetry-exporter-metrics-otlp-proto", + "packages/exporter-trace-otlp-grpc", + "packages/exporter-trace-otlp-http", + "packages/exporter-trace-otlp-proto", "packages/opentelemetry-context-async-hooks", - "packages/opentelemetry-context-zone-peer-dep", "packages/opentelemetry-context-zone", + "packages/opentelemetry-context-zone-peer-dep", "packages/opentelemetry-core", "packages/opentelemetry-exporter-jaeger", "packages/opentelemetry-exporter-zipkin", @@ -44,6 +44,15 @@ "excludePrivate": true }, "references": [ + { + "path": "packages/exporter-trace-otlp-grpc" + }, + { + "path": "packages/exporter-trace-otlp-http/tsconfig.all.json" + }, + { + "path": "packages/exporter-trace-otlp-proto" + }, { "path": "packages/opentelemetry-context-async-hooks" },