updating env variables

Author: Miqueasher

sample-apps/python/django_frontend_service/frontend_service_app/views.py

@@ -24,9 +24,8 @@
 
 # Initialize custom OTEL metrics export pipeline - OTLP approach (OTEL/Span export 1) Agent based
 custom_resource = Resource.create({
-        "service.name": "OTEL_SERVICE_NAME",
+        "service.name": os.getenv("OTEL_SERVICE_NAME", "python-sample-application"),
         "deployment.environment.name": "custom_export",
-        #"test" being overridden by python-sample-application-${var.test_id} in main.tf
         })
 custom_otlp_exporter = OTLPMetricExporter(
     endpoint="http://localhost:4317",
@@ -46,7 +45,7 @@
 
 # Custom Export Pipeline - HTTP Direct
 resource = Resource.create({
-    "service.name": "OTEL_SERVICE_NAME",
+    "service.name": os.getenv("OTEL_SERVICE_NAME", "python-sample-application"),
     "deployment.environment.name": "agent_export",
     })
 

terraform/python/ec2/default/amazon-cloudwatch-agent.json

@@ -10,11 +10,16 @@
   },
   "logs": {
     "metrics_collected": {
-      "application_signals": {},
-      "otlp": {
-        "grpc_endpoint": "0.0.0.0:4317",
-        "http_endpoint": "0.0.0.0:4318"
-      }
+      "application_signals": {}
+    }
+  },
+  "metrics": {
+    "metrics_collected": {
+      "application_signals": {}
+    },
+    "otlp": {
+      "grpc_endpoint": "0.0.0.0:4317",
+      "http_endpoint": "0.0.0.0:4318"
     }
   }
 }

terraform/python/ec2/default/main.tf

@@ -180,7 +180,7 @@ resource "null_resource" "main_service_setup" {
       export OTEL_EXPORTER_OTLP_METRICS_PROTOCOL=grpc
       export OTEL_SERVICE_NAME=python-sample-application-${var.test_id}
       export OTEL_TRACES_SAMPLER=always_on
-      export OTEL_RESOURCE_ATTRIBUTES="service.name=GOAT_Service,deployment.environment.name=GOAT_Pen"
+      export OTEL_RESOURCE_ATTRIBUTES="service.name=python-sample-application-${var.test_id},deployment.environment.name=ec2:default"
       export AWS_REGION='${var.aws_region}'
       export CUSTOM_METRICS_ENABLED='${var.custom_metrics_enabled}'
       export RDS_MYSQL_CLUSTER_ENDPOINT='dummy-endpoint'
@@ -283,8 +283,8 @@ resource "null_resource" "remote_service_setup" {
       sudo yum install ec2-instance-connect -y
 
       # Copy in CW Agent configuration
-      agent_config='${replace(replace(file(var.custom_metrics_enabled ? "./amazon-cloudwatch-custom-agent.json" : "./amazon-cloudwatch-agent.json"), "/\\s+/", ""), "$REGION", var.aws_region)}'
-      echo $agent_config > amazon-cloudwatch-agent.json
+      agent_config='${replace(file(var.custom_metrics_enabled ? "./amazon-cloudwatch-custom-agent.json" : "./amazon-cloudwatch-agent.json"), "$REGION", var.aws_region)}'
+      echo "$agent_config" > amazon-cloudwatch-agent.json
 
       # Get and run CW agent rpm
       ${var.get_cw_agent_rpm_command}

validator/src/main/resources/expected-data-template/python/ec2/default/aws-otel-custom-metrics.mustache

@@ -6,6 +6,9 @@
     -
       name: deployment.environment.name
       value: custom_export
+    -
+      name: service.name
+      value: {{serviceName}}
     -
       name: telemetry.sdk.language
       value: python
@@ -22,10 +25,12 @@
   metricName: agent_export_counter
   namespace: {{customMetricNamespace}}
   dimensions:
-
     -
       name: deployment.environment.name
       value: agent_export
+    -
+      name: service.name
+      value: {{serviceName}}
     -
       name: telemetry.sdk.language
       value: python