refactor: add resource to MeterConfig

open-telemetry · Mar 9, 2020 · ab8f7a4 · ab8f7a4
1 parent 20d0663
commit ab8f7a4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/packages/opentelemetry-metrics/src/Meter.ts b/packages/opentelemetry-metrics/src/Meter.ts
@@ -43,10 +43,10 @@ export class Meter implements types.Meter {
   /**
    * Constructs a new Meter instance.
    */
-  constructor(config: MeterConfig = DEFAULT_CONFIG, resource: Resource) {
+  constructor(config: MeterConfig = DEFAULT_CONFIG) {
     this._logger = config.logger || new ConsoleLogger(config.logLevel);
     this._batcher = new UngroupedBatcher();
-    this.resource = resource;
+    this.resource = config.resource || Resource.createTelemetrySDKResource();
     // start the push controller
     const exporter = config.exporter || new NoopExporter();
     const interval = config.interval;

diff --git a/packages/opentelemetry-metrics/src/MeterProvider.ts b/packages/opentelemetry-metrics/src/MeterProvider.ts
@@ -40,7 +40,7 @@ export class MeterProvider implements types.MeterProvider {
   getMeter(name: string, version = '*', config?: MeterConfig): Meter {
     const key = `${name}@${version}`;
     if (!this._meters.has(key)) {
-      this._meters.set(key, new Meter(config || this._config, this.resource));
+      this._meters.set(key, new Meter(config || this._config));
     }
 
     return this._meters.get(key)!;

diff --git a/packages/opentelemetry-metrics/src/types.ts b/packages/opentelemetry-metrics/src/types.ts
@@ -17,6 +17,7 @@
 import { LogLevel } from '@opentelemetry/core';
 import { Logger, ValueType } from '@opentelemetry/api';
 import { MetricExporter } from './export/types';
+import { Resource } from '@opentelemetry/resources';
 
 /** Options needed for SDK metric creation. */
 export interface MetricOptions {
@@ -64,6 +65,9 @@ export interface MeterConfig {
 
   /** Metric collect interval */
   interval?: number;
+
+  /** Resource associated with metric telemetry */
+  resource?: Resource;
 }
 
 /** Default Meter configuration. */