Add adot instrumentation

Dockerfile.enhanced

@@ -117,4 +117,4 @@ ENV OAS_MODULE_PATH=${WORK_DIRECTORY}/modules/oas-page-builder/index.js
 
 RUN mkdir repos && chmod 755 repos
 EXPOSE 3000
-CMD ["node", "enhanced/enhancedApp.js"]
+CMD ["node", "--require", "./otel/index.js" , "enhanced/enhancedApp.js"]

api/controllers/v2/github.ts

@@ -24,7 +24,7 @@ async function prepGithubPushPayload(
   const branch_info = await repoBranchesRepository.getRepoBranchAliases(
     githubEvent.repository.name,
     branch_name,
-    repoInfo.project
+    repoInfo?.project
   );
   const urlSlug = branch_info.aliasObject?.urlSlug ?? branch_name;
   const project = repoInfo?.project ?? githubEvent.repository.name;
@@ -58,7 +58,7 @@ async function prepGithubPushPayload(
   };
 }
 
-export const TriggerBuild = async (event: APIGatewayEvent): Promise<APIGatewayProxyResult> => {
+module.exports.TriggerBuild = async (event: APIGatewayEvent): Promise<APIGatewayProxyResult> => {
   const client = new mongodb.MongoClient(c.get('dbUrl'));
   await client.connect();
   const db = client.db(c.get('dbName'));

cdk-infra/lib/constructs/api/webhook-api-construct.ts

@@ -1,6 +1,14 @@
 import { Duration } from 'aws-cdk-lib';
 import { Cors, CorsOptions, LambdaIntegration, LambdaRestApi } from 'aws-cdk-lib/aws-apigateway';
-import { Code, Function, Runtime } from 'aws-cdk-lib/aws-lambda';
+import {
+  AdotLambdaExecWrapper,
+  AdotLambdaLayerJavaScriptSdkVersion,
+  AdotLayerVersion,
+  Code,
+  Function,
+  Runtime,
+  Tracing,
+} from 'aws-cdk-lib/aws-lambda';
 import { SqsEventSource } from 'aws-cdk-lib/aws-lambda-event-sources';
 import { BundlingOptions, NodejsFunction } from 'aws-cdk-lib/aws-lambda-nodejs';
 import { IQueue } from 'aws-cdk-lib/aws-sqs';
@@ -71,7 +79,16 @@ export class WebhookApiConstruct extends Construct {
       handler: 'TriggerBuild',
       bundling,
       environment,
+      memorySize: 1024,
       timeout,
+      tracing: Tracing.ACTIVE,
+      currentVersionOptions: {
+        provisionedConcurrentExecutions: 5,
+      },
+      adotInstrumentation: {
+        execWrapper: AdotLambdaExecWrapper.REGULAR_HANDLER,
+        layerVersion: AdotLayerVersion.fromJavaScriptSdkLayerVersion(AdotLambdaLayerJavaScriptSdkVersion.LATEST),
+      },
     });
 
     const githubDeleteArtifactsLambda = new NodejsFunction(this, 'githubDeleteArtifactsLambda', {
@@ -123,6 +140,7 @@ export class WebhookApiConstruct extends Construct {
     const restApi = new LambdaRestApi(this, apiName, {
       handler: rootEndpointLambda,
       proxy: false,
+      cloudWatchRole: true,
     });
 
     const webhookEndpoint = restApi.root.addResource('webhook');

cdk-infra/lib/constructs/otel/otel-construct.ts

@@ -0,0 +1,19 @@
+import { IVpc } from 'aws-cdk-lib/aws-ec2';
+import { Cluster } from 'aws-cdk-lib/aws-ecs';
+import { Construct } from 'constructs';
+
+interface Props {
+  vpc: IVpc;
+}
+
+export class OtelCollectorConstruct extends Construct {
+  constructor(scope: Construct, id: string, { vpc }: Props) {
+    super(scope, id);
+
+    const cluster = new Cluster(this, 'otel-cluster', {
+      vpc,
+      enableFargateCapacityProviders: true,
+      containerInsights: true,
+    });
+  }
+}

cdk-infra/lib/constructs/worker/worker-construct.ts

@@ -2,10 +2,12 @@ import { IVpc } from 'aws-cdk-lib/aws-ec2';
 import {
   AssetImageProps,
   Cluster,
+  ContainerDependencyCondition,
   ContainerImage,
   FargateService,
   FargateTaskDefinition,
   LogDrivers,
+  Protocol,
 } from 'aws-cdk-lib/aws-ecs';
 import { Effect, IRole, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
 import { LogGroup } from 'aws-cdk-lib/aws-logs';
@@ -80,6 +82,17 @@ export class WorkerConstruct extends Construct {
       executionRole,
     });
 
+    const xrayTracingPolicy = new PolicyStatement({
+      effect: Effect.ALLOW,
+      actions: [
+        'xray:PutTraceSegments',
+        'xray:PutTelemetryRecords',
+        'xray:GetSamplingRules',
+        'xray:GetSamplingTargets',
+        'xray:GetSamplingStatisticSummaries',
+      ],
+      resources: ['*'],
+    });
     const updateTaskProtectionPolicy = new PolicyStatement({
       effect: Effect.ALLOW,
       actions: ['ecs:UpdateTaskProtection'],
@@ -91,17 +104,45 @@ export class WorkerConstruct extends Construct {
       resources: ['*'],
     });
 
+    taskRole.addToPolicy(xrayTracingPolicy);
     taskRole.addToPolicy(updateTaskProtectionPolicy);
 
-    taskDefinition.addContainer('workerImage', {
-      image: ContainerImage.fromAsset(path.join(__dirname, '../../../../'), containerProps),
-      environment: dockerEnvironment,
-      logging: LogDrivers.awsLogs({
-        streamPrefix: 'autobuilderworker',
-        logGroup: taskDefLogGroup,
-      }),
+    const sideCar = taskDefinition.addContainer('otelSidecar', {
+      image: ContainerImage.fromRegistry('amazon/aws-otel-collector'),
+      command: ['--config=/etc/ecs/ecs-default-config.yaml'],
+      portMappings: [
+        {
+          hostPort: 2000,
+          protocol: Protocol.UDP,
+          containerPort: 2000,
+        },
+        {
+          hostPort: 4317,
+          protocol: Protocol.TCP,
+          containerPort: 4317,
+        },
+        {
+          hostPort: 8125,
+          protocol: Protocol.UDP,
+          containerPort: 8125,
+        },
+      ],
     });
 
+    taskDefinition
+      .addContainer('workerImage', {
+        image: ContainerImage.fromAsset(path.join(__dirname, '../../../../'), containerProps),
+        environment: dockerEnvironment,
+        logging: LogDrivers.awsLogs({
+          streamPrefix: 'autobuilderworker',
+          logGroup: taskDefLogGroup,
+        }),
+      })
+      .addContainerDependencies({
+        container: sideCar,
+        condition: ContainerDependencyCondition.START,
+      });
+
     const env = getEnv();
 
     new FargateService(this, 'fargateService', {

cdk-infra/package.json

@@ -21,7 +21,7 @@
     "@swc/helpers": "^0.5.1",
     "@types/jest": "^29.4.0",
     "@types/node": "18.14.6",
-    "aws-cdk": "2.73.0",
+    "aws-cdk": "2.100.0",
     "esbuild": "^0.18.3",
     "jest": "^29.5.0",
     "regenerator-runtime": "^0.13.11",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-ssm": "^3.342.0",
-    "aws-cdk-lib": "2.73.0",
+    "aws-cdk-lib": "2.103.1",
     "constructs": "^10.0.0",
     "source-map-support": "^0.5.21"
   }

cdk-infra/static/api/config/collector.yaml

@@ -0,0 +1,27 @@
+#collector.yaml in the root directory
+#Set an environment variable 'OPENTELEMETRY_COLLECTOR_CONFIG_FILE' to '/var/task/collector.yaml'
+
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 'localhost:4317'
+      http:
+        endpoint: 'localhost:4318'
+
+exporters:
+  # NOTE: Prior to v0.86.0 use `logging` instead of `debug`.
+  debug:
+  awsxray:
+
+service:
+  pipelines:
+    traces:
+      receivers: [otlp]
+      exporters: [awsxray]
+    metrics:
+      receivers: [otlp]
+      exporters: [prometheusremotewrite]
+  telemetry:
+    metrics:
+      address: localhost:8888

cdk-infra/static/api/config/config.yaml

@@ -0,0 +1,24 @@
+receivers:
+  otlp:
+    protocols:
+      grpc:
+        endpoint: 'localhost:4317'
+      http:
+        endpoint: 'localhost:4318'
+
+exporters:
+  # NOTE: Prior to v0.86.0 use `logging` instead of `debug`.
+  debug:
+    verbosity: detailed
+
+service:
+  pipelines:
+    traces:
+      receivers: [otlp]
+      exporters: [debug]
+    metrics:
+      receivers: [otlp]
+      exporters: [debug]
+  telemetry:
+    metrics:
+      address: localhost:8888