github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix(portal): Add node name key to metrics labels" (#8141)

Browse Source 
The node_name label is already in the metrics.

Reverts firezone/firezone#8082
This commit is contained in:
Jamil
2025-02-15 08:47:45 -08:00
committed by GitHub
parent 4685c8edfd
commit 85ee37dfb3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
elixir/apps/domain/lib/domain/telemetry/reporter/google_cloud_metrics.ex
View File

@@ -266,7 +266,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetrics do
time_series =
buffer
|> Enum.flat_map(fn {{schema, name, tags, unit}, measurements} ->
labels = Map.merge(labels, tags) |> truncate_labels() |> Map.merge(%{node: node()})
labels = Map.merge(labels, tags) |> truncate_labels()
format_time_series(schema, name, labels, resource, measurements, unit)
end)

14
elixir/apps/domain/test/domain/telemetry/reporter/google_cloud_metrics_test.exs
View File

@@ -151,7 +151,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
%{
"metric" => %{
"type" => "custom.googleapis.com/elixir/foo/count",
"labels" => %{"foo" => "bar", "app" => "myapp", "node" => "nonode@nohost"}
"labels" => %{"foo" => "bar", "app" => "myapp"}
},
"resource" => %{"type" => "test"},
"unit" => "request",
@@ -244,7 +244,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
%{
"metric" => %{
"type" => "custom.googleapis.com/elixir/foo/distribution",
"labels" => %{"foo" => "bar", "app" => "myapp", "node" => "nonode@nohost"}
"labels" => %{"foo" => "bar", "app" => "myapp"}
},
"resource" => %{"type" => "test"},
"unit" => "request",
@@ -332,7 +332,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
%{
"metric" => %{
"type" => "custom.googleapis.com/elixir/foo/sum",
"labels" => %{"foo" => "bar", "app" => "myapp", "node" => "nonode@nohost"}
"labels" => %{"foo" => "bar", "app" => "myapp"}
},
"resource" => %{"type" => "test"},
"unit" => "request",
@@ -407,7 +407,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
%{
"metric" => %{
"type" => "custom.googleapis.com/elixir/foo/summary",
"labels" => %{"foo" => "bar", "app" => "myapp", "node" => "nonode@nohost"}
"labels" => %{"foo" => "bar", "app" => "myapp"}
},
"resource" => %{"type" => "test"},
"unit" => "request",
@@ -439,7 +439,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
},
%{
"metric" => %{
"labels" => %{"app" => "myapp", "foo" => "bar", "node" => "nonode@nohost"},
"labels" => %{"app" => "myapp", "foo" => "bar"},
"type" => "custom.googleapis.com/elixir/foo/min_val"
},
"metricKind" => "GAUGE",
@@ -457,7 +457,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
},
%{
"metric" => %{
"labels" => %{"app" => "myapp", "foo" => "bar", "node" => "nonode@nohost"},
"labels" => %{"app" => "myapp", "foo" => "bar"},
"type" => "custom.googleapis.com/elixir/foo/max_val"
},
"metricKind" => "GAUGE",
@@ -531,7 +531,7 @@ defmodule Domain.Telemetry.Reporter.GoogleCloudMetricsTest do
%{
"metric" => %{
"type" => "custom.googleapis.com/elixir/foo/last_value",
"labels" => %{"foo" => "bar", "app" => "myapp", "node" => "nonode@nohost"}
"labels" => %{"foo" => "bar", "app" => "myapp"}
},
"resource" => %{"type" => "test"},
"unit" => "request",