From bff91eea4445136177bc6974cef379647d78674e Mon Sep 17 00:00:00 2001 From: Tatsuya Ono Date: Wed, 18 Aug 2021 22:01:23 +0100 Subject: [PATCH] sort out amqp_client 3.9.1 implications and prepare release candidate --- README.md | 29 ++--------------------------- lib/amqp/application.ex | 39 --------------------------------------- mix.exs | 6 +++--- mix.lock | 21 +++++++++++---------- 4 files changed, 16 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index 68233a5..9730b0d 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ To upgrade from the old version, please read our upgrade guides: * [0.x to 1.x](https://github.com/pma/amqp/wiki/Upgrade-from-0.X-to-1.0) * [1.x to 2.x](https://github.com/pma/amqp/wiki/2.0-Release-Notes#breaking-changes-and-upgrade-guide) +* [2.x to 3.x](https://github.com/pma/amqp/wiki/3.0-Release-Notes#breaking-changes-and-upgrade-guide) ## Usage @@ -25,7 +26,7 @@ Add AMQP as a dependency in your `mix.exs` file. ```elixir def deps do [ - {:amqp, "~> 2.1"} + {:amqp, "~> 3.0.0-rc.1"} ] end ``` @@ -178,21 +179,6 @@ Error converting Hello, World! to integer ### Configuration -#### Erlang library's progress report - -This library uses an official Erlang RabbitMQ client library internally and we -found its logging is too verbose. - -These are called progress reports by the Erlang library and you would see a lot -of entries with info log level if you use 1.x version. - -AMQP disables that by default from version 2.0. If you want to see more -detailed logs, you can enable it by adding the following line on your config. - -```elixir -config :amqp, enable_progress_report: true -``` - #### Connections and channels You can define a connection and channel in your config and AMQP will @@ -289,17 +275,6 @@ You can set `heartbeat` option when you open a connection. For more details, read [this article](http://www.rabbitmq.com/heartbeats.html#tcp-proxies) -#### Log related to amqp supervisors are too verbose - -Try the following configuration. - -```elixir -config :logger, handle_otp_reports: false -``` - -#### Compile error on ranch_proxy_protocol with OTP 21 - -Update amqp to [1.1.0](https://github.com/pma/amqp/releases/tag/v1.1.0) or a greater version. #### Does the library support AMQP 1.0? diff --git a/lib/amqp/application.ex b/lib/amqp/application.ex index 8138c95..3b264f2 100644 --- a/lib/amqp/application.ex +++ b/lib/amqp/application.ex @@ -8,7 +8,6 @@ defmodule AMQP.Application do @impl true def start(_type, _args) do - load_config() children = load_connections() ++ load_channels() opts = [ @@ -21,12 +20,6 @@ defmodule AMQP.Application do Supervisor.start_link(children, opts) end - defp load_config do - unless Application.get_env(:amqp, :enable_progress_report, false) do - disable_progress_report() - end - end - defp load_connections do conn = Application.get_env(:amqp, :connection) conns = Application.get_env(:amqp, :connections, []) @@ -51,38 +44,6 @@ defmodule AMQP.Application do end) end - @doc """ - Disables the progress report logging from Erlang library. - - The log outputs are very verbose and can contain credentials. - - This AMQP library recommends to disable unless you want the information. - """ - @spec disable_progress_report :: :ok | {:error, any} - def disable_progress_report do - :logger.add_primary_filter( - :amqp_ignore_rabbitmq_progress_reports, - {&:logger_filters.domain/2, {:stop, :equal, [:progress]}} - ) - rescue - e -> - Logger.warn("Failed to disable progress report by Erlang library: detail: #{inspect(e)}") - {:error, e} - end - - @doc """ - Enables the progress report logging from Erlang library. - """ - @spec enable_progress_report :: :ok | {:error, any} - def enable_progress_report do - case :logger.remove_primary_filter(:amqp_ignore_rabbitmq_progress_reports) do - :ok -> :ok - # filter already removed - {:error, {:not_found, _}} -> :ok - error -> error - end - end - @doc """ Provides an easy way to access an AMQP connection. diff --git a/mix.exs b/mix.exs index a26e45c..6d92cec 100644 --- a/mix.exs +++ b/mix.exs @@ -2,13 +2,13 @@ defmodule AMQP.Mixfile do use Mix.Project @source_url "https://github.com/pma/amqp" - @version "2.1.1" + @version "3.0.0-rc.1" def project do [ app: :amqp, version: @version, - elixir: "~> 1.7", + elixir: "~> 1.9", package: package(), deps: deps(), dialyzer: dialyzer(), @@ -43,7 +43,7 @@ defmodule AMQP.Mixfile do [ description: description(), files: ["lib", "mix.exs", "README.md", "LICENSE"], - maintainers: ["Paulo Almeida", "Eduardo Gurgel"], + maintainers: ["Paulo Almeida", "Eduardo Gurgel", "Tatsuya Ono"], licenses: ["MIT"], links: %{ "Changelog" => "https://github.com/pma/amqp/releases", diff --git a/mix.lock b/mix.lock index 9d2f96a..8b57b75 100644 --- a/mix.lock +++ b/mix.lock @@ -1,25 +1,26 @@ %{ - "amqp_client": {:hex, :amqp_client, "3.9.1", "cd798bac0bdaf578cdc18e0de257927b4fcdfaaa7a976d73f62064a0613d4701", [:make, :rebar3], [{:rabbit_common, "3.9.1", [hex: :rabbit_common, repo: "hexpm", optional: false]}], "hexpm", "09736c85991720fb18c527f6a31a474cca4de1335344cdcaa8720008e1d80efb"}, - "certifi": {:hex, :certifi, "2.5.2", "b7cfeae9d2ed395695dd8201c57a2d019c0c43ecaf8b8bcb9320b40d6662f340", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "3b3b5f36493004ac3455966991eaf6e768ce9884693d9968055aeeeb1e575040"}, + "amqp_client": {:hex, :amqp_client, "3.9.4", "b3a1004585fd8dc7df18772ff9313cf5107321146d52e3916cf995e62339d998", [:make, :rebar3], [{:rabbit_common, "3.9.4", [hex: :rabbit_common, repo: "hexpm", optional: false]}], "hexpm", "90e12d19589730cb6a499eb6f4095ae05b6493c4626fd173183d9223bdeff206"}, + "certifi": {:hex, :certifi, "2.6.1", "dbab8e5e155a0763eea978c913ca280a6b544bfa115633fa20249c3d396d9493", [:rebar3], [], "hexpm", "524c97b4991b3849dd5c17a631223896272c6b0af446778ba4675a1dff53bb7e"}, "credentials_obfuscation": {:hex, :credentials_obfuscation, "2.4.0", "9fb57683b84899ca3546b384e59ab5d3054a9f334eba50d74c82cd0ae82dd6ca", [:rebar3], [], "hexpm", "d28a89830e30698b075de9a4dbe683a20685c6bed1e3b7df744a0c06e6ff200a"}, "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], [], "hexpm", "6c32a70ed5d452c6650916555b1f96c79af5fc4bf286997f8b15f213de786f73"}, - "earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"}, - "ex_doc": {:hex, :ex_doc, "0.23.0", "a069bc9b0bf8efe323ecde8c0d62afc13d308b1fa3d228b65bca5cf8703a529d", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm", "f5e2c4702468b2fd11b10d39416ddadd2fcdd173ba2a0285ebd92c39827a5a16"}, - "excoveralls": {:hex, :excoveralls, "0.13.3", "edc5f69218f84c2bf61b3609a22ddf1cec0fbf7d1ba79e59f4c16d42ea4347ed", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "cc26f48d2f68666380b83d8aafda0fffc65dafcc8d8650358e0b61f6a99b1154"}, - "hackney": {:hex, :hackney, "1.16.0", "5096ac8e823e3a441477b2d187e30dd3fff1a82991a806b2003845ce72ce2d84", [:rebar3], [{:certifi, "2.5.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.1", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "3.3.0", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.6", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "3bf0bebbd5d3092a3543b783bf065165fa5d3ad4b899b836810e513064134e18"}, - "idna": {:hex, :idna, "6.0.1", "1d038fb2e7668ce41fbf681d2c45902e52b3cb9e9c77b55334353b222c2ee50c", [:rebar3], [{:unicode_util_compat, "0.5.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "a02c8a1c4fd601215bb0b0324c8a6986749f807ce35f25449ec9e69758708122"}, + "earmark_parser": {:hex, :earmark_parser, "1.4.15", "b29e8e729f4aa4a00436580dcc2c9c5c51890613457c193cc8525c388ccb2f06", [:mix], [], "hexpm", "044523d6438ea19c1b8ec877ec221b008661d3c27e3b848f4c879f500421ca5c"}, + "ex_doc": {:hex, :ex_doc, "0.25.1", "4b736fa38dc76488a937e5ef2944f5474f3eff921de771b25371345a8dc810bc", [:mix], [{:earmark_parser, "~> 1.4.0", [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", "3200b0a69ddb2028365281fbef3753ea9e728683863d8cdaa96580925c891f67"}, + "excoveralls": {:hex, :excoveralls, "0.14.2", "f9f5fd0004d7bbeaa28ea9606251bb643c313c3d60710bad1f5809c845b748f0", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "ca6fd358621cb4d29311b29d4732c4d47dac70e622850979bc54ed9a3e50f3e1"}, + "hackney": {:hex, :hackney, "1.17.4", "99da4674592504d3fb0cfef0db84c3ba02b4508bae2dff8c0108baa0d6e0977c", [:rebar3], [{:certifi, "~>2.6.1", [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", "de16ff4996556c8548d512f4dbe22dd58a587bf3332e7fd362430a7ef3986b16"}, + "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"}, "inch_ex": {:hex, :inch_ex, "0.5.6", "418357418a553baa6d04eccd1b44171936817db61f4c0840112b420b8e378e67", [:mix], [{:poison, "~> 1.5 or ~> 2.0 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "7123ca0450686a61416a06cd38e26af18fd0f8c1cff5214770a957c6e0724338"}, "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"}, "jsx": {:hex, :jsx, "3.1.0", "d12516baa0bb23a59bb35dccaf02a1bd08243fcbb9efe24f2d9d056ccff71268", [:rebar3], [], "hexpm", "0c5cc8fdc11b53cc25cf65ac6705ad39e54ecc56d1c22e4adb8f5a53fb9427f3"}, "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"}, "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"}, + "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"}, "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"}, "nimble_parsec": {:hex, :nimble_parsec, "1.1.0", "3a6fca1550363552e54c216debb6a9e95bd8d32348938e13de5eda962c0d7f89", [:mix], [], "hexpm", "08eb32d66b706e913ff748f11694b17981c0b04a33ef470e33e11b3d3ac8f54b"}, - "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm", "17ef63abde837ad30680ea7f857dd9e7ced9476cdd7b0394432af4bfc241b960"}, + "parse_trans": {:hex, :parse_trans, "3.3.1", "16328ab840cc09919bd10dab29e431da3af9e9e7e7e6f0089dd5a2d2820011d8", [:rebar3], [], "hexpm", "07cd9577885f56362d414e8c4c4e6bdf10d43a8767abb92d24cbe8b24c54888b"}, "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm", "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"}, - "rabbit_common": {:hex, :rabbit_common, "3.9.1", "78b899f8c83a4f543cdd978f6b181fe335397dd166ad82e1e65e0ce0c0556db7", [:make, :rebar3], [{:credentials_obfuscation, "2.4.0", [hex: :credentials_obfuscation, repo: "hexpm", optional: false]}, {:jsx, "3.1.0", [hex: :jsx, repo: "hexpm", optional: false]}, {:recon, "2.5.1", [hex: :recon, repo: "hexpm", optional: false]}], "hexpm", "6a03cc1bf03b16134e529e434ee2b17831f6be10176ed739b1ac55ca9f26fb2e"}, + "rabbit_common": {:hex, :rabbit_common, "3.9.4", "0eb841e2b5e8f2322f42123137e3f3ba9a01334a0ca8db11d4b0dea3326221c1", [:make, :rebar3], [{:credentials_obfuscation, "2.4.0", [hex: :credentials_obfuscation, repo: "hexpm", optional: false]}, {:jsx, "3.1.0", [hex: :jsx, repo: "hexpm", optional: false]}, {:recon, "2.5.1", [hex: :recon, repo: "hexpm", optional: false]}], "hexpm", "1bccab230150ab19324b51a4dd63f32b97544e28d2a3227538730b0f450716f9"}, "recon": {:hex, :recon, "2.5.1", "430ffa60685ac1efdfb1fe4c97b8767c92d0d92e6e7c3e8621559ba77598678a", [:mix, :rebar3], [], "hexpm", "5721c6b6d50122d8f68cccac712caa1231f97894bab779eff5ff0f886cb44648"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.6", "cf344f5692c82d2cd7554f5ec8fd961548d4fd09e7d22f5b62482e5aeaebd4b0", [:make, :mix, :rebar3], [], "hexpm", "bdb0d2471f453c88ff3908e7686f86f9be327d065cc1ec16fa4540197ea04680"}, - "unicode_util_compat": {:hex, :unicode_util_compat, "0.5.0", "8516502659002cec19e244ebd90d312183064be95025a319a6c7e89f4bccd65b", [:rebar3], [], "hexpm", "d48d002e15f5cc105a696cf2f1bbb3fc72b4b770a184d8420c8db20da2674b38"}, + "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"}, }