merge upstream

.github/dependabot.yml

@@ -5,8 +5,6 @@ updates:
   schedule:
     interval: daily
     time: "13:00"
-  open-pull-requests-limit: 10
   ignore:
-  - dependency-name: credo
-    versions:
-    - "> 1.4.1, < 2"
+    - dependency-name: "*"
+      update-types: ["version-update:semver-patch"]

.github/workflows/ci.yml

@@ -84,7 +84,7 @@ jobs:
       matrix:
         include:
           - pair:
-              elixir: 1.5
+              elixir: 1.7
               otp: 22
           - pair:
               elixir: 1.12

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.5.0
+
+### Changed
+
+- The minimum supported Elixir version is now 1.7
+- Elixometer no longer depends on Lager
+
 ## 1.4.1
 
 ### Added

README.md

@@ -10,7 +10,7 @@ to the default reporter for your environment.
 Add the following to your dependencies in mix.exs:
 
 ```elixir
-{:elixometer, "~> 1.4"}
+{:elixometer, "~> 1.5"}
 ```
 
 Or to track the master development branch:

config/dev.exs

@@ -2,21 +2,11 @@ use Mix.Config
 
 config :exometer_core, report: [reporters: []]
 
-config :lager,
-  log_root: 'log',
-  handlers: [
-    lager_console_backend: [level: :info],
-    lager_file_backend: [
-      file: 'error.log',
-      level: :error,
-      formatter: :lager_default_formatter,
-      formatter_config: [:date, " ", :time, " [", :severity, "]", :pid, " ", :message, "\n"]
-    ],
-    lager_file_backend: [file: 'console.log', level: :debug]
-  ]
-
 config :elixometer,
   reporter: :exometer_report_tty,
   update_frequency: 1000,
   env: Mix.env(),
   metric_prefix: "elixometer"
+
+config :logger,
+  level: :info

config/test.exs

@@ -10,5 +10,5 @@ config(
   metric_prefix: "elixometer"
 )
 
-# quiet down logging in test
-config(:lager, handlers: [lager_console_backend: [level: :critical]])
+config :logger,
+  level: :error

mix.exs

@@ -11,8 +11,8 @@ defmodule Elixometer.Mixfile do
   def project do
     [
       app: :elixometer,
-      version: "1.4.1",
-      elixir: ">= 1.5.0",
+      version: "1.5.0",
+      elixir: ">= 1.7.0",
       description: @description,
       source_url: @project_url,
       homepage_url: @project_url,
@@ -34,6 +34,7 @@ defmodule Elixometer.Mixfile do
       name: "Elixometer",
       docs: [
         main: "Elixometer",
+        source_ref: "master",
         source_url: @project_url
       ]
     ]
@@ -42,8 +43,7 @@ defmodule Elixometer.Mixfile do
   def application do
     [
       mod: {Elixometer.App, []},
-      applications: [:lager, :exometer_core, :pobox],
-      erl_opts: [parse_transform: "lager_transform"],
+      extra_applications: [:logger],
       env: default_config(Mix.env())
     ]
   end
@@ -58,9 +58,6 @@ defmodule Elixometer.Mixfile do
 
   defp deps do
     [
-      # lager 3.2.1 is needed for erl19 because of
-      # https://github.com/basho/lager/pull/321
-      {:lager, ">= 3.2.1"},
       {:exometer_core, "~> 1.6"},
       {:dialyxir, "~> 1.1.0", only: :dev, runtime: false},
       {:ex_doc, "~> 0.25", only: :dev},

mix.lock

@@ -1,25 +1,23 @@
 %{
   "bear": {:hex, :bear, "1.0.0", "430419c1126b477686cde843e88ba0f2c7dc5cdf0881c677500074f704339a99", [:rebar3], [], "hexpm", "157b67901adf84ff0da6eae035ca1292a0ac18aa55148154d8c582b2c68959db"},
-  "certifi": {:hex, :certifi, "2.7.0", "4622724589cdd8d073277e5d7c923387760e5545fa79359f6ceb047cf46d2611", [:rebar3], [], "hexpm", "2c413bdde806405c9678c93fdc15f78fc572001be1302494c226bef25359a47d"},
+  "certifi": {:hex, :certifi, "2.8.0", "d4fb0a6bb20b7c9c3643e22507e42f356ac090a1dcea9ab99e27e0376d695eba", [:rebar3], [], "hexpm", "6ac7efc1c6f8600b08d625292d4bbf584e14847ce1b6b5c44d983d273e1097ea"},
   "dialyxir": {:hex, :dialyxir, "1.1.0", "c5aab0d6e71e5522e77beff7ba9e08f8e02bad90dfbeffae60eaf0cb47e29488", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "07ea8e49c45f15264ebe6d5b93799d4dd56a44036cf42d0ad9c960bc266c0b9a"},
-  "earmark_parser": {:hex, :earmark_parser, "1.4.13", "0c98163e7d04a15feb62000e1a891489feb29f3d10cb57d4f845c405852bbef8", [:mix], [], "hexpm", "d602c26af3a0af43d2f2645613f65841657ad6efc9f0e361c3b6c06b578214ba"},
+  "earmark_parser": {:hex, :earmark_parser, "1.4.20", "89970db71b11b6b89759ce16807e857df154f8df3e807b2920a8c39834a9e5cf", [:mix], [], "hexpm", "1eb0d2dabeeeff200e0d17dc3048a6045aab271f73ebb82e416464832eb57bdd"},
   "erlex": {:hex, :erlex, "0.2.6", "c7987d15e899c7a2f34f5420d2a2ea0d659682c06ac607572df55a43753aa12e", [:mix], [], "hexpm", "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"},
-  "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"},
-  "exometer_core": {:hex, :exometer_core, "1.6.0", "7e1d4d8d05fe4e33b96eba366b4a7c85f0e023573caf297f13e83cf17a5e3941", [:rebar3], [{:folsom, "1.0.0", [hex: :folsom, repo: "hexpm", optional: false]}, {:hut, "1.3.0", [hex: :hut, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:setup, "2.1.0", [hex: :setup, repo: "hexpm", optional: false]}], "hexpm", "b539e97dbb3137e0fe0b782c561cacb64c9704cb3f19451442b6fdf46db95b38"},
+  "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"},
+  "exometer_core": {:hex, :exometer_core, "1.6.1", "742ed00e1f10f8beff61a0f43e105c78c2f982e10f1c4e740d59df89924c65ea", [:rebar3], [{:folsom, "1.0.0", [hex: :folsom, repo: "hexpm", optional: false]}, {:hut, "1.3.0", [hex: :hut, repo: "hexpm", optional: false]}, {:parse_trans, "3.4.1", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:setup, "2.1.0", [hex: :setup, repo: "hexpm", optional: false]}], "hexpm", "ec1af0a961f29b3854f61b594c79454d26ac7b1f6cb89bbf0688bff65f6a6d6b"},
   "folsom": {:hex, :folsom, "1.0.0", "50ecc998d2149939f1d5e0aa3e32788f8ed16a58e390d81b5c0be4cc4ef25589", [:rebar3], [{:bear, "1.0.0", [hex: :bear, repo: "hexpm", optional: false]}], "hexpm", "dd6ab97278e94f9e4cfc43e188224a7b8c7eaec0dd2e935007005177f3eebb0e"},
-  "goldrush": {:hex, :goldrush, "0.1.9", "f06e5d5f1277da5c413e84d5a2924174182fb108dabb39d5ec548b27424cd106", [:rebar3], [], "hexpm", "99cb4128cffcb3227581e5d4d803d5413fa643f4eb96523f77d9e6937d994ceb"},
   "hackney": {:hex, :hackney, "1.17.1", "08463f93d2cc1a03817bf28d8dae6021543f773bd436c9377047224856c4422c", [:rebar3], [{:certifi, "~>2.5", [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", [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", "d2cba9e3c8103ad0320623e9f1c33e8d378a15eaabe2ee8ae441898f3d35a18c"},
   "hut": {:hex, :hut, "1.3.0", "71f2f054e657c03f959cf1acc43f436ea87580696528ca2a55c8afb1b06c85e7", [:"erlang.mk", :rebar, :rebar3], [], "hexpm", "7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563"},
   "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.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
-  "lager": {:hex, :lager, "3.9.2", "4cab289120eb24964e3886bd22323cb5fefe4510c076992a23ad18cf85413d8c", [:rebar3], [{:goldrush, "0.1.9", [hex: :goldrush, repo: "hexpm", optional: false]}], "hexpm", "7f904d9e87a8cb7e66156ed31768d1c8e26eba1d54f4bc85b1aa4ac1f6340c28"},
-  "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": {:hex, :makeup, "1.1.0", "6b67c8bc2882a6b6a445859952a602afc1a41c2e08379ca057c0f525366fc3ca", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "0a45ed501f4a8897f580eabf99a2e5234ea3e75a4373c8a52824f6e873be57a6"},
+  "makeup_elixir": {:hex, :makeup_elixir, "0.15.2", "dc72dfe17eb240552857465cc00cce390960d9a0c055c4ccd38b70629227e97c", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "fd23ae48d09b32eff49d4ced2b43c9f086d402ee4fd4fcb2d7fad97fa8823e75"},
   "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"},
+  "nimble_parsec": {:hex, :nimble_parsec, "1.2.2", "b99ca56bbce410e9d5ee4f9155a212e942e224e259c7ebbf8f2c86ac21d4fa3c", [:mix], [], "hexpm", "98d51bd64d5f6a2a9c6bb7586ee8129e27dfaab1140b5a4753f24dac0ba27d2f"},
   "parse_trans": {:hex, :parse_trans, "3.4.1", "6e6aa8167cb44cc8f39441d05193be6e6f4e7c2946cb2759f015f8c56b76e5ff", [:rebar3], [], "hexpm", "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"},
   "pobox": {:hex, :pobox, "1.2.0", "3127cb48f13d18efec7a9ea2622077f4f9c5f067cc1182af1977dacd7a74fdb8", [:rebar3], [], "hexpm", "25d6fcdbe4fedbbf4bcaa459fadee006e75bb3281d4e6c9b2dc0ee93c51920c4"},
   "setup": {:hex, :setup, "2.1.0", "05f69185a5eb71474c9bc6ba892565651ec7507791f85632b7b914dbfe130510", [:rebar3], [], "hexpm", "efd072578f0cf85bea96caaffc7adb0992398272522660a136e10567377071c5"},