Release metrics API as 1.0 (#3348)

open-telemetry · Oct 27, 2022 · e9347e4 · e9347e4
1 parent d808e29
commit e9347e4
Show file tree

Hide file tree

Showing 49 changed files with 54 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,11 @@ All notable changes to this project will be documented in this file.
 
 * ci: run browser tests without circle [#3328](https://github.com/open-telemetry/opentelemetry-js/pull/3328) @dyladan
 
+## Metrics API 1.0.0
+
+Metrics API is now stable and generally available.
+There are no changes between 1.0.0 and the previous 0.33.0 version.
+
 ## 1.7.0
 
 ### :bug: (Bug Fix)

diff --git a/...s/opentelemetry-api-metrics/.eslintignore → api-metrics/.eslintignore b/...s/opentelemetry-api-metrics/.eslintignore → api-metrics/.eslintignore
diff --git a/...es/opentelemetry-api-metrics/.eslintrc.js → api-metrics/.eslintrc.js b/...es/opentelemetry-api-metrics/.eslintrc.js → api-metrics/.eslintrc.js
@@ -4,5 +4,5 @@ module.exports = {
         "commonjs": true,
         "shared-node-browser": true
     },
-    ...require('../../../eslint.config.js')
+    ...require('../eslint.config.js')
 }
diff --git a/...ackages/opentelemetry-api-metrics/LICENSE → api-metrics/LICENSE b/...ackages/opentelemetry-api-metrics/LICENSE → api-metrics/LICENSE
diff --git a/...kages/opentelemetry-api-metrics/README.md → api-metrics/README.md b/...kages/opentelemetry-api-metrics/README.md → api-metrics/README.md
diff --git a/...s/opentelemetry-api-metrics/karma.conf.js → api-metrics/karma.conf.js b/...s/opentelemetry-api-metrics/karma.conf.js → api-metrics/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/...es/opentelemetry-api-metrics/package.json → api-metrics/package.json b/...es/opentelemetry-api-metrics/package.json → api-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/api-metrics",
-  "version": "0.33.0",
+  "version": "1.0.0",
   "description": "Public metrics API for OpenTelemetry",
   "main": "build/src/index.js",
   "module": "build/esm/index.js",
@@ -19,15 +19,15 @@
     "clean": "tsc --build --clean tsconfig.all.json",
     "test": "nyc ts-mocha -p tsconfig.json test/**/*.test.ts",
     "test:browser": "nyc karma start --single-run",
-    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
-    "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../../",
+    "codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
+    "codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../",
     "build": "npm run compile",
     "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 tsconfig.all.json",
     "precompile": "lerna run version --scope $(npm pkg get name) --include-dependencies",
-    "prewatch": "node ../../../scripts/version-update.js"
+    "prewatch": "node ../scripts/version-update.js"
   },
   "keywords": [
     "opentelemetry",

diff --git a/...pentelemetry-api-metrics/src/NoopMeter.ts → api-metrics/src/NoopMeter.ts b/...pentelemetry-api-metrics/src/NoopMeter.ts → api-metrics/src/NoopMeter.ts
diff --git a/...etry-api-metrics/src/NoopMeterProvider.ts → api-metrics/src/NoopMeterProvider.ts b/...etry-api-metrics/src/NoopMeterProvider.ts → api-metrics/src/NoopMeterProvider.ts
diff --git a/...ntelemetry-api-metrics/src/api/metrics.ts → api-metrics/src/api/metrics.ts b/...ntelemetry-api-metrics/src/api/metrics.ts → api-metrics/src/api/metrics.ts
diff --git a/...es/opentelemetry-api-metrics/src/index.ts → api-metrics/src/index.ts b/...es/opentelemetry-api-metrics/src/index.ts → api-metrics/src/index.ts
diff --git a/...-api-metrics/src/internal/global-utils.ts → api-metrics/src/internal/global-utils.ts b/...-api-metrics/src/internal/global-utils.ts → api-metrics/src/internal/global-utils.ts
diff --git a/...emetry-api-metrics/src/internal/semver.ts → api-metrics/src/internal/semver.ts b/...emetry-api-metrics/src/internal/semver.ts → api-metrics/src/internal/semver.ts
diff --git a/...etrics/src/platform/browser/globalThis.ts → ...etrics/src/platform/browser/globalThis.ts b/...etrics/src/platform/browser/globalThis.ts → ...etrics/src/platform/browser/globalThis.ts
diff --git a/...api-metrics/src/platform/browser/index.ts → api-metrics/src/platform/browser/index.ts b/...api-metrics/src/platform/browser/index.ts → api-metrics/src/platform/browser/index.ts
diff --git a/...lemetry-api-metrics/src/platform/index.ts → api-metrics/src/platform/index.ts b/...lemetry-api-metrics/src/platform/index.ts → api-metrics/src/platform/index.ts
diff --git a/...i-metrics/src/platform/node/globalThis.ts → api-metrics/src/platform/node/globalThis.ts b/...i-metrics/src/platform/node/globalThis.ts → api-metrics/src/platform/node/globalThis.ts
diff --git a/...ry-api-metrics/src/platform/node/index.ts → api-metrics/src/platform/node/index.ts b/...ry-api-metrics/src/platform/node/index.ts → api-metrics/src/platform/node/index.ts
diff --git a/...ntelemetry-api-metrics/src/types/Meter.ts → api-metrics/src/types/Meter.ts b/...ntelemetry-api-metrics/src/types/Meter.ts → api-metrics/src/types/Meter.ts
diff --git a/...ry-api-metrics/src/types/MeterProvider.ts → api-metrics/src/types/MeterProvider.ts b/...ry-api-metrics/src/types/MeterProvider.ts → api-metrics/src/types/MeterProvider.ts
diff --git a/...telemetry-api-metrics/src/types/Metric.ts → api-metrics/src/types/Metric.ts b/...telemetry-api-metrics/src/types/Metric.ts → api-metrics/src/types/Metric.ts
diff --git a/...api-metrics/src/types/ObservableResult.ts → api-metrics/src/types/ObservableResult.ts b/...api-metrics/src/types/ObservableResult.ts → api-metrics/src/types/ObservableResult.ts
diff --git a/...elemetry-api-metrics/test/api/api.test.ts → api-metrics/test/api/api.test.ts b/...elemetry-api-metrics/test/api/api.test.ts → api-metrics/test/api/api.test.ts
diff --git a/...lemetry-api-metrics/test/index-webpack.ts → api-metrics/test/index-webpack.ts b/...lemetry-api-metrics/test/index-webpack.ts → api-metrics/test/index-webpack.ts
diff --git a/...-api-metrics/test/internal/global.test.ts → api-metrics/test/internal/global.test.ts b/...-api-metrics/test/internal/global.test.ts → api-metrics/test/internal/global.test.ts
@@ -31,7 +31,7 @@ const api2 = require('../../src') as typeof import('../../src');
 
 // This will need to be changed manually on major version changes.
 // It is intentionally not autogenerated to ensure the author of the change is aware of what they are doing.
-const GLOBAL_METRICS_API_SYMBOL_KEY = 'opentelemetry.js.api.metrics.0';
+const GLOBAL_METRICS_API_SYMBOL_KEY = 'opentelemetry.js.api.metrics.1';
 
 const getMockLogger = () => ({
   verbose: sinon.spy(),

diff --git a/...-api-metrics/test/internal/semver.test.ts → api-metrics/test/internal/semver.test.ts b/...-api-metrics/test/internal/semver.test.ts → api-metrics/test/internal/semver.test.ts
diff --git a/...api-metrics/test/internal/version.test.ts → api-metrics/test/internal/version.test.ts b/...api-metrics/test/internal/version.test.ts → api-metrics/test/internal/version.test.ts
diff --git a/...t/noop-implementations/noop-meter.test.ts → ...t/noop-implementations/noop-meter.test.ts b/...t/noop-implementations/noop-meter.test.ts → ...t/noop-implementations/noop-meter.test.ts
diff --git a/...try-api-metrics/test/types/Metric.test.ts → api-metrics/test/types/Metric.test.ts b/...try-api-metrics/test/types/Metric.test.ts → api-metrics/test/types/Metric.test.ts
diff --git a/...entelemetry-api-metrics/tsconfig.all.json → api-metrics/tsconfig.all.json b/...entelemetry-api-metrics/tsconfig.all.json → api-metrics/tsconfig.all.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../tsconfig.base.json",
   "files": [],
   "references": [
     { "path": "./tsconfig.json" },

diff --git a/...ntelemetry-api-metrics/tsconfig.docs.json → api-metrics/tsconfig.docs.json b/...ntelemetry-api-metrics/tsconfig.docs.json → api-metrics/tsconfig.docs.json
diff --git a/...entelemetry-api-metrics/tsconfig.esm.json → api-metrics/tsconfig.esm.json b/...entelemetry-api-metrics/tsconfig.esm.json → api-metrics/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/...elemetry-api-metrics/tsconfig.esnext.json → api-metrics/tsconfig.esnext.json b/...elemetry-api-metrics/tsconfig.esnext.json → api-metrics/tsconfig.esnext.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.esnext.json",
+  "extends": "../tsconfig.base.esnext.json",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "build/esnext",

diff --git a/...s/opentelemetry-api-metrics/tsconfig.json → api-metrics/tsconfig.json b/...s/opentelemetry-api-metrics/tsconfig.json → api-metrics/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "rootDir": ".",
     "outDir": "build"
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../../api"
+      "path": "../api"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json
@@ -13,13 +13,13 @@
       "path": "../../../api"
     },
     {
-      "path": "../../../packages/opentelemetry-core"
+      "path": "../../../api-metrics"
     },
     {
-      "path": "../../../packages/opentelemetry-resources"
+      "path": "../../../packages/opentelemetry-core"
     },
     {
-      "path": "../opentelemetry-api-metrics"
+      "path": "../../../packages/opentelemetry-resources"
     },
     {
       "path": "../opentelemetry-exporter-metrics-otlp-http"

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-http/tsconfig.json
@@ -13,13 +13,13 @@
       "path": "../../../api"
     },
     {
-      "path": "../../../packages/opentelemetry-core"
+      "path": "../../../api-metrics"
     },
     {
-      "path": "../../../packages/opentelemetry-resources"
+      "path": "../../../packages/opentelemetry-core"
     },
     {
-      "path": "../opentelemetry-api-metrics"
+      "path": "../../../packages/opentelemetry-resources"
     },
     {
       "path": "../opentelemetry-sdk-metrics"

diff --git a/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json b/experimental/packages/opentelemetry-exporter-metrics-otlp-proto/tsconfig.json
@@ -13,13 +13,13 @@
       "path": "../../../api"
     },
     {
-      "path": "../../../packages/opentelemetry-core"
+      "path": "../../../api-metrics"
     },
     {
-      "path": "../../../packages/opentelemetry-resources"
+      "path": "../../../packages/opentelemetry-core"
     },
     {
-      "path": "../opentelemetry-api-metrics"
+      "path": "../../../packages/opentelemetry-resources"
     },
     {
       "path": "../opentelemetry-exporter-metrics-otlp-http"

diff --git a/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json b/experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json
@@ -13,13 +13,13 @@
       "path": "../../../api"
     },
     {
-      "path": "../../../packages/opentelemetry-core"
+      "path": "../../../api-metrics"
     },
     {
-      "path": "../../../packages/opentelemetry-resources"
+      "path": "../../../packages/opentelemetry-core"
     },
     {
-      "path": "../opentelemetry-api-metrics"
+      "path": "../../../packages/opentelemetry-resources"
     },
     {
       "path": "../opentelemetry-sdk-metrics"

diff --git a/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../api"
     },
+    {
+      "path": "../../../api-metrics"
+    },
     {
       "path": "../../../packages/opentelemetry-context-async-hooks"
     },
@@ -27,9 +30,6 @@
     {
       "path": "../../../packages/opentelemetry-semantic-conventions"
     },
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
     {
       "path": "../opentelemetry-instrumentation"
     }

diff --git a/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json b/experimental/packages/opentelemetry-instrumentation-http/tsconfig.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../api"
     },
+    {
+      "path": "../../../api-metrics"
+    },
     {
       "path": "../../../packages/opentelemetry-context-async-hooks"
     },
@@ -27,9 +30,6 @@
     {
       "path": "../../../packages/opentelemetry-semantic-conventions"
     },
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
     {
       "path": "../opentelemetry-instrumentation"
     },

diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.esnext.json
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-api-metrics/tsconfig.esnext.json"
+      "path": "../../../api-metrics/tsconfig.esnext.json"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-instrumentation/tsconfig.json b/experimental/packages/opentelemetry-instrumentation/tsconfig.json
@@ -13,7 +13,7 @@
       "path": "../../../api"
     },
     {
-      "path": "../opentelemetry-api-metrics"
+      "path": "../../../api-metrics"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esm.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esm.json
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-api-metrics/tsconfig.esm.json"
+      "path": "../../../api-metrics/tsconfig.esnext.json"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esnext.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.esnext.json
@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../opentelemetry-api-metrics/tsconfig.esnext.json"
+      "path": "../../../api-metrics/tsconfig.esnext.json"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-sdk-metrics/tsconfig.json b/experimental/packages/opentelemetry-sdk-metrics/tsconfig.json
@@ -13,13 +13,13 @@
       "path": "../../../api"
     },
     {
-      "path": "../../../packages/opentelemetry-core"
+      "path": "../../../api-metrics"
     },
     {
-      "path": "../../../packages/opentelemetry-resources"
+      "path": "../../../packages/opentelemetry-core"
     },
     {
-      "path": "../opentelemetry-api-metrics"
+      "path": "../../../packages/opentelemetry-resources"
     }
   ]
 }
diff --git a/experimental/packages/opentelemetry-sdk-node/tsconfig.json b/experimental/packages/opentelemetry-sdk-node/tsconfig.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../api"
     },
+    {
+      "path": "../../../api-metrics"
+    },
     {
       "path": "../../../packages/opentelemetry-context-async-hooks"
     },
@@ -45,9 +48,6 @@
     {
       "path": "../exporter-trace-otlp-proto"
     },
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
     {
       "path": "../opentelemetry-instrumentation"
     },

diff --git a/experimental/packages/otlp-transformer/tsconfig.json b/experimental/packages/otlp-transformer/tsconfig.json
@@ -12,6 +12,9 @@
     {
       "path": "../../../api"
     },
+    {
+      "path": "../../../api-metrics"
+    },
     {
       "path": "../../../packages/opentelemetry-core"
     },
@@ -21,9 +24,6 @@
     {
       "path": "../../../packages/opentelemetry-sdk-trace-base"
     },
-    {
-      "path": "../opentelemetry-api-metrics"
-    },
     {
       "path": "../opentelemetry-sdk-metrics"
     }

diff --git a/lerna.json b/lerna.json
@@ -3,6 +3,7 @@
   "npmClient": "npm",
   "packages": [
     "api",
+    "api-metrics",
     "packages/*",
     "experimental/packages/*",
     "experimental/examples/*",

diff --git a/tsconfig.json b/tsconfig.json
@@ -53,6 +53,9 @@
     {
       "path": "api"
     },
+    {
+      "path": "api-metrics"
+    },
     {
       "path": "packages/opentelemetry-context-async-hooks"
     },
@@ -110,9 +113,6 @@
     {
       "path": "experimental/packages/exporter-trace-otlp-proto"
     },
-    {
-      "path": "experimental/packages/opentelemetry-api-metrics"
-    },
     {
       "path": "experimental/packages/opentelemetry-exporter-metrics-otlp-grpc"
     },