Merge pull request #2 from mackerelio-labs/modify/adapt_lambda_custom…

…runtime Adapt AWS Lambda Custom Runtime
mackerelio-labs · Jul 13, 2023 · 47c10b3 · 47c10b3
2 parents 0b9f05e + f6da913
commit 47c10b3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -54,3 +54,10 @@ $(OUTPUT_DIR)/lambda.zip: $(OUTPUT_DIR)/linux/$(NAME)
 
 .PHONY: lambda-artifact
 lambda-artifact: $(OUTPUT_DIR)/lambda.zip
+
+$(OUTPUT_DIR)/bootstrap.zip: $(OUTPUT_DIR)/linux/$(NAME)
+	mv $(OUTPUT_DIR)/linux/$(NAME) $(OUTPUT_DIR)/linux/bootstrap
+	zip -j $(OUTPUT_DIR)/bootstrap.zip $(OUTPUT_DIR)/linux/bootstrap
+
+.PHONY: lambda-bootstrap-artifact
+labmda-boostrap-artifact: $(OUTPUT_DIR)/bootstrap.zip
diff --git a/cmd/mackerel-sql-metric-collector/main.go b/cmd/mackerel-sql-metric-collector/main.go
@@ -96,7 +96,7 @@ func detectExecutorName() string {
 		return e
 
 	}
-	if os.Getenv("AWS_EXECUTION_ENV") != "" {
+	if os.Getenv("AWS_EXECUTION_ENV") != "" || os.Getenv("AWS_LAMBDA_RUNTIME_API") != "" {
 		return lambda.Name
 
 	}