OJ-3693: Remove OTel & fix dependencies

lambdas/abandon/src/abandon-handler.ts

@@ -1,6 +1,5 @@
 import { LambdaInterface } from "@aws-lambda-powertools/commons/types";
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from "aws-lambda";
-import { initOpenTelemetry } from "../../open-telemetry/src/otel-setup";
 import { AbandonHandlerConfig } from "./config/abandon-handler-config";
 import { removeAuthCodeFromSessionRecord } from "./services/abandon-dynamo-service";
 import { buildAndSendAuditEvent } from "@govuk-one-login/cri-audit";
@@ -9,8 +8,6 @@ import { getSessionBySessionId } from "../../common/src/database/get-record-by-s
 import { AUDIT_EVENT_TYPE } from "../../common/src/types/audit";
 import { CriError, formatErrorResponse } from "@govuk-one-login/cri-error-response";
 
-initOpenTelemetry();
-
 export class AbandonHandler implements LambdaInterface {
   readonly config: AbandonHandlerConfig;
 
@@ -43,7 +40,13 @@ export class AbandonHandler implements LambdaInterface {
             restricted: { device_information: { encoded: txmaAuditHeader } },
           }
         : undefined;
-      await buildAndSendAuditEvent(this.config.audit.queueUrl, AUDIT_EVENT_TYPE.ABANDONED, this.config.audit.componentId, sessionItem, txmaAuditValue);
+      await buildAndSendAuditEvent(
+        this.config.audit.queueUrl,
+        AUDIT_EVENT_TYPE.ABANDONED,
+        this.config.audit.componentId,
+        sessionItem,
+        txmaAuditValue
+      );
 
       return {
         statusCode: 200,

lambdas/issue-credential/src/handler.ts

@@ -1,5 +1,4 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from "aws-lambda";
-import { initOpenTelemetry } from "../../open-telemetry/src/otel-setup";
 import { CriError, formatErrorResponse } from "@govuk-one-login/cri-error-response";
 import { logger } from "@govuk-one-login/cri-logger";
 import { retrieveSessionIdByAccessToken } from "./helpers/retrieve-session-by-access-token";
@@ -24,8 +23,6 @@ import { IssueCredFunctionConfig } from "./config/function-config";
 import { VcCheckConfig, getVcConfig } from "./config/vc-config";
 import { jwtSigner } from "./kms-signer/kms-signer";
 
-initOpenTelemetry();
-
 const functionConfig = new IssueCredFunctionConfig();
 let vcConfig: VcCheckConfig;
 
@@ -64,23 +61,34 @@ class IssueCredentialHandler implements LambdaInterface {
       });
 
       const [vcEvidence] = vcClaimSet.vc.evidence || [];
-      await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.VC_ISSUED, functionConfig.audit.componentId, session, {
-        restricted: {
-          birthDate: personIdentity.birthDates,
-          name: personIdentity.names,
-          socialSecurityRecord: [
-            {
-              personalNumber: ninoUser.nino,
-            },
-          ],
-        },
-        extensions: {
-          evidence: [getAuditEvidence(attempts, contraIndicators, vcEvidence)],
-        },
-      });
+      await buildAndSendAuditEvent(
+        functionConfig.audit.queueUrl,
+        AUDIT_EVENT_TYPE.VC_ISSUED,
+        functionConfig.audit.componentId,
+        session,
+        {
+          restricted: {
+            birthDate: personIdentity.birthDates,
+            name: personIdentity.names,
+            socialSecurityRecord: [
+              {
+                personalNumber: ninoUser.nino,
+              },
+            ],
+          },
+          extensions: {
+            evidence: [getAuditEvidence(attempts, contraIndicators, vcEvidence)],
+          },
+        }
+      );
 
       captureMetric("VCIssuedMetric");
-      await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.END, functionConfig.audit.componentId, session);
+      await buildAndSendAuditEvent(
+        functionConfig.audit.queueUrl,
+        AUDIT_EVENT_TYPE.END,
+        functionConfig.audit.componentId,
+        session
+      );
 
       return {
         statusCode: 200,

lambdas/nino-check/src/handler.ts

@@ -1,5 +1,4 @@
 import { APIGatewayProxyEvent, APIGatewayProxyResult, Context } from "aws-lambda";
-import { initOpenTelemetry } from "../../open-telemetry/src/otel-setup";
 import { writeCompletedCheck } from "./helpers/write-completed-check";
 import { NinoCheckFunctionConfig } from "./helpers/function-config";
 import { saveTxn, handleResponseAndSaveAttempt } from "./helpers/nino";
@@ -20,8 +19,6 @@ import { getAttempts } from "../../common/src/database/get-attempts";
 import { buildAndSendAuditEvent } from "@govuk-one-login/cri-audit";
 import { AUDIT_EVENT_TYPE } from "../../common/src/types/audit";
 
-initOpenTelemetry();
-
 const MAX_PAST_ATTEMPTS = 1;
 
 type InputBody = {
@@ -92,18 +89,24 @@ class NinoCheckHandler implements LambdaInterface {
           }
         : undefined;
 
-      await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.REQUEST_SENT, functionConfig.audit.componentId, session, {
-        restricted: {
-          birthDate: personIdentity.birthDates,
-          name: personIdentity.names,
-          socialSecurityRecord: [
-            {
-              personalNumber: nino,
-            },
-          ],
-          ...auditDeviceInformation,
-        },
-      });
+      await buildAndSendAuditEvent(
+        functionConfig.audit.queueUrl,
+        AUDIT_EVENT_TYPE.REQUEST_SENT,
+        functionConfig.audit.componentId,
+        session,
+        {
+          restricted: {
+            birthDate: personIdentity.birthDates,
+            name: personIdentity.names,
+            socialSecurityRecord: [
+              {
+                personalNumber: nino,
+              },
+            ],
+            ...auditDeviceInformation,
+          },
+        }
+      );
 
       logger.info(`REQUEST_SENT event fired.`);
 
@@ -126,10 +129,16 @@ class NinoCheckHandler implements LambdaInterface {
 
       logger.info(`Saved txn.`);
 
-      await buildAndSendAuditEvent(functionConfig.audit.queueUrl, AUDIT_EVENT_TYPE.RESPONSE_RECEIVED, functionConfig.audit.componentId, session, {
-        restricted: auditDeviceInformation,
-        extensions: { evidence: { txn: parsedPdvMatchResponse.txn } },
-      });
+      await buildAndSendAuditEvent(
+        functionConfig.audit.queueUrl,
+        AUDIT_EVENT_TYPE.RESPONSE_RECEIVED,
+        functionConfig.audit.componentId,
+        session,
+        {
+          restricted: auditDeviceInformation,
+          extensions: { evidence: { txn: parsedPdvMatchResponse.txn } },
+        }
+      );
 
       logger.info(`RESPONSE_RECEIVED event fired.`);