fix(metric): avoid awaiting the metric report call (#1285)

## Proposed change

Avoid awaiting the metric report call

## Related issues

- 🐛 Fixes #1201

<!-- Please make sure to follow the contributing guidelines on
https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md -->

Author: kpanot

packages/@o3r/telemetry/src/builders/index.ts

@@ -4,13 +4,11 @@ import type {
 } from '@angular-devkit/architect';
 import { getEnvironmentInfo } from '../environment/index';
 import { performance } from 'node:perf_hooks';
-import { BuilderMetricData, sendData as defaultSendData } from '../sender';
+import { BuilderMetricData, sendData as defaultSendData, type SendDataFn } from '../sender';
 
 type BuilderWrapperFn<S, O extends BuilderOutput = BuilderOutput> =
   (opts: S, ctx: BuilderContext) => O | Promise<O>;
 
-type SendDataFn = (data: BuilderMetricData, logger?: { error: (msg: string) => void } | undefined) => Promise<void>;
-
 /**
  * Type of a function that wraps a builder
  */
@@ -20,11 +18,12 @@ export type BuilderWrapper = <S, O extends BuilderOutput = BuilderOutput>
 /**
  * Wrapper method of a builder to retrieve some metrics around the builder run
  * @param builderFn
+ * @param sendData
  */
 export const createBuilderWithMetrics: BuilderWrapper = (builderFn, sendData = defaultSendData) =>
   async (options, context) => {
     const startTime = Math.floor(performance.now());
-    let error;
+    let error: any;
     try {
       const result = await builderFn(options, context);
       return result;
@@ -35,38 +34,36 @@ export const createBuilderWithMetrics: BuilderWrapper = (builderFn, sendData = d
       throw err;
     }
     finally {
-      try {
-        const endTime = Math.floor(performance.now());
-        const duration = endTime - startTime;
-        // context.builder.builderName does not contain the package name
-        const builderName = context.builder.name as string;
-        context.logger.info(`${builderName} run in ${duration}ms`);
-        const environment = getEnvironmentInfo();
-        const data: BuilderMetricData = {
-          environment,
-          duration,
-          builder: {
-            name: builderName,
-            options,
-            ...(context.target
-              ? {
-                target: {
-                  name: context.target.target,
-                  projectName: context.target.project,
-                  configuration: context.target.configuration
-                }
-              } : {}
-            )
-          },
-          error
-        };
-        context.logger.debug(JSON.stringify(data, null, 2));
-        await sendData(data, context.logger);
-      } catch (e: any) {
+      const endTime = Math.floor(performance.now());
+      const duration = endTime - startTime;
+      // context.builder.builderName does not contain the package name
+      const builderName = context.builder.name as string;
+      context.logger.info(`${builderName} run in ${duration}ms`);
+      const environment = getEnvironmentInfo();
+      const data: BuilderMetricData = {
+        environment,
+        duration,
+        builder: {
+          name: builderName,
+          options,
+          ...(context.target
+            ? {
+              target: {
+                name: context.target.target,
+                projectName: context.target.project,
+                configuration: context.target.configuration
+              }
+            } : {}
+          )
+        },
+        error
+      };
+      context.logger.debug(JSON.stringify(data, null, 2));
+      void sendData(data, context.logger).catch((e) => {
         // Do not throw error if we don't manage to collect data
         const err = (e instanceof Error ? e : new Error(error));
         context.logger.error(err.stack || err.toString());
-      }
+      });
     }
   };
 

packages/@o3r/telemetry/src/schematics/index.ts

@@ -2,11 +2,13 @@ import { callRule, Rule } from '@angular-devkit/schematics';
 import { performance } from 'node:perf_hooks';
 import { lastValueFrom } from 'rxjs';
 import { getEnvironmentInfo } from '../environment/index';
-import { sendData as defaultSendData, SchematicMetricData } from '../sender';
+import { sendData as defaultSendData, SchematicMetricData, type SendDataFn } from '../sender';
 
-type SchematicWrapperFn<S> = (opts: S) => Rule;
-
-type SendDataFn = (data: SchematicMetricData, logger?: { error: (msg: string) => void } | undefined) => Promise<void>;
+/**
+ * Factory of the schematic to wrap
+ * @param options Options of the factory
+ */
+type SchematicWrapperFn<S> = (options: S) => Rule;
 
 /**
  * Type of a function that wraps a schematic
@@ -20,7 +22,7 @@ export type SchematicWrapper = <S>(schematicFn: SchematicWrapperFn<S>, sendData?
 export const createSchematicWithMetrics: SchematicWrapper =
   (schematicFn, sendData = defaultSendData) => (options) => async (tree, context) => {
     const startTime = Math.floor(performance.now());
-    let error;
+    let error: any;
     try {
       const rule = schematicFn(options);
       await lastValueFrom(callRule(rule, tree, context));
@@ -31,28 +33,26 @@ export const createSchematicWithMetrics: SchematicWrapper =
       throw err;
     }
     finally {
-      try {
-        const endTime = Math.floor(performance.now());
-        const duration = endTime - startTime;
-        const environment = getEnvironmentInfo();
-        const schematic = {
-          name: `${context.schematic.description.collection.name}:${context.schematic.description.name}`,
-          options,
-          interactive: context.interactive
-        };
-        const data: SchematicMetricData = {
-          environment,
-          schematic,
-          duration,
-          error
-        };
-        context.logger.debug(JSON.stringify(data, null, 2));
-        await sendData(data, context.logger);
-      } catch (e: any) {
+      const endTime = Math.floor(performance.now());
+      const duration = endTime - startTime;
+      const environment = getEnvironmentInfo();
+      const schematic = {
+        name: `${context.schematic.description.collection.name}:${context.schematic.description.name}`,
+        options,
+        interactive: context.interactive
+      };
+      const data: SchematicMetricData = {
+        environment,
+        schematic,
+        duration,
+        error
+      };
+      context.logger.debug(JSON.stringify(data, null, 2));
+      void sendData(data, context.logger).catch((e) => {
         // Do not throw error if we don't manage to collect data
         const err = (e instanceof Error ? e : new Error(error));
         context.logger.error(err.stack || err.toString());
-      }
+      });
     }
   };
 

packages/@o3r/telemetry/src/sender/index.ts

@@ -46,27 +46,28 @@ export interface SchematicMetricData extends BaseMetricData {
 export type MetricData = BuilderMetricData | SchematicMetricData;
 
 /**
- * Send metric to a server
- * @param data
- * @param logger
+ * Function sending metrics to the server
+ * @param data Metrics to report
+ * @param logger Optional logger to provide to the function
  */
-export const sendData = async (data: MetricData, logger?: { error: (msg: string) => void }) => {
-  try {
-    const message = JSON.stringify(data);
-    const body = JSON.stringify({
-      messages: [{
-        applicationName: 'OTTER',
-        message
-      }]
-    });
-    await fetch('https://uat.digital-logging.saas.amadeus.com/postUILogs', {
-      method: 'POST',
-      body
-    });
-  } catch (e: any) {
-    // Do not throw error if we don't manage to send data to a server
-    const err = e instanceof Error ? e : new Error(e);
-    // eslint-disable-next-line no-console
-    (logger || console).error(err.stack || err.toString());
-  }
+export type SendDataFn = (data: MetricData, logger?: { error: (msg: string) => void } | undefined) => Promise<void>;
+
+/**
+ * Send metric to a Amadeus Log Server
+ * @param data Metrics to report
+ * @param _logger Optional logger to provide to the function
+ * @param _logger.error
+ */
+export const sendData: SendDataFn = async (data: MetricData, _logger?: { error: (msg: string) => void }) => {
+  const message = JSON.stringify(data);
+  const body = JSON.stringify({
+    messages: [{
+      applicationName: 'OTTER',
+      message
+    }]
+  });
+  await fetch('https://uat.digital-logging.saas.amadeus.com/postUILogs', {
+    method: 'POST',
+    body
+  });
 };