Merge branch 'more-db-semantic-conventions' of github.com:naseemkulla…

…h/opentelemetry-js into more-db-semantic-conventions

packages/opentelemetry-metrics/src/Meter.ts

@@ -21,7 +21,6 @@ import { BatchObserverMetric } from './BatchObserverMetric';
 import { BaseBoundInstrument } from './BoundInstrument';
 import { UpDownCounterMetric } from './UpDownCounterMetric';
 import { CounterMetric } from './CounterMetric';
-import { MetricRecord } from './export/types';
 import { ValueRecorderMetric } from './ValueRecorderMetric';
 import { Metric } from './Metric';
 import { ValueObserverMetric } from './ValueObserverMetric';
@@ -231,20 +230,14 @@ export class Meter implements api.Meter {
    * each aggregator belonging to the metrics that were created with this
    * meter instance.
    */
-  collect(): Promise<unknown> {
-    return new Promise((resolve, reject) => {
-      const metrics: Promise<MetricRecord[]>[] = [];
-      Array.from(this._metrics.values()).forEach(metric => {
-        metrics.push(metric.getMetricRecord());
+  async collect(): Promise<void> {
+    const metrics = Array.from(this._metrics.values()).map(metric => {
+      return metric.getMetricRecord();
+    });
+    await Promise.all(metrics).then(records => {
+      records.forEach(metrics => {
+        metrics.forEach(metric => this._batcher.process(metric));
       });
-      Promise.all(metrics)
-        .then(records => {
-          records.forEach(metrics => {
-            metrics.forEach(metric => this._batcher.process(metric));
-          });
-          resolve();
-        })
-        .catch(reject);
     });
   }