Fix benchmark tf module with python function (#414)

Author: lahsivjar

.gitignore

@@ -32,3 +32,5 @@ dist/
 *arn-file.md
 
 tf/*.zip
+
+build

apmproxy/apmserver.go

@@ -96,10 +96,10 @@ func (c *Client) FlushAPMData(ctx context.Context) {
 	}
 
 	// Flush lambda data
+	c.logger.Debug("Flush in progress - Processing lambda data")
 	for {
 		select {
 		case apmData := <-c.LambdaDataChannel:
-			c.logger.Debug("Flush in progress - Processing lambda data")
 			if err := c.forwardLambdaData(ctx, apmData); err != nil {
 				c.logger.Errorf("Error sending to APM server, skipping: %v", err)
 			}

testing/Makefile

@@ -4,13 +4,14 @@ MACHINE_TYPE?=t2.medium
 STACK_VERSION?=latest
 LOAD_DURATION?=10
 LOAD_ARRIVAL_RATE?=50
-LAMBDA_RUNTIME?=python3.8
+LAMBDA_RUNTIME?=python3.9
 LAMBDA_TIMEOUT?=15
 LAMBDA_MEMORY_SIZE?=128
 CUSTOM_LAMBDA_EXTENSION_ARN?=
 LAMBDA_RUNTIME_NORM=$(subst '.','_',$(LAMBDA_RUNTIME))
-
-# TODO: @lahsivjar Add automation for terraform fmt and docs
+LAMBDA_APM_AWS_EXTENSION_PATH=$(shell echo $(wildcard ../dist/*-linux-amd64.zip) | cut -d' ' -f1)
+TERRAFORM_DOCS=../build/terraform-docs
+TERRAFORM_DIRS=$(shell find tf-modules -type d -mindepth 1 -maxdepth 1)
 
 build/$(LAMBDA_RUNTIME_NORM).zip:
 	@mkdir -p build
@@ -19,7 +20,7 @@ build/$(LAMBDA_RUNTIME_NORM).zip:
 .PHONY: clean
 clean:
 	@rm -rf build/
-	@rm -rf functions/python3.8/package/
+	@rm -rf functions/python3.9/package/
 	@rm -rf functions/go1.x/main
 
 .PHONY: bench
@@ -30,10 +31,29 @@ bench: build/$(LAMBDA_RUNTIME_NORM).zip --run-tf
 destroy: TF_CMD=destroy
 destroy: --run-tf
 
+.PHONY: fmt
+fmt:
+	@terraform fmt -write $(TERRAFORM_DIRS)
+
+.PHONY: lint
+lint:
+	@terraform fmt -write=false $(TERRAFORM_DIRS)
+
 .PHONY: terraform-init
 terraform-init:
 	@cd benchmarking && terraform init
 
+$(TERRAFORM_DOCS): ../tools/go.mod
+	@go build -o $@ -modfile=$< github.com/terraform-docs/terraform-docs
+
+.PHONY: docs
+docs: $(TERRAFORM_DOCS) $(addsuffix /README.md,$(TERRAFORM_DIRS))
+
+%/README.md: force
+	$(TERRAFORM_DOCS) markdown --hide-empty --header-from header.md --output-file=README.md --output-mode replace $(subst README.md,,$@)
+
+force: ;
+
 .PHONY: --run-tf
 --run-tf:
 	@cd benchmarking && terraform $(TF_CMD) -auto-approve \
@@ -46,4 +66,6 @@ terraform-init:
 		-var 'lambda_timeout=$(LAMBDA_TIMEOUT)' \
 		-var 'lambda_memory_size=$(LAMBDA_MEMORY_SIZE)' \
 		-var 'stack_version=$(STACK_VERSION)' \
-		-var 'custom_lambda_extension_arn=$(CUSTOM_LAMBDA_EXTENSION_ARN)'
+		-var 'custom_lambda_extension_arn=$(CUSTOM_LAMBDA_EXTENSION_ARN)' \
+		-var 'lambda_apm_aws_extension_path=../$(LAMBDA_APM_AWS_EXTENSION_PATH)'
+

testing/benchmarking/README.md

@@ -35,7 +35,7 @@ No resources.
 | <a name="input_elasticsearch_zone_count"></a> [elasticsearch\_zone\_count](#input\_elasticsearch\_zone\_count) | Optional Elasticsearch zone count | `number` | `2` | no |
 | <a name="input_ess_region"></a> [ess\_region](#input\_ess\_region) | Optional ESS region where the deployment will be created. Defaults to gcp-us-west2 | `string` | `"gcp-us-west2"` | no |
 | <a name="input_lambda_memory_size"></a> [lambda\_memory\_size](#input\_lambda\_memory\_size) | Amount of memory (in MB) the lambda function can use | `number` | `128` | no |
-| <a name="input_lambda_runtime"></a> [lambda\_runtime](#input\_lambda\_runtime) | The language-specific lambda runtime | `string` | `"python3.8"` | no |
+| <a name="input_lambda_runtime"></a> [lambda\_runtime](#input\_lambda\_runtime) | The language-specific lambda runtime | `string` | `"python3.9"` | no |
 | <a name="input_lambda_timeout"></a> [lambda\_timeout](#input\_lambda\_timeout) | Timeout of the lambda function in seconds | `number` | `15` | no |
 | <a name="input_load_arrival_rate"></a> [load\_arrival\_rate](#input\_load\_arrival\_rate) | Rate(per second) at which the virtual users are generated | `number` | `50` | no |
 | <a name="input_load_duration"></a> [load\_duration](#input\_load\_duration) | Duration over which to generate new virtual users | `number` | `10` | no |
@@ -46,4 +46,4 @@ No resources.
 ## Outputs
 
 No outputs.
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->

testing/benchmarking/main.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.0"
+      version = "~> 5.18.1"
     }
     null = {
       source  = "hashicorp/null"
@@ -21,9 +21,19 @@ locals {
   name_from_runtime    = replace(var.lambda_runtime, ".", "_")
   lambda_function_zip  = "../build/${local.name_from_runtime}.zip"
   lambda_function_name = "${var.resource_prefix}_${local.name_from_runtime}_apm_aws_lambda"
-  runtimeToHandler = {
-    "python3.8" = "main.handler"
-    "go1.x"     = "main"
+  runtimeVars = {
+    "python3.9" = {
+      "handler" = "main.handler"
+      "layers" = ["arn:aws:lambda:${var.aws_region}:267093732750:layer:elastic-apm-python-ver-6-18-0:1"]
+      "envvars" = {
+        "AWS_LAMBDA_EXEC_WRAPPER" = "/opt/python/bin/elasticapm-lambda"
+      }
+    }
+    "go1.x" = {
+      "handler" = "main"
+      "layers" = []
+      "envvars" = {}
+    }
   }
 }
 
@@ -65,14 +75,16 @@ module "lambda_deployment" {
 
   resource_prefix = var.resource_prefix
 
-  apm_aws_extension_path = "../../bin/extension.zip"
+  apm_aws_extension_path = var.lambda_apm_aws_extension_path
 
   lambda_runtime              = var.lambda_runtime
+  lambda_memory_size          = var.lambda_memory_size
   lambda_function_zip         = local.lambda_function_zip
   lambda_function_name        = local.lambda_function_name
-  lambda_handler              = local.runtimeToHandler[var.lambda_runtime]
   lambda_invoke_path          = local.load_req_path
-  lambda_memory_size          = var.lambda_memory_size
+  additional_lambda_layers    = local.runtimeVars[var.lambda_runtime]["layers"]
+  lambda_handler              = local.runtimeVars[var.lambda_runtime]["handler"]
+  environment_variables       = local.runtimeVars[var.lambda_runtime]["envvars"]
   custom_lambda_extension_arn = var.custom_lambda_extension_arn
 
   apm_server_url   = module.ec_deployment.apm_url

testing/benchmarking/variables.tf

@@ -30,7 +30,7 @@ variable "load_arrival_rate" {
 variable "lambda_runtime" {
   type        = string
   description = "The language-specific lambda runtime"
-  default     = "python3.8"
+  default     = "python3.9"
 }
 
 variable "lambda_timeout" {
@@ -45,6 +45,11 @@ variable "lambda_memory_size" {
   default     = 128
 }
 
+variable "lambda_apm_aws_extension_path" {
+  type        = string
+  description = "Extension path where apm-aws-lambda extension zip is created"
+}
+
 variable "custom_lambda_extension_arn" {
   type        = string
   description = "Specific lambda extension to use, will use the latest build if not specified"

testing/functions/python3.8/requirements.txt

@@ -5,6 +5,4 @@
 
 set -e
 
-pip install -t ./package -r requirements.txt
-(cd package && zip -r ../../../build/python3_8.zip .)
-zip -g ../../build/python3_8.zip main.py
+zip -g ../../build/python3_9.zip main.py

testing/functions/python3.8/build.sh renamed to testing/functions/python3.9/build.sh

@@ -1,8 +1,6 @@
 import json
-from elasticapm import capture_serverless
 
 coldstart = "true"
-@capture_serverless()
 def handler(event, context):
     global coldstart
     print("Example function log", context.aws_request_id)

testing/functions/python3.8/main.py renamed to testing/functions/python3.9/main.py

@@ -1,27 +1,16 @@
+<!-- BEGIN_TF_DOCS -->
 ## Terraform module for deploying artillery
 
 The module is used to deploy and run [artillery](https://www.artillery.io/) in
 cloud for benchmarking lambda functions.
 
-<!-- BEGIN_TF_DOCS -->
-## Requirements
-
-| Name | Version |
-|------|---------|
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.0 |
-| <a name="requirement_null"></a> [null](#requirement\_null) | >=3.1.1 |
-
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.37.0 |
-| <a name="provider_null"></a> [null](#provider\_null) | 3.2.0 |
-| <a name="provider_tls"></a> [tls](#provider\_tls) | 4.0.4 |
-
-## Modules
-
-No modules.
+| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
+| <a name="provider_null"></a> [null](#provider\_null) | n/a |
+| <a name="provider_tls"></a> [tls](#provider\_tls) | n/a |
 
 ## Resources
 
@@ -43,15 +32,10 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region to deploy lambda function | `string` | `"us-west-2"` | no |
 | <a name="input_load_arrival_rate"></a> [load\_arrival\_rate](#input\_load\_arrival\_rate) | Rate(per second) at which the virtual users are generated | `number` | `50` | no |
 | <a name="input_load_base_url"></a> [load\_base\_url](#input\_load\_base\_url) | Base URL for load generation | `string` | n/a | yes |
 | <a name="input_load_duration"></a> [load\_duration](#input\_load\_duration) | Duration over which to generate new virtual users | `number` | `10` | no |
 | <a name="input_load_req_path"></a> [load\_req\_path](#input\_load\_req\_path) | Request path for load generation | `string` | n/a | yes |
 | <a name="input_machine_type"></a> [machine\_type](#input\_machine\_type) | Machine type for artillery nodes | `string` | `"t2.medium"` | no |
 | <a name="input_resource_prefix"></a> [resource\_prefix](#input\_resource\_prefix) | Prefix to add to all created resource | `string` | n/a | yes |
-
-## Outputs
-
-No outputs.
-<!-- END_TF_DOCS -->
+<!-- END_TF_DOCS -->