improve monitoring the solution

src/app/services/decorator/api-validate-schema.decorator.ts

@@ -33,6 +33,11 @@ export function APIReturn(schema: z.ZodTypeAny, path: string) {
               tracing?.setAttribute?.('map.error.schema-'+i, JSON.stringify(schema))
             }
 
+            tracing.log('API return '+ path, {
+              data: result?.value,
+              issues: error?.errors
+            })
+
           } else {
             // Throw any other unexpected errors
             // throw error;
@@ -74,6 +79,11 @@ export function APINODReturn(schema: z.ZodTypeAny, data , path: string, tracing?
         tracing?.setAttribute('map.error.schema-'+i, JSON.stringify(schema))
       }
 
+      tracing.log('API return '+ path, {
+        data,
+        issues: error?.errors
+      })
+
     } else {
       console.log(error)
       // Throw any other unexpected errors

src/app/services/monitoring/opentelemetry/tracer.ts

@@ -52,11 +52,13 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
   }
 
   const span = _tracerInstance.startSpan(name);
+  let finish = false
 
   const data = {
     event: {},
     tags: {},
     status: {} as any,
+    logs:[]
   }
 
   const returnObject =  {
@@ -83,14 +85,22 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
 
       if(key =='outcome' &&  value == 'failed') {
         returnObject.hasError('error')
+        if(!autoFinish) {
+          returnObject.finish()
+        }
+      } else if (key =='outcome' &&  value == 'success') {
+        span.setStatus({code: SpanStatusCode.OK, message:name})
+        if(!autoFinish) {
+          returnObject.finish()
+        }
       }
     },
-    log(message: string, data: Object) {
+    log(message: string, dataObject: Object) {
       const spanId = span.spanContext().spanId;
       const _tracer = OpentelemetryLogging.getTracer('logging')
       const spanContext = _tracer.startSpan(name)
 
-      data = convertAttributesToString(data)
+      dataObject = convertAttributesToString(dataObject)
 
       if(environment.apiURL != 'https://gdqas-api.oapr.gov.ao/api/') {
         openTelemetryLogging.send({
@@ -99,7 +109,7 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
           payload: {
             message: message,
             object: {
-              ...data,
+              ...dataObject,
               spanId,
               name,
               user:  SessionStore?.user?.FullName,
@@ -110,11 +120,15 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
         })
       }
 
+      data.logs.push(dataObject)
+
     },
     getAttribute: (key: string) => {
       return data.tags[key]
     },
     finish: () => {
+      if(finish) return
+
       if(environment.apiURL != 'https://gdqas-api.oapr.gov.ao/api/') {
         span.end();
         UseCaseCounter.add(1, {user: SessionStore?.user?.FullName, outcome:data.tags['outcome'] || data.status?.code , usecase: name})
@@ -123,6 +137,8 @@ const createTracingInstance = ({bugPrint, name, module, autoFinish}): TracingTyp
       if(bugPrint && (data.tags['outcome'] == 'failed' || data.status?.code == SpanStatusCode.ERROR)) {
         console.error(name, data)
       }
+
+      finish = true
     },
     hasError:(message: string) => {
       if(data.status?.code != SpanStatusCode.ERROR) {

src/app/services/notifications.service.ts

@@ -124,10 +124,9 @@ export class NotificationsService {
       if (this.platform.is('ios')) {
         FCM.getToken()
           .then(r => {
+            tracing.setAttribute('notification.token', 'true')
             this.postToken(r.token, geturl, tracing)
             this.token = r.token
-            tracing.setAttribute('notification.token', 'true')
-            tracing.setAttribute('outcome', 'success')
             // alert(this.token)
           })
           .catch(err => {
@@ -139,9 +138,10 @@ export class NotificationsService {
 
         PushNotifications.addListener('registration',
           (token: Token) => {
+
+            tracing.setAttribute('notification.token', 'true')
             this.postToken(token.value, geturl, tracing)
             this.token = token.value
-            tracing.setAttribute('notification.token', 'true')
 
           }
         );
@@ -157,13 +157,11 @@ export class NotificationsService {
           this.token = token
           tracing.setAttribute('notification.token', 'true')
           tracing.setAttribute('outcome', 'success')
-          tracing.finish()
         },
         (error) => {
           console.error('Permission denied:', error);
           tracing.setAttribute('notification.token', 'false')
           tracing.setAttribute('outcome', 'failed')
-          tracing.finish()
         }
       );
     }