removing cwagent and updated views

Author: Miqueasher

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

@@ -24,8 +24,8 @@
 
 # Initialize custom OTEL metrics export pipeline - OTLP approach (OTEL/Span export 1) Agent based
 custom_resource = Resource.create({
-        "service.name": os.getenv("OTEL_SERVICE_NAME", "python-sample-application"),
-        "deployment.environment.name": os.getenv("DEPLOYMENT_ENV", "test"),
+        "service.name": "OTEL_SERVICE_NAME",
+        "deployment.environment.name": "custom_export",
         #"test" being overridden by python-sample-application-${var.test_id} in main.tf
         })
 custom_otlp_exporter = OTLPMetricExporter(
@@ -46,41 +46,38 @@
 
 # Custom Export Pipeline - HTTP Direct
 resource = Resource.create({
-    "service.name": os.getenv("OTEL_SERVICE_NAME", "python-sample-application"),
-    "deployment.environment.name": os.getenv("DEPLOYMENT_ENV", "test")
-    })#"test" being overridden by python-sample-application-${var.test_id} in main.tf
+    "service.name": "OTEL_SERVICE_NAME",
+    "deployment.environment.name": "agent_export",
+    })
 
-# OtlpHttpMetricExporter.builder().setEndpoint().build()
+# Python version of 'OtlpHttpMetricExporter.builder().setEndpoint().build()'
 metricExporter = HTTPMetricExporter(
     endpoint="http://localhost:4318/v1/metrics"
 )
 
-# PeriodicMetricReader.builder(metricExporter).setInterval(Duration.ofSeconds(10)).build()
+# 'Python version of 'PeriodicMetricReader.builder(metricExporter).setInterval(Duration.ofSeconds(10)).build()'
 metricReader = PeriodicExportingMetricReader(
     exporter=metricExporter,
     export_interval_millis=5000
 )
 
-# SdkMeterProvider.builder().setResource(resource).registerMetricReader(metricReader).build()
+# Python version of 'SdkMeterProvider.builder().setResource(resource).registerMetricReader(metricReader).build()'
 meterProvider = MeterProvider(
     resource=resource,
     metric_readers=[metricReader]
 )
 
-# meterProvider.get("myMeter")
-meter = meterProvider.get_meter("myMeter")
-
-
 # Create meter provider with both exporters
 custom_meter_provider = MeterProvider(
     resource=custom_resource,
     metric_readers=[custom_otlp_reader, custom_console_reader]
 )
 
-# Initialize span metrics using custom meter provider
+# Initialize counters/meters using custom meter provider. Python version of 'meterProvider.get("myMeter")'
 custom_meter = custom_meter_provider.get_meter("custom-metrics")
-custom_request_counter = custom_meter.create_counter("cloud_watch_counter", description="Total requests")
-http_counter = meter.create_counter("http_counter", description="Total requests")
+meter = meterProvider.get_meter("myMeter")
+custom_export_counter = custom_meter.create_counter("custom_export_counter", description="Total requests")
+agent_export_counter = meter.create_counter("agent_export_counter", description="Total requests")
 
 should_send_local_root_client_call = False
 lock = threading.Lock()
@@ -117,8 +114,8 @@ def healthcheck(request):
 
 def aws_sdk_call(request):
     # Setup Span Attributes And Initialize Counter/Histogram To Recieve Custom Metrics
-    custom_request_counter.add(1, {"operation.type": "aws_sdk_call"})  # Agent-based export
-    http_counter.add(1, {"operation.type": "aws_sdk_call"})  # Custom export pipeline
+    custom_export_counter.add(1, {"operation.type": "custom_export_1"})  # Agent-based export
+    agent_export_counter.add(1, {"operation.type": "agent_export_1"})  # Custom export pipeline
 
     bucket_name = "e2e-test-bucket-name"
 

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

@@ -170,7 +170,8 @@ resource "null_resource" "main_service_setup" {
       export DJANGO_SETTINGS_MODULE="django_frontend_service.settings"
       export OTEL_PYTHON_DISTRO="aws_distro"
       export OTEL_PYTHON_CONFIGURATOR="aws_configurator"
-      export OTEL_METRICS_EXPORTER=${var.custom_metrics_enabled ? "otlp" : "none"}
+      export OTEL_METRICS_EXPORTER=otlp
+      export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=http://localhost:4318/v1/metrics
       export OTEL_TRACES_EXPORTER=otlp
       export OTEL_AWS_APPLICATION_SIGNALS_ENABLED=true
       export OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT=http://localhost:4315
@@ -179,8 +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=python-sample-application-${var.test_id},deployment.environment.name=ec2:default"
-      ${var.custom_metrics_enabled ? "export OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=http://localhost:4317" : "# Custom metrics disabled"}
+      export OTEL_RESOURCE_ATTRIBUTES="service.name=GOAT_Service,deployment.environment.name=GOAT_Pen"
       export AWS_REGION='${var.aws_region}'
       export CUSTOM_METRICS_ENABLED='${var.custom_metrics_enabled}'
       export RDS_MYSQL_CLUSTER_ENDPOINT='dummy-endpoint'

terraform/python/ec2/default/main.tf

@@ -1,27 +1,40 @@
 # OpenTelemetry Custom Metrics Validation Templates - AWS SDK Call Only
 -
-  metricName: cloud_watch_counter
+  metricName: custom_export_counter
   namespace: {{customMetricNamespace}}
   dimensions:
+    -
+      name: deployment.environment.name
+      value: custom_export
+    -
+      name: telemetry.sdk.language
+      value: python
     -
       name: operation.type
-      value: aws_sdk_call
+      value: custom_export_1
     -
-      name: Service
-      value: {{serviceName}}
+      name: telemetry.sdk.version
+      value: 1.33.1
     -
-      name: Environment
-      value: {{testingId}}
+      name: telemetry.sdk.name
+      value: opentelemetry
 -
-  metricName: http_counter
+  metricName: agent_export_counter
   namespace: {{customMetricNamespace}}
   dimensions:
+
+    -
+      name: deployment.environment.name
+      value: agent_export
+    -
+      name: telemetry.sdk.language
+      value: python
     -
       name: operation.type
-      value: aws_sdk_call
+      value: agent_export_1
     -
-      name: Service
-      value: {{serviceName}}
+      name: telemetry.sdk.version
+      value: 1.33.1
     -
-      name: Environment
-      value: {{testingId}}
+      name: telemetry.sdk.name
+      value: opentelemetry