-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
203 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
87 changes: 87 additions & 0 deletions
87
lib/new_relic/harvest/telemetry_sdk/dimensional_metrics/harvester.ex
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
defmodule NewRelic.Harvest.TelemetrySdk.DimensionalMetrics.Harvester do | ||
use GenServer | ||
|
||
@moduledoc false | ||
|
||
alias NewRelic.Harvest | ||
alias NewRelic.Harvest.TelemetrySdk | ||
|
||
@interval_ms 5_000 | ||
|
||
@valid_types [:count, :gauge, :summary] | ||
|
||
def start_link(_) do | ||
GenServer.start_link(__MODULE__, []) | ||
end | ||
|
||
def init(_) do | ||
{:ok, | ||
%{ | ||
start_time_ms: System.system_time(:millisecond), | ||
metrics: [] | ||
}} | ||
end | ||
|
||
# API | ||
|
||
@spec report_dimensional_metric(:count | :gauge | :summary, atom() | binary(), any, map()) :: | ||
:ok | ||
def report_dimensional_metric(type, name, value, attributes) when type in @valid_types do | ||
TelemetrySdk.DimensionalMetrics.HarvestCycle | ||
|> Harvest.HarvestCycle.current_harvester() | ||
|> GenServer.cast({:report, %{type: type, name: name, value: value, attributes: attributes}}) | ||
end | ||
|
||
def gather_harvest, | ||
do: | ||
TelemetrySdk.DimensionalMetrics.HarvestCycle | ||
|> Harvest.HarvestCycle.current_harvester() | ||
|> GenServer.call(:gather_harvest) | ||
|
||
# do not accept more report messages when harvest has already been reported | ||
def handle_cast(_late_msg, :completed), do: {:noreply, :completed} | ||
|
||
def handle_cast({:report, metric}, state) do | ||
# TODO: merge metrics with the same type/name/attributes? | ||
{:noreply, %{state | metrics: [metric | state.metrics]}} | ||
end | ||
|
||
# do not resend metrics when harvest has already been reported | ||
def handle_call(_late_msg, _from, :completed), do: {:reply, :completed, :completed} | ||
|
||
def handle_call(:send_harvest, _from, state) do | ||
send_harvest(state) | ||
{:reply, :ok, :completed} | ||
end | ||
|
||
def handle_call(:gather_harvest, _from, state) do | ||
{:reply, build_dimensional_metric_data(state.metrics, state), state} | ||
end | ||
|
||
# Helpers | ||
|
||
defp send_harvest(state) do | ||
TelemetrySdk.API.log(build_dimensional_metric_data(state.metrics, state)) | ||
log_harvest(length(state.metrics)) | ||
end | ||
|
||
defp log_harvest(harvest_size) do | ||
NewRelic.log( | ||
:debug, | ||
"Completed TelemetrySdk.DimensionalMetrics harvest - size: #{harvest_size}" | ||
) | ||
end | ||
|
||
defp build_dimensional_metric_data(metrics, state) do | ||
[ | ||
%{ | ||
metrics: metrics, | ||
common: common(state) | ||
} | ||
] | ||
end | ||
|
||
defp common(%{start_time_ms: start_time_ms}) do | ||
%{"timestamp" => start_time_ms, "interval.ms" => @interval_ms} | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
defmodule DimensionalMetricTest do | ||
use ExUnit.Case | ||
|
||
test "reports dimensional metrics" do | ||
TestHelper.restart_harvest_cycle( | ||
NewRelic.Harvest.TelemetrySdk.DimensionalMetrics.HarvestCycle | ||
) | ||
|
||
NewRelic.report_dimensional_metric(:count, "memory.foo_baz", 100, %{cpu: 1000}) | ||
NewRelic.report_dimensional_metric(:summary, "memory.foo_bar", 50, %{cpu: 2000}) | ||
|
||
[%{common: common, metrics: metrics}] = | ||
TestHelper.gather_harvest(NewRelic.Harvest.TelemetrySdk.DimensionalMetrics.Harvester) | ||
|
||
assert common["interval.ms"] > 0 | ||
assert common["timestamp"] > 0 | ||
|
||
assert length(metrics) == 2 | ||
[metric1, metric2] = metrics | ||
assert metric1.name == "memory.foo_bar" | ||
assert metric1.type == :summary | ||
|
||
assert metric2.name == "memory.foo_baz" | ||
assert metric2.type == :count | ||
|
||
TestHelper.pause_harvest_cycle(NewRelic.Harvest.TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,59 @@ | ||
defmodule TelemetrySdk.DimensionalMetricsHarvesterTest do | ||
use ExUnit.Case | ||
|
||
alias NewRelic.Harvest | ||
alias NewRelic.Harvest.TelemetrySdk | ||
|
||
test "Harvester collects dimensional metrics" do | ||
{:ok, harvester} = | ||
DynamicSupervisor.start_child( | ||
TelemetrySdk.DimensionalMetrics.HarvesterSupervisor, | ||
TelemetrySdk.DimensionalMetrics.Harvester | ||
) | ||
|
||
metric1 = %{} | ||
GenServer.cast(harvester, {:report, metric1}) | ||
|
||
metrics = GenServer.call(harvester, :gather_harvest) | ||
assert length(metrics) > 0 | ||
end | ||
|
||
test "harvest cycle" do | ||
Application.put_env(:new_relic_agent, :dimensional_metrics_harvest_cycle, 300) | ||
TestHelper.restart_harvest_cycle(TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
|
||
first = Harvest.HarvestCycle.current_harvester(TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
Process.monitor(first) | ||
|
||
# Wait until harvest swap | ||
assert_receive {:DOWN, _ref, _, ^first, :shutdown}, 1000 | ||
|
||
second = Harvest.HarvestCycle.current_harvester(TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
Process.monitor(second) | ||
|
||
refute first == second | ||
assert Process.alive?(second) | ||
|
||
TestHelper.pause_harvest_cycle(TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
Application.delete_env(:new_relic_agent, :dimensional_metrics_harvest_cycle) | ||
|
||
# Ensure the last harvester has shut down | ||
assert_receive {:DOWN, _ref, _, ^second, :shutdown}, 1000 | ||
end | ||
|
||
test "Ignore late reports" do | ||
TestHelper.restart_harvest_cycle(TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
|
||
harvester = | ||
TelemetrySdk.DimensionalMetrics.HarvestCycle | ||
|> Harvest.HarvestCycle.current_harvester() | ||
|
||
assert :ok == GenServer.call(harvester, :send_harvest) | ||
|
||
GenServer.cast(harvester, {:report, :late_msg}) | ||
|
||
assert :completed == GenServer.call(harvester, :send_harvest) | ||
|
||
TestHelper.pause_harvest_cycle(TelemetrySdk.DimensionalMetrics.HarvestCycle) | ||
end | ||
end |