chore(refactor): Add functions to monitoring as they are instantiated

There is some stateful wonkery inside, because cdk-monitoring-constructs lacks functionality for influencing the layout of a dashboard

Author: DerDackel

docs/constructs/assets/search.js

@@ -100,6 +100,7 @@ export abstract class BaseApi extends Construct {
   protected readonly apiDomainName?: string;
   protected readonly apiFQDN?: string;
   public readonly monitoring?: MonitoringFacade;
+  protected readonly functionMonitoring?: AggregatedFunctionMonitoring;
 
   constructor(scope: Construct, id: string, props: BaseApiProps) {
     super(scope, id);
@@ -124,6 +125,11 @@ export abstract class BaseApi extends Construct {
           dashboardNamePrefix: props.apiName,
         }),
       });
+      this.functionMonitoring = new AggregatedFunctionMonitoring(this.monitoring, {
+        title: 'Lambda metrics',
+        apiName: props.apiName,
+        functions: {},
+      });
     }
 
   }
@@ -134,14 +140,12 @@ export abstract class BaseApi extends Construct {
     }
   }
 
-  protected addOperationFunctionMonitoring(apiName: string, functions: Record<string, IFunction>) {
-    if (this.monitoring && Object.keys(functions).length > 0) {
-      const functionMonitoring = new AggregatedFunctionMonitoring(this.monitoring, {
-        title: 'Lambda metrics',
-        apiName: apiName,
-        functions: functions,
+  protected addOperationFunctionMonitoring(functions: Record<string, IFunction>) {
+    if (this.monitoring && this.functionMonitoring) {
+      Object.entries(functions).forEach(([operationId, func]) => {
+        this.functionMonitoring?.addFunction(operationId, func);
       });
-      this.monitoring.addSegment(functionMonitoring);
+      this.monitoring.addSegment(this.functionMonitoring);
     }
   }
 

docs/constructs/classes/BaseApi.html

@@ -152,7 +152,7 @@ export class GraphQlApi<RESOLVERS> extends BaseApi {
       this.monitoring.monitorAppSyncApi({
         api: this.api,
       });
-      this.addOperationFunctionMonitoring(props.apiName, this._functions);
+      this.addOperationFunctionMonitoring({});
       if (props.singleTableDatastore) {
         this.addSingleTableMonitoring(props.singleTableDatastore);
       }
@@ -241,12 +241,9 @@ export class GraphQlApi<RESOLVERS> extends BaseApi {
     this._functions[operationId] = fn;
     Tags.of(fn).add('GraphQL', description);
 
-    // if (this.monitoring) {
-    //   this.monitoring.lambdaDurationsWidget.addLeftMetric(fn.metricDuration());
-    //   this.monitoring.lambdaInvokesWidget.addLeftMetric(fn.metricInvocations());
-    //   this.monitoring.lambdaErrorsWidget.addLeftMetric(fn.metricErrors());
-    //   this.monitoring.lambdaErrorsWidget.addLeftMetric(fn.metricThrottles());
-    // }
+    if (this.monitoring && this.functionMonitoring) {
+      this.functionMonitoring.addFunction(operationId, fn);
+    }
 
     const dataSource = new aws_appsync.LambdaDataSource(this, `LambdaDS${operationId}`, {
       api: this.api,

docs/constructs/classes/GraphQlApi.html

@@ -30,6 +30,14 @@ export class AggregatedFunctionMonitoring extends Monitoring {
     this._functions = props.functions;
   }
 
+  addFunction(operationId: string, func: IFunction) {
+    if (Object.keys(this._functions).includes(operationId)) {
+      throw new Error(`Operation '${operationId}' is being registered for monitoring twice!`);
+    }
+    this._functions[operationId] = func;
+    console.log(`Added ${operationId}`);
+  }
+
   createTitleWidget() {
     const descriptionFile = `src/definitions/monitoring/${this.apiName}.description.md`;
     let description = `Create a file named '${descriptionFile}' to add a description to this API`;
@@ -79,6 +87,7 @@ export class AggregatedFunctionMonitoring extends Monitoring {
   }
 
   widgets(): IWidget[] {
+    console.log(`Adding widgets for fucntions ${Object.keys(this._functions).join(', ')}`);
     return [
       this.createTitleWidget(),
       new Row(

docs/constructs/classes/RestApi.html

@@ -224,7 +224,7 @@ export class RestApi<PATHS, OPS> extends BaseApi {
       });
 
       // FIXME This currently depends on the side effects of having generated the routes further above
-      this.addOperationFunctionMonitoring(props.apiName, this._functions);
+      this.addOperationFunctionMonitoring({});
       if (props.singleTableDatastore) {
         this.addSingleTableMonitoring(props.singleTableDatastore);
       }
@@ -359,6 +359,10 @@ export class RestApi<PATHS, OPS> extends BaseApi {
       payloadFormatVersion: '1.0',
     };
 
+    if (this.monitoring && this.functionMonitoring) {
+      this.functionMonitoring.addFunction(operation.operationId!, fn);
+    }
+
     return fn;
   }