Merge branch 'main' into renovate/axios-1.x

CHANGELOG.md

@@ -12,6 +12,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
 ### :rocket: (Enhancement)
 
 * feat(sdk-metrics): implement MetricProducer specification [#4007](https://github.com/open-telemetry/opentelemetry-js/pull/4007)
+* feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#4077](https://github.com/open-telemetry/opentelemetry-js/pull/4077) @aabmass
 
 ### :bug: (Bug Fix)
 

experimental/CHANGELOG.md

@@ -18,6 +18,8 @@ All notable changes to experimental packages in this project will be documented
 
 ### :rocket: (Enhancement)
 
+* feat: update PeriodicExportingMetricReader and PrometheusExporter to accept optional metric producers [#4077](https://github.com/open-telemetry/opentelemetry-js/pull/4077) @aabmass
+
 ### :bug: (Bug Fix)
 
 ### :books: (Refine Doc)

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

@@ -62,6 +62,7 @@ export class PrometheusExporter extends MetricReader {
       aggregationSelector: _instrumentType => Aggregation.Default(),
       aggregationTemporalitySelector: _instrumentType =>
         AggregationTemporality.CUMULATIVE,
+      metricProducers: config.metricProducers,
     });
     this._host =
       config.host ||

experimental/packages/opentelemetry-exporter-prometheus/src/export/types.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { MetricProducer } from '@opentelemetry/sdk-metrics';
+
 /**
  * Configuration interface for prometheus exporter
  */
@@ -56,4 +58,12 @@ export interface ExporterConfig {
    * @default false
    */
   preventServerStart?: boolean;
+
+  /**
+   * **Note, this option is experimental**. Additional MetricProducers to use as a source of
+   * aggregated metric data in addition to the SDK's metric data. The resource returned by
+   * these MetricProducers is ignored; the SDK's resource will be used instead.
+   * @experimental
+   */
+  metricProducers?: MetricProducer[];
 }

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

@@ -25,6 +25,7 @@ import { MetricReader } from './MetricReader';
 import { PushMetricExporter } from './MetricExporter';
 import { callWithTimeout, TimeoutError } from '../utils';
 import { diag } from '@opentelemetry/api';
+import { MetricProducer } from './MetricProducer';
 
 export type PeriodicExportingMetricReaderOptions = {
   /**
@@ -40,6 +41,13 @@ export type PeriodicExportingMetricReaderOptions = {
    * Milliseconds for the async observable callback to timeout.
    */
   exportTimeoutMillis?: number;
+  /**
+   * **Note, this option is experimental**. Additional MetricProducers to use as a source of
+   * aggregated metric data in addition to the SDK's metric data. The resource returned by
+   * these MetricProducers is ignored; the SDK's resource will be used instead.
+   * @experimental
+   */
+  metricProducers?: MetricProducer[];
 };
 
 /**
@@ -59,6 +67,7 @@ export class PeriodicExportingMetricReader extends MetricReader {
       ),
       aggregationTemporalitySelector:
         options.exporter.selectAggregationTemporality?.bind(options.exporter),
+      metricProducers: options.metricProducers,
     });
 
     if (

renovate.json

@@ -19,14 +19,9 @@
     {
       "matchPackageNames": ["typescript", "webpack", "webpack-cli"],
       "dependencyDashboardApproval": true
-    },
-    {
-      "matchPaths": ["experimental/backwards-compatibility/**"],
-      "matchPackageNames": ["@types/node"],
-      "enabled": false
     }
   ],
-  "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0"],
+  "ignoreDeps": ["@opentelemetry/api", "@opentelemetry/resources_1.9.0", "@types/node"],
   "assignees": ["@blumamir", "@dyladan", "@legendecas", "@pichlermarc"],
   "labels": ["dependencies"]
 }