diff --git a/framework/.changeset/v0.10.28.md b/framework/.changeset/v0.10.28.md new file mode 100644 index 000000000..6c46855c2 --- /dev/null +++ b/framework/.changeset/v0.10.28.md @@ -0,0 +1 @@ +- Unify local obs stack metrics for otel Prom between local and production, remove suffixes \ No newline at end of file diff --git a/framework/observability.go b/framework/observability.go index 432a46d2c..64e652a8f 100644 --- a/framework/observability.go +++ b/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 } diff --git a/framework/observability/compose/otel.yaml b/framework/observability/compose/otel.yaml index b3a017dae..8a7593cfc 100644 --- a/framework/observability/compose/otel.yaml +++ b/framework/observability/compose/otel.yaml @@ -21,6 +21,9 @@ exporters: insecure: true prometheus: endpoint: "0.0.0.0:8889" + resource_to_telemetry_conversion: + enabled: true + add_metric_suffixes: false processors: transform: