Merge branch 'main' into fix-2389-LoggerUnformattedStrings

open-telemetry · Sep 24, 2021 · 504827b · 504827b
2 parents efec01a + 6a78db1
commit 504827b
Show file tree

Hide file tree

Showing 23 changed files with 15 additions and 21 deletions.
diff --git 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/doc/instrumentation-guide.md b/doc/instrumentation-guide.md
@@ -5,7 +5,7 @@ A detailed explained guide how to instrument a package is available at [instrume
 For more comprehensive examples please refer to the [HTTP instrumentation][http-instrumentation] or [gRPC instrumentation][grpc-instrumentation] for node
 and [XMLHttpRequest instrumentation][xhr-instrumentation] for web.
 
-[base-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/tree/main/packages/opentelemetry-instrumentation
-[http-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-http/src/http.ts#L59
-[grpc-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts#L28
-[xhr-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L71
+[base-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/tree/main/experimental/packages/opentelemetry-instrumentation
+[http-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-http/src/http.ts#L59
+[grpc-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts#L28
+[xhr-instrumentation]: https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/packages/opentelemetry-instrumentation-xml-http-request/src/xhr.ts#L71
diff --git 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/...lemetry-exporter-prometheus/.eslintignore → ...lemetry-exporter-prometheus/.eslintignore b/...lemetry-exporter-prometheus/.eslintignore → ...lemetry-exporter-prometheus/.eslintignore
diff --git a/...elemetry-exporter-prometheus/.eslintrc.js → ...elemetry-exporter-prometheus/.eslintrc.js b/...elemetry-exporter-prometheus/.eslintrc.js → ...elemetry-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/...ntelemetry-exporter-prometheus/.npmignore → ...ntelemetry-exporter-prometheus/.npmignore b/...ntelemetry-exporter-prometheus/.npmignore → ...ntelemetry-exporter-prometheus/.npmignore
diff --git a/...opentelemetry-exporter-prometheus/LICENSE → ...opentelemetry-exporter-prometheus/LICENSE b/...opentelemetry-exporter-prometheus/LICENSE → ...opentelemetry-exporter-prometheus/LICENSE
diff --git a/...entelemetry-exporter-prometheus/README.md → ...entelemetry-exporter-prometheus/README.md b/...entelemetry-exporter-prometheus/README.md → ...entelemetry-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/...elemetry-exporter-prometheus/package.json → ...elemetry-exporter-prometheus/package.json b/...elemetry-exporter-prometheus/package.json → ...elemetry-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/...rter-prometheus/src/PrometheusExporter.ts → ...rter-prometheus/src/PrometheusExporter.ts b/...rter-prometheus/src/PrometheusExporter.ts → ...rter-prometheus/src/PrometheusExporter.ts
diff --git a/...prometheus/src/PrometheusLabelsBatcher.ts → ...prometheus/src/PrometheusLabelsBatcher.ts b/...prometheus/src/PrometheusLabelsBatcher.ts → ...prometheus/src/PrometheusLabelsBatcher.ts
diff --git a/...er-prometheus/src/PrometheusSerializer.ts → ...er-prometheus/src/PrometheusSerializer.ts b/...er-prometheus/src/PrometheusSerializer.ts → ...er-prometheus/src/PrometheusSerializer.ts
diff --git a/...y-exporter-prometheus/src/export/types.ts → ...y-exporter-prometheus/src/export/types.ts b/...y-exporter-prometheus/src/export/types.ts → ...y-exporter-prometheus/src/export/types.ts
diff --git a/...elemetry-exporter-prometheus/src/index.ts → ...elemetry-exporter-prometheus/src/index.ts b/...elemetry-exporter-prometheus/src/index.ts → ...elemetry-exporter-prometheus/src/index.ts
diff --git a/...elemetry-exporter-prometheus/src/types.ts → ...elemetry-exporter-prometheus/src/types.ts b/...elemetry-exporter-prometheus/src/types.ts → ...elemetry-exporter-prometheus/src/types.ts
diff --git a/...xporter-prometheus/test/ExactProcessor.ts → ...xporter-prometheus/test/ExactProcessor.ts b/...xporter-prometheus/test/ExactProcessor.ts → ...xporter-prometheus/test/ExactProcessor.ts
diff --git a/...rometheus/test/PrometheusExporter.test.ts → ...rometheus/test/PrometheusExporter.test.ts b/...rometheus/test/PrometheusExporter.test.ts → ...rometheus/test/PrometheusExporter.test.ts
diff --git a/...heus/test/PrometheusLabelsBatcher.test.ts → ...heus/test/PrometheusLabelsBatcher.test.ts b/...heus/test/PrometheusLabelsBatcher.test.ts → ...heus/test/PrometheusLabelsBatcher.test.ts
diff --git a/...metheus/test/PrometheusSerializer.test.ts → ...metheus/test/PrometheusSerializer.test.ts b/...metheus/test/PrometheusSerializer.test.ts → ...metheus/test/PrometheusSerializer.test.ts
diff --git a/...elemetry-exporter-prometheus/test/util.ts → ...elemetry-exporter-prometheus/test/util.ts b/...elemetry-exporter-prometheus/test/util.ts → ...elemetry-exporter-prometheus/test/util.ts
diff --git a/...lemetry-exporter-prometheus/tsconfig.json → ...lemetry-exporter-prometheus/tsconfig.json b/...lemetry-exporter-prometheus/tsconfig.json → ...lemetry-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
@@ -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
@@ -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"
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,9 +35,6 @@ @@
         {
           "path": "packages/opentelemetry-exporter-otlp-proto"
         },
-        {
-          "path": "packages/opentelemetry-exporter-prometheus"
-        },
         {
           "path": "packages/opentelemetry-exporter-zipkin/tsconfig.esm.json"
         },
@@ Expand Down @@