Merge pull request #8 from hazelops/feature/enable-profiling-and-logs

Add OpenTelemetry, reformat

Author: DimmKirr

main.tf

@@ -6,24 +6,24 @@ locals {
     "DD_API_KEY",
   ])
 
-  environment = merge(var.environment,
-    {
-      DD_APM_ENABLED                 = "true"
-      DD_DOGSTATSD_NON_LOCAL_TRAFFIC = "true"
-      DD_APM_NON_LOCAL_TRAFFIC       = "true"
-      DD_PROCESS_AGENT_ENABLED       = "true"
-      DD_TAGS                        = "env:${var.env} app:${var.app_name}"
-      DD_TRACE_ANALYTICS_ENABLED     = "true"
-      DD_RUNTIME_METRICS_ENABLED     = "true"
-      DD_PROFILING_ENABLED           = "true"
-      DD_LOGS_INJECTION              = "true"
+  environment = merge(var.environment, {
+    DD_APM_ENABLED                                  = "true"
+    DD_DOGSTATSD_NON_LOCAL_TRAFFIC                  = "true"
+    DD_APM_NON_LOCAL_TRAFFIC                        = "true"
+    DD_PROCESS_AGENT_ENABLED                        = "true"
+    DD_TAGS                                         = "env:${var.env} app:${var.app_name}"
+    DD_TRACE_ANALYTICS_ENABLED                      = "true"
+    DD_RUNTIME_METRICS_ENABLED                      = "true"
+    DD_PROFILING_ENABLED                            = "true"
+    DD_LOGS_INJECTION                               = "true"
+    DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT = var.opentelemetry_grpc_endpoint
+    DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT = var.opentelemetry_http_endpoint
 
-      // https://www.datadoghq.com/blog/monitor-aws-fargate/
-      ECS_FARGATE = var.ecs_launch_type == "FARGATE" ? "true" : "false"
-    },
-    (var.ecs_launch_type == "EC2" && var.socket_apm_enabled_on_ec2) ? {
-      DD_APM_RECEIVER_SOCKET = "/var/run/datadog.sock"
-      DD_TRACE_AGENT_URL     = "/var/run/datadog.sock"
+    // https://www.datadoghq.com/blog/monitor-aws-fargate/
+    ECS_FARGATE = var.ecs_launch_type == "FARGATE" ? "true" : "false"
+    }, (var.ecs_launch_type == "EC2" && var.socket_apm_enabled_on_ec2) ? {
+    DD_APM_RECEIVER_SOCKET = "/var/run/datadog.sock"
+    DD_TRACE_AGENT_URL     = "/var/run/datadog.sock"
     } : {}
   )
 
@@ -34,13 +34,19 @@ locals {
     essential            = true,
     resourceRequirements = var.resource_requirements
 
-    environment = [for k, v in local.environment : { name = k, value = v }]
+    environment = [
+      for k, v in local.environment : {
+        name  = k,
+        value = v
+      }
+    ]
 
-    secrets = [for param_name in local.global_secrets :
-        {
-          name      = param_name
-          valueFrom = "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter/${var.env}/global/${param_name}"
-        }
+    secrets = [
+      for param_name in local.global_secrets :
+      {
+        name      = param_name
+        valueFrom = "arn:aws:ssm:${data.aws_region.current.name}:${data.aws_caller_identity.current.account_id}:parameter/${var.env}/global/${param_name}"
+      }
     ]
 
     mountPoints = var.ecs_launch_type == "FARGATE" ? [] : concat([
@@ -62,13 +68,14 @@ locals {
       },
 
 
-      ],
-      var.socket_apm_enabled_on_ec2 ? [{
+      ], var.socket_apm_enabled_on_ec2 ? [
+      {
         containerPath = "/var/run/datadog.sock"
         sourceVolume  = "datadog-sock"
         // This is disabled temporarily to overcome json unmarshaling issue
         //        readOnly = true
-      }] : []
+      }
+      ] : []
     )
 
 
@@ -77,7 +84,7 @@ locals {
         protocol      = "udp",
         containerPort = 8125
       }
-    ] : [
+      ] : [
       {
         protocol      = "tcp",
         containerPort = 8126
@@ -115,17 +122,17 @@ locals {
       host_path = "/cgroup/"
     }
 
-    ],
-    var.socket_apm_enabled_on_ec2 ? [
-      {
-        name      = "datadog-sock"
-        host_path = "/var/run/datadog.sock"
-        mount_point = {
-          "sourceVolume"  = "datadog-sock"
-          "containerPath" = "/var/run/datadog.sock"
-          "readOnly"      = null
-        }
-    }] : []
+    ], var.socket_apm_enabled_on_ec2 ? [
+    {
+      name      = "datadog-sock"
+      host_path = "/var/run/datadog.sock"
+      mount_point = {
+        "sourceVolume"  = "datadog-sock"
+        "containerPath" = "/var/run/datadog.sock"
+        "readOnly"      = null
+      }
+    }
+    ] : []
   )
 
 }

variables.tf

@@ -50,6 +50,14 @@ variable "socket_apm_enabled_on_ec2" {
   default = false
 }
 
+variable "opentelemetry_grpc_endpoint" {
+  default = "0.0.0.0:4317"
+}
+
+variable "opentelemetry_http_endpoint" {
+  default = "0.0.0.0:4318"
+}
+
 variable "enabled" {
   default = true
 }