refactor: migrate api-metrics in all packages to @opentelemetry/api

Author: legendecas

examples/opentelemetry-web/examples/metrics/index.js

@@ -1,5 +1,4 @@
-const { DiagConsoleLogger, DiagLogLevel, diag } = require('@opentelemetry/api');
-const { metrics } = require('@opentelemetry/api-metrics');
+const { DiagConsoleLogger, DiagLogLevel, diag, metrics } = require('@opentelemetry/api');
 const { OTLPMetricExporter } = require('@opentelemetry/exporter-metrics-otlp-http');
 const { MeterProvider, PeriodicExportingMetricReader } = require('@opentelemetry/sdk-metrics');
 

examples/opentelemetry-web/package.json

@@ -42,8 +42,7 @@
     "webpack-merge": "^5.8.0"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.0.2",
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@opentelemetry/context-zone": "1.7.0",
     "@opentelemetry/core": "1.7.0",
     "@opentelemetry/exporter-metrics-otlp-http": "0.33.0",

examples/otlp-exporter-node/package.json

@@ -28,8 +28,7 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api": "^1.1.0",
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@opentelemetry/core": "1.7.0",
     "@opentelemetry/exporter-metrics-otlp-grpc": "0.33.0",
     "@opentelemetry/exporter-metrics-otlp-http": "0.33.0",

experimental/packages/api-logs/README.md

@@ -58,6 +58,6 @@ 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
-[npm-url]: https://www.npmjs.com/package/@opentelemetry/api-metrics
-[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fapi-metrics.svg
+[npm-url]: https://www.npmjs.com/package/@opentelemetry/api-logs
+[npm-img]: https://badge.fury.io/js/%40opentelemetry%2Fapi-logs.svg
 [logs-api-docs]: https://open-telemetry.github.io/opentelemetry-js/modules/_opentelemetry_api_logs.html

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/package.json

@@ -49,8 +49,7 @@
   "devDependencies": {
     "@babel/core": "7.16.0",
     "@grpc/proto-loader": "^0.7.3",
-    "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@types/mocha": "10.0.0",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.13",

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/test/metricsHelper.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Counter, Histogram, ObservableGauge, ObservableResult, ValueType } from '@opentelemetry/api-metrics';
+import { Counter, Histogram, ObservableGauge, ObservableResult, ValueType } from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import * as assert from 'assert';
 import * as grpc from '@grpc/grpc-js';

experimental/packages/opentelemetry-exporter-metrics-otlp-grpc/tsconfig.json

@@ -12,9 +12,6 @@
     {
       "path": "../../../api"
     },
-    {
-      "path": "../../../api-metrics"
-    },
     {
       "path": "../../../packages/opentelemetry-core"
     },

experimental/packages/opentelemetry-exporter-metrics-otlp-http/package.json

@@ -94,7 +94,7 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@opentelemetry/core": "1.7.0",
     "@opentelemetry/otlp-exporter-base": "0.33.0",
     "@opentelemetry/otlp-transformer": "0.33.0",

experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/browser/CollectorMetricExporter.test.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { diag, DiagLogger, DiagLogLevel } from '@opentelemetry/api';
-import { Counter, Histogram, } from '@opentelemetry/api-metrics';
+import { diag, DiagLogger, DiagLogLevel, Counter, Histogram } from '@opentelemetry/api';
 import { ExportResultCode, hrTimeToNanoseconds } from '@opentelemetry/core';
 import { AggregationTemporality, ResourceMetrics, } from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';

experimental/packages/opentelemetry-exporter-metrics-otlp-http/test/metricsHelper.ts

@@ -22,7 +22,7 @@ import {
   ObservableCounter,
   ObservableGauge,
   ObservableUpDownCounter,
-} from '@opentelemetry/api-metrics';
+} from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import * as assert from 'assert';
 import { InstrumentationScope, VERSION } from '@opentelemetry/core';