Merge branch 'main' into docs/sdk-metrics

Author: dyladan

experimental/CHANGELOG.md

@@ -38,6 +38,7 @@ All notable changes to experimental packages in this project will be documented
     * `NoopObservableMetric`
     * `NoopObservableUpDownCounterMetric`
     * `NoopUpDownCounterMetric`
+* feat(sdk-metrics): align MetricReader with specification and other language implementations [#3225](https://github.com/open-telemetry/opentelemetry-js/pull/3225) @pichlermarc
 * chore(sdk-metrics): remove accidental export of the SDK `Meter` class [#3243](https://github.com/open-telemetry/opentelemetry-js/pull/3243) @pichlermarc
 
 ### :rocket: (Enhancement)

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

@@ -20,8 +20,6 @@ import * as assert from 'assert';
 import * as grpc from '@grpc/grpc-js';
 import { VERSION } from '@opentelemetry/core';
 import {
-  Aggregation,
-  AggregationTemporality,
   ExplicitBucketHistogramAggregation,
   MeterProvider,
   MetricReader,
@@ -30,14 +28,6 @@ import {
 import { IKeyValue, IMetric, IResource } from '@opentelemetry/otlp-transformer';
 
 class TestMetricReader extends MetricReader {
-  selectAggregation() {
-    return Aggregation.Default();
-  }
-
-  selectAggregationTemporality() {
-    return AggregationTemporality.CUMULATIVE;
-  }
-
   protected onForceFlush(): Promise<void> {
     return Promise.resolve(undefined);
   }

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

@@ -27,8 +27,6 @@ import { Resource } from '@opentelemetry/resources';
 import * as assert from 'assert';
 import { InstrumentationScope, VERSION } from '@opentelemetry/core';
 import {
-  Aggregation,
-  AggregationTemporality,
   ExplicitBucketHistogramAggregation,
   MeterProvider,
   MetricReader,
@@ -57,14 +55,6 @@ class TestMetricReader extends MetricReader {
   protected onShutdown(): Promise<void> {
     return Promise.resolve(undefined);
   }
-
-  selectAggregation() {
-    return Aggregation.Default();
-  }
-
-  selectAggregationTemporality() {
-    return AggregationTemporality.CUMULATIVE;
-  }
 }
 
 export const HISTOGRAM_AGGREGATION_VIEW = new View({

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

@@ -24,8 +24,6 @@ import {
 import { Resource } from '@opentelemetry/resources';
 import * as assert from 'assert';
 import {
-  Aggregation,
-  AggregationTemporality,
   ExplicitBucketHistogramAggregation,
   MeterProvider,
   MetricReader,
@@ -35,14 +33,6 @@ import { IExportMetricsServiceRequest, IKeyValue, IMetric } from '@opentelemetry
 import { Stream } from 'stream';
 
 export class TestMetricReader extends MetricReader {
-  selectAggregation() {
-    return Aggregation.Default();
-  }
-
-  selectAggregationTemporality() {
-    return AggregationTemporality.CUMULATIVE;
-  }
-
   protected onForceFlush(): Promise<void> {
     return Promise.resolve(undefined);
   }

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

@@ -55,7 +55,10 @@ export class PrometheusExporter extends MetricReader {
    * @param callback Callback to be called after a server was started
    */
   constructor(config: ExporterConfig = {}, callback?: () => void) {
-    super();
+    super({
+      aggregationSelector: _instrumentType => Aggregation.Default(),
+      aggregationTemporalitySelector: _instrumentType => AggregationTemporality.CUMULATIVE
+    });
     this._host =
       config.host ||
       process.env.OTEL_EXPORTER_PROMETHEUS_HOST ||
@@ -90,14 +93,6 @@ export class PrometheusExporter extends MetricReader {
     }
   }
 
-  selectAggregation(): Aggregation {
-    return Aggregation.Default();
-  }
-
-  selectAggregationTemporality(): AggregationTemporality {
-    return AggregationTemporality.CUMULATIVE;
-  }
-
   override async onForceFlush(): Promise<void> {
     /** do nothing */
   }

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

@@ -40,15 +40,10 @@ const attributes = {
 
 class TestMetricReader extends MetricReader {
   constructor() {
-    super();
-  }
-
-  selectAggregationTemporality() {
-    return AggregationTemporality.CUMULATIVE;
-  }
-
-  selectAggregation() {
-    return Aggregation.Default();
+    super({
+      aggregationTemporalitySelector: _instrumentType => AggregationTemporality.CUMULATIVE,
+      aggregationSelector: _instrumentType => Aggregation.Default()
+    });
   }
 
   async onForceFlush() {}

experimental/packages/opentelemetry-sdk-metrics/src/export/AggregationSelector.ts

@@ -27,3 +27,6 @@ export type AggregationSelector = (instrumentType: InstrumentType) => Aggregatio
   * Aggregation temporality selector based on metric instrument types.
   */
 export type AggregationTemporalitySelector = (instrumentType: InstrumentType) => AggregationTemporality;
+
+export const DEFAULT_AGGREGATION_SELECTOR: AggregationSelector = _instrumentType => Aggregation.Default();
+export const DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR: AggregationTemporalitySelector = _instrumentType => AggregationTemporality.CUMULATIVE;

experimental/packages/opentelemetry-sdk-metrics/src/export/MetricExporter.ts

@@ -20,6 +20,7 @@ import {
   ExportResult,
 } from '@opentelemetry/core';
 import { InstrumentType } from '../InstrumentDescriptor';
+import { Aggregation } from '../view/Aggregation';
 
 /**
  * An interface that allows different metric services to export recorded data
@@ -45,7 +46,13 @@ export interface PushMetricExporter {
    * Select the {@link AggregationTemporality} for the given
    * {@link InstrumentType} for this exporter.
    */
-  selectAggregationTemporality(instrumentType: InstrumentType): AggregationTemporality;
+  selectAggregationTemporality?(instrumentType: InstrumentType): AggregationTemporality;
+
+  /**
+   * Select the {@link Aggregation} for the given
+   * {@link InstrumentType} for this exporter.
+   */
+  selectAggregation?(instrumentType: InstrumentType): Aggregation;
 
   /**
    * Returns a promise which resolves when the last exportation is completed.

experimental/packages/opentelemetry-sdk-metrics/src/export/MetricReader.ts

@@ -20,8 +20,32 @@ import { MetricProducer } from './MetricProducer';
 import { CollectionResult } from './MetricData';
 import { callWithTimeout } from '../utils';
 import { InstrumentType } from '../InstrumentDescriptor';
-import { CollectionOptions, ForceFlushOptions, ShutdownOptions } from '../types';
+import {
+  CollectionOptions,
+  ForceFlushOptions,
+  ShutdownOptions
+} from '../types';
 import { Aggregation } from '../view/Aggregation';
+import {
+  AggregationSelector,
+  AggregationTemporalitySelector,
+  DEFAULT_AGGREGATION_SELECTOR,
+  DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR
+} from './AggregationSelector';
+
+export interface MetricReaderOptions {
+  /**
+   * Aggregation selector based on metric instrument types. If no views are
+   * configured for a metric instrument, a per-metric-reader aggregation is
+   * selected with this selector.
+   */
+  aggregationSelector?: AggregationSelector;
+  /**
+   * Aggregation temporality selector based on metric instrument types. If
+   * not configured, cumulative is used for all instruments.
+   */
+  aggregationTemporalitySelector?: AggregationTemporalitySelector;
+}
 
 /**
  * A registered reader of metrics that, when linked to a {@link MetricProducer}, offers global
@@ -33,6 +57,15 @@ export abstract class MetricReader {
   private _shutdown = false;
   // MetricProducer used by this instance.
   private _metricProducer?: MetricProducer;
+  private readonly _aggregationTemporalitySelector: AggregationTemporalitySelector;
+  private readonly _aggregationSelector: AggregationSelector;
+
+  constructor(options?: MetricReaderOptions) {
+    this._aggregationSelector = options?.aggregationSelector ??
+      DEFAULT_AGGREGATION_SELECTOR;
+    this._aggregationTemporalitySelector = options?.aggregationTemporalitySelector ??
+      DEFAULT_AGGREGATION_TEMPORALITY_SELECTOR;
+  }
 
   /**
    * Set the {@link MetricProducer} used by this instance.
@@ -51,13 +84,17 @@ export abstract class MetricReader {
    * Select the {@link Aggregation} for the given {@link InstrumentType} for this
    * reader.
    */
-  abstract selectAggregation(instrumentType: InstrumentType): Aggregation;
+  selectAggregation(instrumentType: InstrumentType): Aggregation {
+    return this._aggregationSelector(instrumentType);
+  }
 
   /**
    * Select the {@link AggregationTemporality} for the given
    * {@link InstrumentType} for this reader.
    */
-  abstract selectAggregationTemporality(instrumentType: InstrumentType): AggregationTemporality;
+  selectAggregationTemporality(instrumentType: InstrumentType): AggregationTemporality {
+    return this._aggregationTemporalitySelector(instrumentType);
+  }
 
   /**
    * Handle once the SDK has initialized this {@link MetricReader}

experimental/packages/opentelemetry-sdk-metrics/src/export/PeriodicExportingMetricReader.ts

@@ -21,20 +21,13 @@ import {
   unrefTimer
 } from '@opentelemetry/core';
 import { MetricReader } from './MetricReader';
-import { AggregationTemporality } from './AggregationTemporality';
-import { InstrumentType } from '../InstrumentDescriptor';
 import { PushMetricExporter } from './MetricExporter';
-import { callWithTimeout, TimeoutError } from '../utils';
-import { Aggregation } from '../view/Aggregation';
-import { AggregationSelector } from './AggregationSelector';
+import {
+  callWithTimeout,
+  TimeoutError
+} from '../utils';
 
 export type PeriodicExportingMetricReaderOptions = {
-  /**
-   * Aggregation selector based on metric instrument types. If no views are
-   * configured for a metric instrument, a per-metric-reader aggregation is
-   * selected with this selector.
-   */
-  aggregationSelector?: AggregationSelector;
   /**
    * The backing exporter for the metric reader.
    */
@@ -50,8 +43,6 @@ export type PeriodicExportingMetricReaderOptions = {
   exportTimeoutMillis?: number;
 };
 
-const DEFAULT_AGGREGATION_SELECTOR: AggregationSelector = Aggregation.Default;
-
 /**
  * {@link MetricReader} which collects metrics based on a user-configurable time interval, and passes the metrics to
  * the configured {@link PushMetricExporter}
@@ -61,10 +52,12 @@ export class PeriodicExportingMetricReader extends MetricReader {
   private _exporter: PushMetricExporter;
   private readonly _exportInterval: number;
   private readonly _exportTimeout: number;
-  private readonly _aggregationSelector: AggregationSelector;
 
   constructor(options: PeriodicExportingMetricReaderOptions) {
-    super();
+    super({
+      aggregationSelector: options.exporter.selectAggregation?.bind(options.exporter),
+      aggregationTemporalitySelector: options.exporter.selectAggregationTemporality?.bind(options.exporter)
+    });
 
     if (options.exportIntervalMillis !== undefined && options.exportIntervalMillis <= 0) {
       throw Error('exportIntervalMillis must be greater than 0');
@@ -83,7 +76,6 @@ export class PeriodicExportingMetricReader extends MetricReader {
     this._exportInterval = options.exportIntervalMillis ?? 60000;
     this._exportTimeout = options.exportTimeoutMillis ?? 30000;
     this._exporter = options.exporter;
-    this._aggregationSelector = options.aggregationSelector ?? DEFAULT_AGGREGATION_SELECTOR;
   }
 
   private async _runOnce(): Promise<void> {
@@ -98,9 +90,9 @@ export class PeriodicExportingMetricReader extends MetricReader {
         if (result.code !== ExportResultCode.SUCCESS) {
           reject(
             result.error ??
-              new Error(
-                `PeriodicExportingMetricReader: metrics export failed (error ${result.error})`
-              )
+            new Error(
+              `PeriodicExportingMetricReader: metrics export failed (error ${result.error})`
+            )
           );
         } else {
           resolve();
@@ -137,18 +129,4 @@ export class PeriodicExportingMetricReader extends MetricReader {
 
     await this._exporter.shutdown();
   }
-
-  /**
-   * @inheritdoc
-   */
-  selectAggregation(instrumentType: InstrumentType): Aggregation {
-    return this._aggregationSelector(instrumentType);
-  }
-
-  /**
-   * @inheritdoc
-   */
-  selectAggregationTemporality(instrumentType: InstrumentType): AggregationTemporality {
-    return this._exporter.selectAggregationTemporality(instrumentType);
-  }
 }