fix: don't export classes

Author: pichlermarc

examples/opentelemetry-web/examples/metrics-proto/index.html

@@ -5,18 +5,6 @@
   <meta charset="utf-8">
   <title>Metrics Example</title>
   <base href="/">
-
-  <!--
-    https://www.w3.org/TR/trace-context/
-    Set the `traceparent` in the server's HTML template code. It should be
-    dynamically generated server side to have the server's request trace Id,
-    a parent span Id that was set on the server's request span, and the trace
-    flags to indicate the server's sampling decision
-    (01 = sampled, 00 = notsampled).
-    '{version}-{traceId}-{spanId}-{sampleDecision}'
-  -->
-<!--  <meta name="traceparent" content="00-ab42124a3c573678d4d8b21ba52df3bf-d21f7bc17caa5aba-01">-->
-
   <meta name="viewport" content="width=device-width, initial-scale=1">
 </head>
 
@@ -28,7 +16,7 @@
   <button id="stopBtn">Stop metrics</button>
   <br/>
 
-If you run the collector from example "opentelemetry-exporter-otlp-proto" you should see traces at: <br/>
+If you run the collector from this example, you should see metrics at: <br/>
 <a href="http://localhost:9090/graph?g0.range_input=1m&g0.expr=requests&g0.tab=0/" target="_blank">http://localhost:9090/</a>
 
 </body>

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

@@ -21,9 +21,7 @@ function startMetrics() {
   const meterProvider = new MeterProvider();
 
   meterProvider.addMetricReader(new PeriodicExportingMetricReader({
-    exporter: createMetricsExporter({
-      headers: {'x-my-test': 'header'},
-    }),
+    exporter: createMetricsExporter({}),
     exportIntervalMillis: 1000
   }));
 

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/index.ts

@@ -17,5 +17,10 @@
 // Legacy exporter kept for compatibility, scheduled for removal in 2.0
 export { OTLPMetricExporter } from './legacy/OTLPMetricExporter';
 
-// New exporter factory function
-export { createMetricsExporter } from './platform';
+export {
+  // New exporter factory function and config.
+  createMetricsExporter,
+  OtlpHttpProtoMetricsConfiguration,
+  // Scheduled for removal in 2.0
+  LegacyConfig,
+} from './platform';

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/legacy/OTLPMetricExporter.ts

@@ -21,14 +21,14 @@ import {
   AggregationTemporalitySelector,
   InstrumentType,
 } from '@opentelemetry/sdk-metrics';
+import { AggregationTemporalityPreference } from '@opentelemetry/exporter-metrics-otlp-http';
 import {
-  AggregationTemporalityPreference,
   DeltaTemporalitySelector,
   CumulativeTemporalitySelector,
   LowMemoryTemporalitySelector,
-} from '@opentelemetry/exporter-metrics-otlp-http';
-
+} from '@opentelemetry/otlp-metrics-exporter-base';
 import { ExportResult } from '@opentelemetry/core';
+
 import { LegacyConfig, createMetricsExporter } from '../platform';
 
 /**

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/browser/exporter-factory.ts

@@ -19,13 +19,13 @@ import { OtlpHttpProtoMetricsConfiguration } from './configuration';
 import {
   createMetricsPartialSuccessHandler,
   createOtlpMetricsExporter,
-  DefaultingMetricsConfigurationProvider,
+  mergeMetricsConfigurationWithDefaults,
 } from '@opentelemetry/otlp-metrics-exporter-base';
 import {
   DEFAULT_COMPRESSION,
   DEFAULT_CONCURRENCY_LIMIT,
   DEFAULT_TIMEOUT,
-  DefaultingOtlpHttpConfigurationProvider,
+  mergeOtlpHttpConfigurationWithDefaults,
   OtlpHttpConfiguration,
 } from '@opentelemetry/otlp-http-exporter-base';
 import {
@@ -56,16 +56,16 @@ const DEFAULTS: OtlpHttpConfiguration = {
 export function createMetricsExporter(
   options: Partial<OtlpHttpProtoMetricsConfiguration>
 ): PushMetricExporter {
-  const metricsConfiguration = new DefaultingMetricsConfigurationProvider(
+  const metricsConfiguration = mergeMetricsConfigurationWithDefaults(
     options,
     {}
-  ).provide();
+  );
 
-  const httpConfiguration = new DefaultingOtlpHttpConfigurationProvider(
+  const httpConfiguration = mergeOtlpHttpConfigurationWithDefaults(
     options,
     {},
     DEFAULTS
-  ).provide();
+  );
 
   const useXHR =
     !!options.headers || typeof navigator.sendBeacon !== 'function';

experimental/packages/opentelemetry-exporter-metrics-otlp-proto/src/platform/node/exporter-factory.ts

@@ -15,26 +15,31 @@
  */
 
 import { PushMetricExporter } from '@opentelemetry/sdk-metrics';
-import { createExportPromiseQueue } from '@opentelemetry/otlp-exporter-base';
-import { createRetryingTransport } from '@opentelemetry/otlp-exporter-base';
-import { createOtlpExportDelegate } from '@opentelemetry/otlp-exporter-base';
-import { createOtlpMetricsExporter } from '@opentelemetry/otlp-metrics-exporter-base';
+import {
+  createExportPromiseQueue,
+  createRetryingTransport,
+  createOtlpExportDelegate,
+} from '@opentelemetry/otlp-exporter-base';
+import {
+  createOtlpMetricsExporter,
+  createMetricsPartialSuccessHandler,
+  getMetricsConfigurationFromEnvironment,
+  mergeMetricsConfigurationWithDefaults,
+} from '@opentelemetry/otlp-metrics-exporter-base';
 
 import {
   DEFAULT_COMPRESSION,
   DEFAULT_CONCURRENCY_LIMIT,
   DEFAULT_TIMEOUT,
-  DefaultingOtlpHttpConfigurationProvider,
+  mergeOtlpHttpConfigurationWithDefaults,
   OtlpHttpConfiguration,
 } from '@opentelemetry/otlp-http-exporter-base';
 
-import { DefaultingMetricsConfigurationProvider } from '@opentelemetry/otlp-metrics-exporter-base';
-import { createMetricsPartialSuccessHandler } from '@opentelemetry/otlp-metrics-exporter-base';
-import { EnvironmentOtlpMetricsConfigurationProvider } from '@opentelemetry/otlp-metrics-exporter-base';
-
-import { createHttpExporterTransport } from '@opentelemetry/otlp-http-exporter-node-base';
-import { DefaultingNodeHttpConfigurationProvider } from '@opentelemetry/otlp-http-exporter-node-base';
-import { EnvironmentOtlpHttpConfigurationProvider } from '@opentelemetry/otlp-http-exporter-node-base';
+import {
+  createHttpExporterTransport,
+  getHttpConfigurationFromEnvironment,
+  mergeNodeHttpConfigurationWithDefaults,
+} from '@opentelemetry/otlp-http-exporter-node-base';
 
 import { OtlpHttpProtoMetricsConfiguration } from './configuration';
 import { createProtobufMetricsSerializer } from '../../internal/metrics-serializer';
@@ -53,32 +58,32 @@ const DEFAULTS: OtlpHttpConfiguration = {
   timeoutMillis: DEFAULT_TIMEOUT,
 };
 
+/**
+ * Creates an OTLP (http/protobuf) Metrics Exporter using the provided configuration, and configuration via the environment.
+ * Falls back to defaults if neither are configured.
+ *
+ * @param options
+ */
 export function createMetricsExporter(
   options: Partial<OtlpHttpProtoMetricsConfiguration>
 ): PushMetricExporter {
-  const httpEnvironmentConfiguration =
-    new EnvironmentOtlpHttpConfigurationProvider(
-      'METRICS',
-      'v1/metrics'
-    ).provide();
-
-  const metricsEnvironmentConfiguration =
-    new EnvironmentOtlpMetricsConfigurationProvider().provide();
+  const httpEnvironmentConfiguration = getHttpConfigurationFromEnvironment(
+    'METRICS',
+    'v1/metrics'
+  );
 
-  const metricsConfiguration = new DefaultingMetricsConfigurationProvider(
+  const metricsConfiguration = mergeMetricsConfigurationWithDefaults(
     options,
-    metricsEnvironmentConfiguration
-  ).provide();
+    getMetricsConfigurationFromEnvironment()
+  );
 
-  const httpConfiguration = new DefaultingOtlpHttpConfigurationProvider(
+  const httpConfiguration = mergeOtlpHttpConfigurationWithDefaults(
     options,
     httpEnvironmentConfiguration,
     DEFAULTS
-  ).provide();
+  );
 
-  const nodeHttpConfiguration = new DefaultingNodeHttpConfigurationProvider(
-    options
-  ).provide();
+  const nodeHttpConfiguration = mergeNodeHttpConfigurationWithDefaults(options);
 
   const transport = createHttpExporterTransport({
     url: httpConfiguration.url,

experimental/packages/otlp-http-exporter-base/src/configuration/defaulting-provider.ts

@@ -29,7 +29,7 @@ export const DEFAULT_CONCURRENCY_LIMIT = 30;
 // Specification defines OTLP/HTTP default URL to be http://localhost:4318
 export const DEFAULT_COMPRESSION = 'none';
 
-export class DefaultingOtlpHttpConfigurationProvider
+class DefaultingOtlpHttpConfigurationProvider
   implements IConfigurationProvider<OtlpHttpConfiguration>
 {
   /**
@@ -115,3 +115,15 @@ export class DefaultingOtlpHttpConfigurationProvider
     };
   }
 }
+
+export function mergeOtlpHttpConfigurationWithDefaults(
+  userProvidedConfiguration: Partial<OtlpHttpConfiguration>,
+  fallbackConfiguration: Partial<OtlpHttpConfiguration>,
+  defaultConfiguration: OtlpHttpConfiguration
+): OtlpHttpConfiguration {
+  return new DefaultingOtlpHttpConfigurationProvider(
+    userProvidedConfiguration,
+    fallbackConfiguration,
+    defaultConfiguration
+  ).provide();
+}

experimental/packages/otlp-http-exporter-base/src/index.ts

@@ -16,7 +16,7 @@
 
 export { OtlpHttpConfiguration } from './configuration/configuration';
 export {
-  DefaultingOtlpHttpConfigurationProvider,
+  mergeOtlpHttpConfigurationWithDefaults,
   DEFAULT_COMPRESSION,
   DEFAULT_TIMEOUT,
   DEFAULT_CONCURRENCY_LIMIT,