From 17054c16042aa04859b3ed0a13332bfe86d6fd7b Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Wed, 14 Sep 2022 19:33:17 -0400 Subject: [PATCH 1/6] Add finch_pools grafana option --- lib/prom_ex.ex | 12 ++++++++++-- lib/prom_ex/config.ex | 3 +++ test/prom_ex_test.exs | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/lib/prom_ex.ex b/lib/prom_ex.ex index ed7521cb..d87a070e 100644 --- a/lib/prom_ex.ex +++ b/lib/prom_ex.ex @@ -413,8 +413,16 @@ defmodule PromEx do acc end - def grafana_client_child_spec(acc, _, _, process_name) do - spec = {PromEx.GrafanaClient, name: process_name} + def grafana_client_child_spec(acc, grafana_config, _, process_name) do + opts = + if pools = Keyword.get(grafana_config, :finch_pools, nil) do + [pools: pools] + else + [] + end + |> Keyword.put(:name, process_name) + + spec = {PromEx.GrafanaClient, opts} [spec | acc] end diff --git a/lib/prom_ex/config.ex b/lib/prom_ex/config.ex index 9207b6e7..323f278a 100644 --- a/lib/prom_ex/config.ex +++ b/lib/prom_ex/config.ex @@ -129,6 +129,9 @@ defmodule PromEx.Config do - Git SHA of the last commit (if the GIT_SHA environment variable is present) - Git author of the last commit (if the GIT_AUTHOR environment variable is present) + * `:finch_pools` - These options will be passed to Finch.start_link/1 as the :pools key, which can be + used to configure protocol, pool size, HTTP host headers, proxy server, etc. + * `:grafana_agent` - This key contains the configuration information for running GrafanaAgent via a port in order to push metrics to a Prometheus instance via `remote_write` functionality: diff --git a/test/prom_ex_test.exs b/test/prom_ex_test.exs index 584bd927..b37274a1 100644 --- a/test/prom_ex_test.exs +++ b/test/prom_ex_test.exs @@ -235,4 +235,22 @@ defmodule PromExTest do |> Process.exit(:normal) end end + + describe "grafana_client_child_spec" do + test ":disabled" do + assert PromEx.grafana_client_child_spec([], :disabled, PromEx, ProcessName) == [] + end + + test "default" do + assert PromEx.grafana_client_child_spec([], [], PromEx, ProcessName) == [ + {PromEx.GrafanaClient, name: ProcessName} + ] + end + + test "finch_pools" do + assert PromEx.grafana_client_child_spec([], [finch_pools: [size: 1]], PromEx, ProcessName) == [ + {PromEx.GrafanaClient, name: ProcessName, pools: [size: 1]} + ] + end + end end From a49b8d4bf04e766b5e28e75e17a016da1b8d4260 Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Wed, 14 Sep 2022 19:57:07 -0400 Subject: [PATCH 2/6] Grafana config is a map --- lib/prom_ex.ex | 2 +- test/prom_ex_test.exs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/prom_ex.ex b/lib/prom_ex.ex index d87a070e..06ebc30e 100644 --- a/lib/prom_ex.ex +++ b/lib/prom_ex.ex @@ -415,7 +415,7 @@ defmodule PromEx do def grafana_client_child_spec(acc, grafana_config, _, process_name) do opts = - if pools = Keyword.get(grafana_config, :finch_pools, nil) do + if pools = Map.get(grafana_config, :finch_pools, nil) do [pools: pools] else [] diff --git a/test/prom_ex_test.exs b/test/prom_ex_test.exs index b37274a1..402562e9 100644 --- a/test/prom_ex_test.exs +++ b/test/prom_ex_test.exs @@ -242,13 +242,13 @@ defmodule PromExTest do end test "default" do - assert PromEx.grafana_client_child_spec([], [], PromEx, ProcessName) == [ + assert PromEx.grafana_client_child_spec([], %{}, PromEx, ProcessName) == [ {PromEx.GrafanaClient, name: ProcessName} ] end test "finch_pools" do - assert PromEx.grafana_client_child_spec([], [finch_pools: [size: 1]], PromEx, ProcessName) == [ + assert PromEx.grafana_client_child_spec([], %{finch_pools: [size: 1]}, PromEx, ProcessName) == [ {PromEx.GrafanaClient, name: ProcessName, pools: [size: 1]} ] end From 6da6f235b1d3070f5ce84345e03d90d1fd92b11f Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Wed, 14 Sep 2022 20:07:40 -0400 Subject: [PATCH 3/6] finch_pools needs to be included in grafana config --- lib/prom_ex.ex | 2 +- lib/prom_ex/config.ex | 3 ++- test/prom_ex/config_test.exs | 15 ++++++++++++++- test/prom_ex_test.exs | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/prom_ex.ex b/lib/prom_ex.ex index 06ebc30e..bca4973b 100644 --- a/lib/prom_ex.ex +++ b/lib/prom_ex.ex @@ -415,7 +415,7 @@ defmodule PromEx do def grafana_client_child_spec(acc, grafana_config, _, process_name) do opts = - if pools = Map.get(grafana_config, :finch_pools, nil) do + if pools = Map.fetch!(grafana_config, :finch_pools) do [pools: pools] else [] diff --git a/lib/prom_ex/config.ex b/lib/prom_ex/config.ex index 323f278a..8a2f5c47 100644 --- a/lib/prom_ex/config.ex +++ b/lib/prom_ex/config.ex @@ -304,7 +304,8 @@ defmodule PromEx.Config do auth_token: Keyword.get(grafana_opts, :auth_token), upload_dashboards_on_start: Keyword.get(grafana_opts, :upload_dashboards_on_start, true), folder_name: Keyword.get(grafana_opts, :folder_name, :default), - annotate_app_lifecycle: Keyword.get(grafana_opts, :annotate_app_lifecycle, false) + annotate_app_lifecycle: Keyword.get(grafana_opts, :annotate_app_lifecycle, false), + finch_pools: Keyword.get(grafana_opts, :finch_pools, nil) } end diff --git a/test/prom_ex/config_test.exs b/test/prom_ex/config_test.exs index 12659a3c..b6c18382 100644 --- a/test/prom_ex/config_test.exs +++ b/test/prom_ex/config_test.exs @@ -38,13 +38,26 @@ defmodule PromEx.ConfigTest do host: "https://my-grafana-instance.com", password: nil, upload_dashboards_on_start: true, - username: nil + username: nil, + finch_pools: nil }, manual_metrics_start_delay: :no_delay, metrics_server_config: :disabled } = config end + test "should include finch_pools if provided" do + config = + Config.build( + grafana: [ + host: "https://my-grafana-instance.com/", + finch_pools: [size: 1] + ] + ) + + assert config.grafana_config.finch_pools == [size: 1] + end + test "should generate default grafana agent config" do config = Config.build( diff --git a/test/prom_ex_test.exs b/test/prom_ex_test.exs index 402562e9..1453df0b 100644 --- a/test/prom_ex_test.exs +++ b/test/prom_ex_test.exs @@ -242,7 +242,7 @@ defmodule PromExTest do end test "default" do - assert PromEx.grafana_client_child_spec([], %{}, PromEx, ProcessName) == [ + assert PromEx.grafana_client_child_spec([], %{finch_pools: nil}, PromEx, ProcessName) == [ {PromEx.GrafanaClient, name: ProcessName} ] end From e6f0bb4d80380957810aa64b51398d451790dbf9 Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Wed, 14 Sep 2022 17:36:20 -0700 Subject: [PATCH 4/6] Update tests to match expected finch pools structure --- lib/prom_ex/config.ex | 4 ++-- test/prom_ex/config_test.exs | 4 ++-- test/prom_ex_test.exs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/prom_ex/config.ex b/lib/prom_ex/config.ex index 8a2f5c47..c25fc2a3 100644 --- a/lib/prom_ex/config.ex +++ b/lib/prom_ex/config.ex @@ -129,8 +129,8 @@ defmodule PromEx.Config do - Git SHA of the last commit (if the GIT_SHA environment variable is present) - Git author of the last commit (if the GIT_AUTHOR environment variable is present) - * `:finch_pools` - These options will be passed to Finch.start_link/1 as the :pools key, which can be - used to configure protocol, pool size, HTTP host headers, proxy server, etc. + * `:finch_pools` - (optional) A map that will be passed to Finch.start_link/1 as the :pools key, + which can be used to configure protocol, pool size, HTTP host headers, proxy server, etc. * `:grafana_agent` - This key contains the configuration information for running GrafanaAgent via a port in order to push metrics to a Prometheus instance via `remote_write` functionality: diff --git a/test/prom_ex/config_test.exs b/test/prom_ex/config_test.exs index b6c18382..d54e8a68 100644 --- a/test/prom_ex/config_test.exs +++ b/test/prom_ex/config_test.exs @@ -51,11 +51,11 @@ defmodule PromEx.ConfigTest do Config.build( grafana: [ host: "https://my-grafana-instance.com/", - finch_pools: [size: 1] + finch_pools: %{default: [size: 1]} ] ) - assert config.grafana_config.finch_pools == [size: 1] + assert config.grafana_config.finch_pools == %{default: [size: 1]} end test "should generate default grafana agent config" do diff --git a/test/prom_ex_test.exs b/test/prom_ex_test.exs index 1453df0b..ee818265 100644 --- a/test/prom_ex_test.exs +++ b/test/prom_ex_test.exs @@ -248,8 +248,8 @@ defmodule PromExTest do end test "finch_pools" do - assert PromEx.grafana_client_child_spec([], %{finch_pools: [size: 1]}, PromEx, ProcessName) == [ - {PromEx.GrafanaClient, name: ProcessName, pools: [size: 1]} + assert PromEx.grafana_client_child_spec([], %{finch_pools: %{default: [size: 1]}}, PromEx, ProcessName) == [ + {PromEx.GrafanaClient, name: ProcessName, pools: %{default: [size: 1]}} ] end end From 93733d3c1dfcea4e733ed6af004cfad2622be151 Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Thu, 15 Sep 2022 11:51:24 -0700 Subject: [PATCH 5/6] Bump finch version --- mix.exs | 2 +- mix.lock | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mix.exs b/mix.exs index d7f933b4..44980b10 100644 --- a/mix.exs +++ b/mix.exs @@ -46,7 +46,7 @@ defmodule PromEx.MixProject do [ # Required dependencies {:jason, "~> 1.2"}, - {:finch, "~> 0.10.2"}, + {:finch, "~> 0.13.0"}, {:telemetry, "~> 1.0"}, {:telemetry_poller, "~> 1.0"}, {:telemetry_metrics, "~> 0.6.1"}, diff --git a/mix.lock b/mix.lock index b4d23911..27d2fa7e 100644 --- a/mix.lock +++ b/mix.lock @@ -4,7 +4,7 @@ "broadway": {:hex, :broadway, "1.0.2", "eee5d2837844531e405c5d5ef6f14a22a80fad619edc50db833aa123643934b1", [:mix], [{:gen_stage, "~> 1.0", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.3.7 or ~> 0.4.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "bdb712516f251475e4c514167ae9b9068214dd3dfd8165821136a9485c9425bc"}, "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"}, "bypass": {:hex, :bypass, "2.1.0", "909782781bf8e20ee86a9cabde36b259d44af8b9f38756173e8f5e2e1fabb9b1", [:mix], [{:plug, "~> 1.7", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.0", [hex: :plug_cowboy, repo: "hexpm", optional: false]}, {:ranch, "~> 1.3", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "d9b5df8fa5b7a6efa08384e9bbecfe4ce61c77d28a4282f79e02f1ef78d96b80"}, - "castore": {:hex, :castore, "0.1.14", "3f6d7c7c1574c402fef29559d3f1a7389ba3524bc6a090a5e9e6abc3af65dcca", [:mix], [], "hexpm", "b34af542eadb727e6c8b37fdf73e18b2e02eb483a4ea0b52fd500bc23f052b7b"}, + "castore": {:hex, :castore, "0.1.18", "deb5b9ab02400561b6f5708f3e7660fc35ca2d51bfc6a940d2f513f89c2975fc", [:mix], [], "hexpm", "61bbaf6452b782ef80b33cdb45701afbcf0a918a45ebe7e73f1130d661e66a06"}, "certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"}, "connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"}, "cowboy": {:hex, :cowboy, "2.9.0", "865dd8b6607e14cf03282e10e934023a1bd8be6f6bacf921a7e2a96d800cd452", [:make, :rebar3], [{:cowlib, "2.11.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "2c729f934b4e1aa149aff882f57c6372c15399a20d54f65c8d67bef583021bde"}, @@ -22,10 +22,11 @@ "ex_doc": {:hex, :ex_doc, "0.28.2", "e031c7d1a9fc40959da7bf89e2dc269ddc5de631f9bd0e326cbddf7d8085a9da", [:mix], [{:earmark_parser, "~> 1.4.19", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "51ee866993ffbd0e41c084a7677c570d0fc50cb85c6b5e76f8d936d9587fa719"}, "excoveralls": {:hex, :excoveralls, "0.14.4", "295498f1ae47bdc6dce59af9a585c381e1aefc63298d48172efaaa90c3d251db", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e3ab02f2df4c1c7a519728a6f0a747e71d7d6e846020aae338173619217931c1"}, "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"}, - "finch": {:hex, :finch, "0.10.2", "9ad27d68270d879f73f26604bb2e573d40f29bf0e907064a9a337f90a16a0312", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "dd8b11b282072cec2ef30852283949c248bd5d2820c88d8acc89402b81db7550"}, + "finch": {:hex, :finch, "0.13.0", "c881e5460ec563bf02d4f4584079e62201db676ed4c0ef3e59189331c4eddf7b", [:mix], [{:castore, "~> 0.1", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "49957dcde10dcdc042a123a507a9c5ec5a803f53646d451db2f7dea696fba6cc"}, "gen_stage": {:hex, :gen_stage, "1.1.2", "b1656cd4ba431ed02c5656fe10cb5423820847113a07218da68eae5d6a260c23", [:mix], [], "hexpm", "9e39af23140f704e2b07a3e29d8f05fd21c2aaf4088ff43cb82be4b9e3148d02"}, "git_hooks": {:hex, :git_hooks, "0.6.4", "a20757c39b2b9ab75d894fc3eaed8fbb1c45e207fd19f12f45fe9b5327910817", [:mix], [{:blankable, "~> 1.0.0", [hex: :blankable, repo: "hexpm", optional: false]}, {:recase, "~> 0.7.0", [hex: :recase, repo: "hexpm", optional: false]}], "hexpm", "a44c76f3d7bdaf885d6f0bf5b3f3e86922b5edf28ee2e6235aa6e561bf172b1c"}, "hackney": {:hex, :hackney, "1.18.0", "c4443d960bb9fba6d01161d01cd81173089686717d9490e5d3606644c48d121f", [:rebar3], [{:certifi, "~>2.8.0", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "9afcda620704d720db8c6a3123e9848d09c87586dc1c10479c42627b905b5c5e"}, + "hpax": {:hex, :hpax, "0.1.2", "09a75600d9d8bbd064cdd741f21fc06fc1f4cf3d0fcc335e5aa19be1a7235c84", [:mix], [], "hexpm", "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"}, "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"}, "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"}, "makeup": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"}, @@ -34,10 +35,10 @@ "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, "mime": {:hex, :mime, "2.0.2", "0b9e1a4c840eafb68d820b0e2158ef5c49385d17fb36855ac6e7e087d4b1dcc5", [:mix], [], "hexpm", "e6a3f76b4c277739e36c2e21a2c640778ba4c3846189d5ab19f97f126df5f9b7"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, - "mint": {:hex, :mint, "1.4.0", "cd7d2451b201fc8e4a8fd86257fb3878d9e3752899eb67b0c5b25b180bde1212", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}], "hexpm", "10a99e144b815cbf8522dccbc8199d15802440fc7a64d67b6853adb6fa170217"}, + "mint": {:hex, :mint, "1.4.2", "50330223429a6e1260b2ca5415f69b0ab086141bc76dc2fbf34d7c389a6675b2", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "ce75a5bbcc59b4d7d8d70f8b2fc284b1751ffb35c7b6a6302b5192f8ab4ddd80"}, "nimble_options": {:hex, :nimble_options, "0.4.0", "c89babbab52221a24b8d1ff9e7d838be70f0d871be823165c94dd3418eea728f", [:mix], [], "hexpm", "e6701c1af326a11eea9634a3b1c62b475339ace9456c1a23ec3bc9a847bca02d"}, "nimble_parsec": {:hex, :nimble_parsec, "1.2.2", "b99ca56bbce410e9d5ee4f9155a212e942e224e259c7ebbf8f2c86ac21d4fa3c", [:mix], [], "hexpm", "98d51bd64d5f6a2a9c6bb7586ee8129e27dfaab1140b5a4753f24dac0ba27d2f"}, - "nimble_pool": {:hex, :nimble_pool, "0.2.4", "1db8e9f8a53d967d595e0b32a17030cdb6c0dc4a451b8ac787bf601d3f7704c3", [:mix], [], "hexpm", "367e8071e137b787764e6a9992ccb57b276dc2282535f767a07d881951ebeac6"}, + "nimble_pool": {:hex, :nimble_pool, "0.2.6", "91f2f4c357da4c4a0a548286c84a3a28004f68f05609b4534526871a22053cde", [:mix], [], "hexpm", "1c715055095d3f2705c4e236c18b618420a35490da94149ff8b580a2144f653f"}, "oban": {:hex, :oban, "2.10.1", "202a90f2aed0130b7d750bdbfea8090c8321bce255bade10fd3699733565add0", [:mix], [{:ecto_sql, "~> 3.6", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "161cdd01194147cd6a3efdb1d6c3d9689309991412f799c1e242c18912e307c3"}, "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"}, "phoenix": {:hex, :phoenix, "1.6.5", "07af307b28a5820b4394f27ac7003df052e065ff651520a58abb16be1eecd519", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "97dc3052ca648499280e0636471f1d0439fc623ccdce27d2d8135651421ee80c"}, From 2e4c64600f3b2f210c0008f2eafbb140320797a8 Mon Sep 17 00:00:00 2001 From: Pat Maddox Date: Thu, 15 Sep 2022 12:30:43 -0700 Subject: [PATCH 6/6] Remove unnecessary test --- test/prom_ex/config_test.exs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/test/prom_ex/config_test.exs b/test/prom_ex/config_test.exs index d54e8a68..53163fdf 100644 --- a/test/prom_ex/config_test.exs +++ b/test/prom_ex/config_test.exs @@ -46,18 +46,6 @@ defmodule PromEx.ConfigTest do } = config end - test "should include finch_pools if provided" do - config = - Config.build( - grafana: [ - host: "https://my-grafana-instance.com/", - finch_pools: %{default: [size: 1]} - ] - ) - - assert config.grafana_config.finch_pools == %{default: [size: 1]} - end - test "should generate default grafana agent config" do config = Config.build(