remove typo

Author: daidokoro

opentelemetry/ecs-ec2/template.yaml

@@ -124,7 +124,7 @@ Mappings:
                 id: docker_log_json_parser
                 routes:
                   - output: json_parser
-                    expr: 'body matches "^\\{\"log\".*\\}xxx"'
+                    expr: 'body matches "^\\{\"log\".*\\}"'
                 default: move_log_file_path
 
               - type: json_parser
@@ -276,7 +276,7 @@ Mappings:
                 id: docker_log_json_parser
                 routes:
                   - output: json_parser
-                    expr: 'body matches "^\\{\"log\".*\\}xxx"'
+                    expr: 'body matches "^\\{\"log\".*\\}"'
                 default: move_log_file_path
 
               - type: json_parser

opentelemetry/lambda/script.py

@@ -0,0 +1,45 @@
+import boto3
+import cfnresponse
+import json
+
+def handler(event, context):
+    print("received event: " + json.dumps(event, indent=2))
+
+    try:
+        status = cfnresponse.SUCCESS
+
+        if event['RequestType'] in ['Create', 'Update']:
+            lambda_arn = event['ResourceProperties']['LambdaArn']
+            lambda_client = boto3.client('lambda')
+
+            # Get the current environment variables of the Lambda function
+            function_configuration = lambda_client.get_function_configuration(FunctionName=lambda_arn)
+            current_env = function_configuration['Environment']['Variables']
+
+            # Merge the current environment variables with any new ones specified in the CloudFormation event
+            # new_environment = current_environment.copy()
+            current_env.update(event['ResourceProperties']['env'])
+
+            # Get the list of layers to add to the Lambda function
+            layers = event['ResourceProperties'].get('LayerArns', [])
+
+            # Add the specified layers and environment variables to the Lambda function
+            lambda_client.update_function_configuration(
+                FunctionName=lambda_arn, 
+                Environment={'Variables': current_env},
+                Layers=layers)
+        
+        if event['RequestType'] == 'Delete':
+            # TODO: implement delete logic
+            pass
+        
+
+    except Exception as e:
+        print(f"custom resource failed to update layers and env vars: {e}")
+        status = cfnresponse.FAILED
+    
+    finally:
+        # Send a status response to CloudFormation
+        response_data = {}
+        cfnresponse.send(event, context, status, response_data)
+        return

opentelemetry/lambda/template.yaml

@@ -0,0 +1,87 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Parameters:
+  LambdaFunctionARN:
+    Type: String
+    Description: The ARN of the Lambda function to invoke
+    
+  WrapperHandler:
+    Type: String
+    Description: The path to the otel instrumentation executable
+    Default: /opt/python/otel-instrument
+
+  Runtime:
+    Type: String
+    Description: The language of the Lambda function
+    Default: python
+    AllowedValues:
+      - python
+      - nodejs
+      - go
+
+  Arch:
+    Type: String
+    Description: The architecture of the Lambda function
+    Default: amd64
+    AllowedValues:
+      - amd64
+      - arm64
+
+Mappings:
+  layers:
+    python:
+      amd64: arn:aws:lambda:eu-north-1:035955823196:layer:coralogix-aws-lambda-telemetry-exporter-python-x86_64:1
+      arm64: arn:aws:lambda:eu-north-1:035955823196:layer:coralogix-aws-lambda-telemetry-exporter-python-arm64:1
+
+  RegionMap:
+    us-east-1:
+      LambdaLayerARN: arn:aws:lambda:us-east-1:901920570463:layer:aws-otel-python38-ver-1-0-0:1
+    us-east-2:
+      LambdaLayerARN: arn:aws:lambda:us-east-2:901920570463:layer:aws-otel-python38-ver-1-0-0:1
+    us-west-2:
+      LambdaLayerARN: arn:aws:lambda:us-west-2:901920570463:layer:aws-otel-python38-ver-1-0-0:1
+
+Resources:
+  CustomResourceConfigureLambdaFunction:
+    Type: 'AWS::CloudFormation::CustomResource'
+    Properties:
+      ServiceToken: !GetAtt AddConfigLambdaFunction.Arn
+      LambdaArn: !Ref LambdaFunctionARN
+      layers:
+        - !FindInMap [layers, !Ref Runtime, !Ref Arch]
+      env:
+        AWS_LAMBDA_EXEC_WRAPPER: !Ref WrapperHandler
+      
+
+  AddConfigLambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      FunctionName: coralogix-otel-lambda-configure
+      Handler: index.lambda_handler
+      Runtime: python3.9
+      Policies:
+        - Statement:
+          - Sid: AllowLambdaConfigUpdatePolicy
+            Effect: Allow
+            Action:
+              - lambda:UpdateFunctionConfiguration
+            Resource: "*"
+
+      InlineCode: |
+        import boto3
+        import json
+        import cfnresponse
+
+        def handler(event, context):
+          print("Received event: " + json.dumps(event, indent=2))
+          lambda_client = boto3.client('lambda')
+          lambda_client.update_function_configuration(
+            FunctionName=event['ResourceProperties']['LambdaArn'],
+            Layers=event['ResourceProperties']['layers'],
+            Environment={
+              'Variables': event['ResourceProperties']['env']
+            }
+          )
+          return cfnresponse.SUCCESS
+