diff --git a/doc/exporter-guide.md b/doc/exporter-guide.md index d633887d5d9..46dfe0d221b 100644 --- a/doc/exporter-guide.md +++ b/doc/exporter-guide.md @@ -51,4 +51,4 @@ Please refer to the [Prometheus Exporter][prometheus-exporter] for more comprehe [zipkin-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-zipkin [jaeger-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-jaeger -[prometheus-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-exporter-prometheus +[prometheus-exporter]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-exporter-prometheus diff --git a/examples/metrics/README.md b/examples/metrics/README.md index 34f9f93d3d2..fab7c6def8c 100644 --- a/examples/metrics/README.md +++ b/examples/metrics/README.md @@ -12,7 +12,7 @@ npm install ``` How to setup [Prometheus](https://prometheus.io/docs/prometheus/latest/getting_started/) please check -[Setup Prometheus](https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-exporter-prometheus) +[Setup Prometheus](https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-exporter-prometheus) ## Run the Application diff --git a/packages/opentelemetry-exporter-prometheus/.eslintignore b/experimental/packages/opentelemetry-exporter-prometheus/.eslintignore similarity index 100% rename from packages/opentelemetry-exporter-prometheus/.eslintignore rename to experimental/packages/opentelemetry-exporter-prometheus/.eslintignore diff --git a/packages/opentelemetry-exporter-prometheus/.eslintrc.js b/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js similarity index 65% rename from packages/opentelemetry-exporter-prometheus/.eslintrc.js rename to experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js index f726f3becb6..f756f4488b2 100644 --- a/packages/opentelemetry-exporter-prometheus/.eslintrc.js +++ b/experimental/packages/opentelemetry-exporter-prometheus/.eslintrc.js @@ -3,5 +3,5 @@ module.exports = { "mocha": true, "node": true }, - ...require('../../eslint.config.js') + ...require('../../../eslint.config.js') } diff --git a/packages/opentelemetry-exporter-prometheus/.npmignore b/experimental/packages/opentelemetry-exporter-prometheus/.npmignore similarity index 100% rename from packages/opentelemetry-exporter-prometheus/.npmignore rename to experimental/packages/opentelemetry-exporter-prometheus/.npmignore diff --git a/packages/opentelemetry-exporter-prometheus/LICENSE b/experimental/packages/opentelemetry-exporter-prometheus/LICENSE similarity index 100% rename from packages/opentelemetry-exporter-prometheus/LICENSE rename to experimental/packages/opentelemetry-exporter-prometheus/LICENSE diff --git a/packages/opentelemetry-exporter-prometheus/README.md b/experimental/packages/opentelemetry-exporter-prometheus/README.md similarity index 89% rename from packages/opentelemetry-exporter-prometheus/README.md rename to experimental/packages/opentelemetry-exporter-prometheus/README.md index 1f640834077..95ad498edff 100644 --- a/packages/opentelemetry-exporter-prometheus/README.md +++ b/experimental/packages/opentelemetry-exporter-prometheus/README.md @@ -66,9 +66,9 @@ Apache 2.0 - See [LICENSE][license-url] for more information. [discussions-url]: https://github.com/open-telemetry/opentelemetry-js/discussions [license-url]: https://github.com/open-telemetry/opentelemetry-js/blob/main/LICENSE [license-image]: https://img.shields.io/badge/license-Apache_2.0-green.svg?style=flat -[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-prometheus -[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-prometheus -[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=packages%2Fopentelemetry-exporter-prometheus&type=dev -[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=packages%2Fopentelemetry-exporter-prometheus&type=dev +[dependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=experimental%2Fpackages%2Fopentelemetry-exporter-prometheus +[dependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=experimental%2Fpackages%2Fopentelemetry-exporter-prometheus +[devDependencies-image]: https://status.david-dm.org/gh/open-telemetry/opentelemetry-js.svg?path=experimental%2Fpackages%2Fopentelemetry-exporter-prometheus&type=dev +[devDependencies-url]: https://david-dm.org/open-telemetry/opentelemetry-js?path=experimental%2Fpackages%2Fopentelemetry-exporter-prometheus&type=dev [npm-url]: https://www.npmjs.com/package/@opentelemetry/exporter-prometheus [npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fexporter-prometheus.svg diff --git a/packages/opentelemetry-exporter-prometheus/package.json b/experimental/packages/opentelemetry-exporter-prometheus/package.json similarity index 96% rename from packages/opentelemetry-exporter-prometheus/package.json rename to experimental/packages/opentelemetry-exporter-prometheus/package.json index 7815d82f8e8..ec6fbb75711 100644 --- a/packages/opentelemetry-exporter-prometheus/package.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/package.json @@ -13,7 +13,7 @@ "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../", "lint": "eslint . --ext .ts", "lint:fix": "eslint . --ext .ts --fix", - "version": "node ../../scripts/version-update.js", + "version": "node ../../../scripts/version-update.js", "watch": "tsc --build --watch", "precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies", "prewatch": "npm run precompile" diff --git a/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts rename to experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusExporter.ts diff --git a/packages/opentelemetry-exporter-prometheus/src/PrometheusLabelsBatcher.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusLabelsBatcher.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/src/PrometheusLabelsBatcher.ts rename to experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusLabelsBatcher.ts diff --git a/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts rename to experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts diff --git a/packages/opentelemetry-exporter-prometheus/src/export/types.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/src/export/types.ts rename to experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts diff --git a/packages/opentelemetry-exporter-prometheus/src/index.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/index.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/src/index.ts rename to experimental/packages/opentelemetry-exporter-prometheus/src/index.ts diff --git a/packages/opentelemetry-exporter-prometheus/src/types.ts b/experimental/packages/opentelemetry-exporter-prometheus/src/types.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/src/types.ts rename to experimental/packages/opentelemetry-exporter-prometheus/src/types.ts diff --git a/packages/opentelemetry-exporter-prometheus/test/ExactProcessor.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/ExactProcessor.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/test/ExactProcessor.ts rename to experimental/packages/opentelemetry-exporter-prometheus/test/ExactProcessor.ts diff --git a/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts rename to experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts diff --git a/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts rename to experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusLabelsBatcher.test.ts diff --git a/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts rename to experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts diff --git a/packages/opentelemetry-exporter-prometheus/test/util.ts b/experimental/packages/opentelemetry-exporter-prometheus/test/util.ts similarity index 100% rename from packages/opentelemetry-exporter-prometheus/test/util.ts rename to experimental/packages/opentelemetry-exporter-prometheus/test/util.ts diff --git a/packages/opentelemetry-exporter-prometheus/tsconfig.json b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json similarity index 65% rename from packages/opentelemetry-exporter-prometheus/tsconfig.json rename to experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json index 789e61fc86b..948abef3ceb 100644 --- a/packages/opentelemetry-exporter-prometheus/tsconfig.json +++ b/experimental/packages/opentelemetry-exporter-prometheus/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-core" + "path": "../opentelemetry-api-metrics" } ] } diff --git a/tsconfig.esm.json b/tsconfig.esm.json index 55c72fc2a7a..57f33c032a0 100644 --- a/tsconfig.esm.json +++ b/tsconfig.esm.json @@ -35,9 +35,6 @@ { "path": "packages/opentelemetry-exporter-otlp-proto" }, - { - "path": "packages/opentelemetry-exporter-prometheus" - }, { "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json" }, diff --git a/tsconfig.json b/tsconfig.json index 11b773288ca..8c9f7c196ae 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,7 @@ "typedocOptions": { "packages": [ "experimental/packages/opentelemetry-api-metrics", + "experimental/packages/opentelemetry-exporter-prometheus", "experimental/packages/opentelemetry-instrumentation-fetch", "experimental/packages/opentelemetry-instrumentation-grpc", "experimental/packages/opentelemetry-instrumentation-http", @@ -18,7 +19,6 @@ "packages/opentelemetry-exporter-otlp-grpc", "packages/opentelemetry-exporter-otlp-http", "packages/opentelemetry-exporter-otlp-proto", - "packages/opentelemetry-exporter-prometheus", "packages/opentelemetry-exporter-zipkin", "packages/opentelemetry-propagator-b3", "packages/opentelemetry-propagator-jaeger", @@ -74,9 +74,6 @@ { "path": "packages/opentelemetry-exporter-otlp-proto" }, - { - "path": "packages/opentelemetry-exporter-prometheus" - }, { "path": "packages/opentelemetry-exporter-zipkin" },