Merge branch 'main' into sui-cli

Author: friedemannf

framework/.changeset/v0.10.28.md

@@ -0,0 +1 @@
+- Unify local obs stack metrics for otel Prom between local and production, remove suffixes

framework/components/dockercompose/billing_platform_service/docker-compose.yml

@@ -47,6 +47,8 @@ services:
       - "2112:2112"
       - "2222:2222"
       - "2223:2223"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     healthcheck:
       test: ["CMD", "grpc_health_probe", "-addr=localhost:2222"]
       interval: 200ms

framework/observability.go

@@ -173,12 +173,10 @@ func ObservabilityUpFull() error {
 
 func ObservabilityDown() error {
 	L.Info().Msg("Removing local observability stack")
-	err := RunCommand("bash", "-c", fmt.Sprintf(`
+	_ = RunCommand("bash", "-c", fmt.Sprintf(`
 		cd %s && \
 		docker compose down -v && docker rm -f promtail
 	`, "compose"))
-	if err != nil {
-		return err
-	}
-	return RunCommand("bash", "-c", "rm -rf compose/")
+	_ = RunCommand("bash", "-c", "rm -rf compose/")
+	return nil
 }

framework/observability/compose/otel.yaml

@@ -15,12 +15,15 @@ exporters:
     endpoint: "http://loki:3100/otlp"
     tls:
       insecure: true
-  otlp:
-    endpoint: "http://tempo:4317"
+  otlp/traces:
+    endpoint: "tempo:4317"
     tls:
       insecure: true
   prometheus:
     endpoint: "0.0.0.0:8889"
+    resource_to_telemetry_conversion:
+      enabled: true
+    add_metric_suffixes: false
 
 processors:
   transform:
@@ -33,7 +36,7 @@ service:
   pipelines:
     traces:
       receivers: [otlp]
-      exporters: [debug, otlp]
+      exporters: [debug, otlp/traces]
     logs:
       receivers: [otlp]
       processors: [transform]