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

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';

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

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

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

@@ -48,8 +48,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.16.0",
-    "@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-proto/test/metricsHelper.ts

@@ -20,7 +20,7 @@ import {
   Histogram,
   ValueType,
   ObservableGauge,
-} from '@opentelemetry/api-metrics';
+} from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import * as assert from 'assert';
 import {

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

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

experimental/packages/opentelemetry-exporter-prometheus/package.json

@@ -59,7 +59,7 @@
     "@opentelemetry/api": "^1.0.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@opentelemetry/core": "1.7.0",
     "@opentelemetry/sdk-metrics": "0.33.0",
     "@opentelemetry/resources": "1.7.0"

experimental/packages/opentelemetry-exporter-prometheus/src/PrometheusSerializer.ts

@@ -14,7 +14,11 @@
  * limitations under the License.
  */
 
-import { diag } from '@opentelemetry/api';
+import {
+  diag,
+  MetricAttributes,
+  MetricAttributeValue,
+} from '@opentelemetry/api';
 import {
   ResourceMetrics,
   InstrumentType,
@@ -24,10 +28,6 @@ import {
   DataPoint,
   Histogram,
 } from '@opentelemetry/sdk-metrics';
-import type {
-  MetricAttributes,
-  MetricAttributeValue
-} from '@opentelemetry/api-metrics';
 import { hrTimeToMilliseconds } from '@opentelemetry/core';
 import { Resource } from '@opentelemetry/resources';
 

experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusExporter.test.ts

@@ -15,9 +15,10 @@
  */
 
 import {
+  Counter,
   Meter,
   ObservableResult
-} from '@opentelemetry/api-metrics';
+} from '@opentelemetry/api';
 import { MeterProvider } from '@opentelemetry/sdk-metrics';
 import * as assert from 'assert';
 import * as sinon from 'sinon';
@@ -28,7 +29,6 @@ import {
   mockHrTime
 } from './util';
 import { SinonStubbedInstance } from 'sinon';
-import { Counter } from '@opentelemetry/api-metrics';
 
 const serializedEmptyResourceLines = [
   '# HELP target_info Target metadata',

experimental/packages/opentelemetry-exporter-prometheus/test/PrometheusSerializer.test.ts

@@ -18,7 +18,7 @@ import * as assert from 'assert';
 import {
   MetricAttributes,
   UpDownCounter
-} from '@opentelemetry/api-metrics';
+} from '@opentelemetry/api';
 import {
   Aggregation,
   AggregationTemporality,

experimental/packages/opentelemetry-exporter-prometheus/tsconfig.json

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

experimental/packages/opentelemetry-instrumentation-grpc/package.json

@@ -68,10 +68,10 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.2.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@opentelemetry/instrumentation": "0.33.0",
     "@opentelemetry/semantic-conventions": "1.7.0"
   },

experimental/packages/opentelemetry-instrumentation-grpc/src/instrumentation.ts

@@ -19,7 +19,6 @@ import { VERSION } from './version';
 import { GrpcNativeInstrumentation } from './grpc';
 import { GrpcJsInstrumentation } from './grpc-js';
 import * as api from '@opentelemetry/api';
-import { MeterProvider } from '@opentelemetry/api-metrics';
 
 /** The metadata key under which span context is stored as a binary value. */
 export const GRPC_TRACE_KEY = 'grpc-trace-bin';
@@ -81,7 +80,7 @@ export class GrpcInstrumentation {
    * Sets MeterProvider to this plugin
    * @param meterProvider
    */
-  public setMeterProvider(meterProvider: MeterProvider) {
+  public setMeterProvider(meterProvider: api.MeterProvider) {
     this._grpcJsInstrumentation.setMeterProvider(meterProvider);
     this._grpcNativeInstrumentation.setMeterProvider(meterProvider);
   }

experimental/packages/opentelemetry-instrumentation-grpc/tsconfig.json

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

experimental/packages/opentelemetry-instrumentation-http/package.json

@@ -69,10 +69,10 @@
     "typescript": "4.4.4"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.2.0"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "@opentelemetry/core": "1.7.0",
     "@opentelemetry/instrumentation": "0.33.0",
     "@opentelemetry/sdk-metrics": "0.33.0",

experimental/packages/opentelemetry-instrumentation-http/src/http.ts

@@ -25,8 +25,11 @@ import {
   SpanStatus,
   SpanStatusCode,
   trace,
+  Histogram,
+  MeterProvider,
+  MetricAttributes,
+  ValueType,
 } from '@opentelemetry/api';
-import { Histogram, MeterProvider, MetricAttributes, ValueType } from '@opentelemetry/api-metrics';
 import { hrTime, hrTimeDuration, hrTimeToMilliseconds, suppressTracing } from '@opentelemetry/core';
 import type * as http from 'http';
 import type * as https from 'https';

experimental/packages/opentelemetry-instrumentation-http/src/utils.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import {
+  MetricAttributes,
   SpanAttributes,
   SpanStatusCode,
   Span,
@@ -35,7 +36,6 @@ import { getRPCMetadata, RPCType } from '@opentelemetry/core';
 import * as url from 'url';
 import { AttributeNames } from './enums/AttributeNames';
 import { Err, IgnoreMatcher, ParsedRequestOptions } from './types';
-import { MetricAttributes } from '@opentelemetry/api-metrics';
 
 /**
  * Get an absolute url

experimental/packages/opentelemetry-instrumentation-http/tsconfig.json

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

experimental/packages/opentelemetry-instrumentation/package.json

@@ -68,13 +68,13 @@
     "url": "https://github.com/open-telemetry/opentelemetry-js/issues"
   },
   "dependencies": {
-    "@opentelemetry/api-metrics": "0.33.0",
+    "@opentelemetry/api": "^1.2.0",
     "require-in-the-middle": "^5.0.3",
     "semver": "^7.3.2",
     "shimmer": "^1.2.1"
   },
   "peerDependencies": {
-    "@opentelemetry/api": "^1.0.0"
+    "@opentelemetry/api": "^1.2.0"
   },
   "devDependencies": {
     "@babel/core": "7.16.0",

experimental/packages/opentelemetry-instrumentation/src/autoLoader.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { trace } from '@opentelemetry/api';
-import { metrics } from '@opentelemetry/api-metrics';
+import { trace, metrics } from '@opentelemetry/api';
 import {
   disableInstrumentations,
   enableInstrumentations,

experimental/packages/opentelemetry-instrumentation/src/autoLoaderUtils.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { TracerProvider } from '@opentelemetry/api';
-import { MeterProvider } from '@opentelemetry/api-metrics';
+import { TracerProvider, MeterProvider } from '@opentelemetry/api';
 import { Instrumentation } from './types';
 import { AutoLoaderResult, InstrumentationOption } from './types_internal';
 

experimental/packages/opentelemetry-instrumentation/src/instrumentation.ts

@@ -17,11 +17,13 @@
 import {
   diag,
   DiagLogger,
+  metrics,
+  Meter,
+  MeterProvider,
   trace,
   Tracer,
   TracerProvider,
 } from '@opentelemetry/api';
-import { Meter, MeterProvider, metrics } from '@opentelemetry/api-metrics';
 import * as shimmer from 'shimmer';
 import { InstrumentationModuleDefinition } from './platform/node';
 import * as types from './types';

experimental/packages/opentelemetry-instrumentation/src/types.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { TracerProvider } from '@opentelemetry/api';
-import { MeterProvider } from '@opentelemetry/api-metrics';
+import { TracerProvider, MeterProvider } from '@opentelemetry/api';
 
 /** Interface Instrumentation to apply patch. */
 export interface Instrumentation {

experimental/packages/opentelemetry-instrumentation/src/types_internal.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import { TracerProvider } from '@opentelemetry/api';
-import { MeterProvider } from '@opentelemetry/api-metrics';
+import { TracerProvider, MeterProvider } from '@opentelemetry/api';
 import { InstrumentationBase } from './platform';
 import { Instrumentation } from './types';
 

experimental/packages/opentelemetry-instrumentation/test/common/autoLoader.test.ts

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-import { Tracer, TracerProvider } from '@opentelemetry/api';
-import * as assert from 'assert';
-import * as sinon from 'sinon';
-import { InstrumentationBase, registerInstrumentations } from '../../src';
 import {
+  Tracer,
+  TracerProvider,
   Meter,
   MeterOptions,
   MeterProvider,
-} from '@opentelemetry/api-metrics';
+} from '@opentelemetry/api';
+import * as assert from 'assert';
+import * as sinon from 'sinon';
+import { InstrumentationBase, registerInstrumentations } from '../../src';
 
 class DummyTracerProvider implements TracerProvider {
   getTracer(name: string, version?: string): Tracer {

experimental/packages/opentelemetry-instrumentation/tsconfig.json

@@ -11,9 +11,6 @@
   "references": [
     {
       "path": "../../../api"
-    },
-    {
-      "path": "../../../api-metrics"
     }
   ]
 }