Fixed buildspec and path

PetAdoptions/cdk/pet_stack/lib/services/status-updater-service.ts

@@ -1,6 +1,7 @@
 import * as cdk from '@aws-cdk/core';
 import * as iam from '@aws-cdk/aws-iam';
 import * as lambda from '@aws-cdk/aws-lambda';
+import * as nodejslambda from '@aws-cdk/aws-lambda-nodejs';
 import * as apigw from '@aws-cdk/aws-apigateway';
 
 export interface StatusUpdaterServiceProps {
@@ -28,17 +29,26 @@ export class StatusUpdaterService extends cdk.Construct {
 //    var layerArn = "arn:aws:lambda:us-west-2:580247275435:layer:LambdaInsightsExtension:2";
     var layer = lambda.LayerVersion.fromLayerVersionArn(this, `LayerFromArn`, layerArn);
 
-    const lambdaFunction = new lambda.Function(this, 'lambdafn', {
+    const lambdaFunction = new nodejslambda.NodejsFunction(this, 'lambdafn', {
         runtime: lambda.Runtime.NODEJS_12_X,    // execution environment
-        code: lambda.Code.fromAsset('./resources/function.zip'), // Copy from Lambda folder or move here!!
-        handler: 'index.handler',
+        entry: '../../petstatusupdater/index.js',
+        depsLockFilePath: '../../petstatusupdater/package-lock.json',
+        handler: 'handler',
         memorySize: 128,
         tracing: lambda.Tracing.ACTIVE,
         role: lambdaRole,
         layers: [layer],
         description: 'Update Pet availability status',
         environment: {
             "TABLE_NAME": props.tableName
+        },
+        bundling: {
+          externalModules: [
+            'aws-sdk'
+          ],
+          nodeModules: [
+             'aws-xray-sdk'
+          ]
         }
     });
 

PetAdoptions/cdk/pet_stack/lib/services/stepfn.ts

@@ -32,9 +32,9 @@ export class PetAdoptionsStepFn extends cdk.Construct {
     //    var layerArn = "arn:aws:lambda:us-west-2:580247275435:layer:LambdaInsightsExtension:2";
     var layer = lambda.LayerVersion.fromLayerVersionArn(this, `LambdaInsights`, layerArn);
 
-    var adotlayer = new lambda.LayerVersion(this, 'ADOTLayer', {
-      code: new lambda.AssetCode('./resources/aws-distro-for-opentelemetry-python-38-preview.zip')
-    });
+
+    var adotLayerArn = "arn:aws:lambda:"+ process.env.CDK_DEFAULT_REGION + ":901920570463:layer:aws-otel-python38-ver-1-5-0:2"
+    var adotlayer = lambda.LayerVersion.fromLayerVersionArn(this,'otelPythonLambdaLayer',adotLayerArn);
 
     var layers: lambda.ILayerVersion[] = [layer, adotlayer]
 
@@ -69,7 +69,7 @@ export class PetAdoptionsStepFn extends cdk.Construct {
 
   private createStepFnLambda(lambdaFileName: string, lambdaRole: iam.Role, lambdalayers: lambda.ILayerVersion[]) {
     var pythonFn = new pythonlambda.PythonFunction(this, lambdaFileName, {
-      entry: './resources/',
+      entry: './resources/stepfn_lambdas/',
       index: lambdaFileName + '.py',
       handler: 'lambda_handler',
       memorySize: 128,
@@ -78,7 +78,7 @@ export class PetAdoptionsStepFn extends cdk.Construct {
       layers: lambdalayers,
       tracing: Tracing.ACTIVE
     });
-    pythonFn.addEnvironment("AWS_LAMBDA_EXEC_WRAPPER", "/opt/python/adot-instrument")
+    pythonFn.addEnvironment("AWS_LAMBDA_EXEC_WRAPPER", "/opt/otel-instrument")
     return pythonFn;
   }
 }

PetAdoptions/cdk/pet_stack/package.json

@@ -51,6 +51,7 @@
     "@aws-cdk/core": "1.98.0",
     "@aws-cdk/custom-resources": "1.98.0",
     "@aws-cdk/cx-api": "1.98.0",
+    "@aws-cdk/aws-lambda-nodejs": "1.98.0",
     "@types/js-yaml": "3.12.5",
     "aws-cdk-dynamodb-seeder": "1.56.0",
     "cdk-sqlserver-seeder": "^0.2.3",