chore(extension-metrics): simplify configuration object

loopbackio · Oct 17, 2019 · d836347 · d836347
1 parent a7f9ad0
commit d836347
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/extensions/metrics/README.md b/extensions/metrics/README.md
@@ -42,9 +42,7 @@ this.configure(MetricsBindings.COMPONENT).to({
     basePath: '/metrics',
   },
   defaultMetrics: {
-    options: {
-      timeout: 5000,
-    },
+    timeout: 5000,
   },
 });
 ```

diff --git a/extensions/metrics/src/__tests__/acceptance/metrics.acceptance.ts b/extensions/metrics/src/__tests__/acceptance/metrics.acceptance.ts
@@ -45,10 +45,8 @@ describe('Metrics (acceptance)', () => {
     it('honors prefix', async () => {
       await givenAppWithCustomConfig({
         defaultMetrics: {
-          options: {
-            // `-` is not allowed
-            prefix: 'myapp_',
-          },
+          // `-` is not allowed
+          prefix: 'myapp_',
         },
       });
       await request

diff --git a/extensions/metrics/src/observers/metrics.observer.ts b/extensions/metrics/src/observers/metrics.observer.ts
@@ -17,8 +17,7 @@ export class MetricsObserver implements LifeCycleObserver {
   ) {}
 
   start() {
-    const defaultMetricsConfig =
-      this.options.defaultMetrics && this.options.defaultMetrics.options;
+    const defaultMetricsConfig = this.options.defaultMetrics;
     this.interval = collectDefaultMetrics(defaultMetricsConfig);
   }
 

diff --git a/extensions/metrics/src/types.ts b/extensions/metrics/src/types.ts
@@ -13,14 +13,12 @@ export interface MetricsOptions {
 
   defaultMetrics?: {
     disabled?: boolean;
-    options?: DefaultMetricsCollectorConfiguration;
-  };
+  } & DefaultMetricsCollectorConfiguration;
 
   pushGateway?: {
     disabled?: boolean;
     url: string;
     interval?: number;
-    options?: object;
   };
 }
 
@@ -29,8 +27,6 @@ export const DEFAULT_METRICS_OPTIONS: MetricsOptions = {
     basePath: '/metrics',
   },
   defaultMetrics: {
-    options: {
-      timeout: 5000,
-    },
+    timeout: 5000,
   },
 };