Bump Elixir to 1.20.1 and OTP 28.5.0.1

.credo.exs

@@ -119,16 +119,15 @@
           {Credo.Check.Refactor.CyclomaticComplexity, false},
           {Credo.Check.Refactor.FilterCount, []},
           {Credo.Check.Refactor.FilterFilter, []},
-          {Credo.Check.Refactor.MatchInCondition, []},
+          {Credo.Check.Refactor.MatchInCondition, [allow_operators: true]},
           {Credo.Check.Refactor.RedundantWithClauseResult, []},
           {Credo.Check.Refactor.RejectReject, []},
           {Credo.Check.Refactor.FunctionArity, []},
           {Credo.Check.Refactor.LongQuoteBlocks, []},
-          {Credo.Check.Refactor.MatchInCondition, []},
           {Credo.Check.Refactor.MapJoin, []},
           {Credo.Check.Refactor.NegatedConditionsInUnless, []},
           {Credo.Check.Refactor.NegatedConditionsWithElse, false},
-          {Credo.Check.Refactor.Nesting, []},
+          {Credo.Check.Refactor.Nesting, [max_nesting: 3]},
           {Credo.Check.Refactor.UnlessWithElse, []},
           {Credo.Check.Refactor.WithClauses, []},
           {Credo.Check.Refactor.FilterFilter, []},

.dialyzer_ignore.exs

@@ -0,0 +1,6 @@
+[
+  {"lib/plausible/goals/goals.ex", :call_without_opaque},
+  {"lib/plausible/sites.ex", :call_without_opaque},
+  {"lib/plausible/teams/invitations.ex", :call_without_opaque},
+  {"lib/plausible_web/live/components/modal.ex", :pattern_match, 1}
+]

.github/workflows/elixir.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CACHE_VERSION: v17
+  CACHE_VERSION: v18
   PERSISTENT_CACHE_DIR: cached
 
 jobs:

.tool-versions

@@ -1,3 +1,3 @@
-erlang 27.3.4.6
-elixir 1.19.4-otp-27
+erlang 28.5.0.1
+elixir 1.20.1-otp-28
 nodejs 23.2.0

CHANGELOG.md

@@ -19,6 +19,7 @@ All notable changes to this project will be documented in this file.
 ### Removed
 
 - Removed the standalone team switcher page; team switching is now done from the topbar dropdown only
+- Removed `Bamboo.SMTPAdapter` from supported e-mail adapters; the library is no longer in active developments and does not compile under Elixir 1.20+
 
 ### Changed
 

Dockerfile

@@ -1,10 +1,10 @@
 # we can not use the pre-built tar because the distribution is
 # platform specific, it makes sense to build it in the docker
 
-ARG ALPINE_VERSION=3.22.2
+ARG ALPINE_VERSION=3.22.4
 
 #### Builder
-FROM hexpm/elixir:1.19.4-erlang-27.3.4.6-alpine-${ALPINE_VERSION} AS buildcontainer
+FROM hexpm/elixir:1.20.1-erlang-28.5.0.1-alpine-${ALPINE_VERSION} AS buildcontainer
 
 ARG MIX_ENV=ce
 

config/runtime.exs

@@ -742,20 +742,6 @@ case mailer_adapter do
       hackney_opts: [recv_timeout: :timer.seconds(10)],
       api_key: get_var_from_path_or_env(config_dir, "SENDGRID_API_KEY")
 
-  "Bamboo.SMTPAdapter" ->
-    config :plausible, Plausible.Mailer,
-      adapter: Bamboo.SMTPAdapter,
-      server: get_var_from_path_or_env(config_dir, "SMTP_HOST_ADDR", "mail"),
-      hostname: base_url.host,
-      port: get_var_from_path_or_env(config_dir, "SMTP_HOST_PORT", "25"),
-      username: get_var_from_path_or_env(config_dir, "SMTP_USER_NAME"),
-      password: get_var_from_path_or_env(config_dir, "SMTP_USER_PWD"),
-      tls: :if_available,
-      allowed_tls_versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"],
-      ssl: get_bool_from_path_or_env(config_dir, "SMTP_HOST_SSL_ENABLED", false),
-      retries: get_var_from_path_or_env(config_dir, "SMTP_RETRIES") || 2,
-      no_mx_lookups: get_bool_from_path_or_env(config_dir, "SMTP_MX_LOOKUPS_ENABLED", true)
-
   "Bamboo.Mua" ->
     config :plausible, Plausible.Mailer, adapter: Bamboo.Mua
 

extra/lib/license.ex

@@ -10,9 +10,9 @@ defmodule Plausible.License do
     at hello@plausible.io to discuss obtaining a license.
   """
 
-  require Logger
-
   if Mix.env() == :prod do
+    require Logger
+
     def ensure_valid_license do
       if has_valid_license?() do
         :ok

extra/lib/plausible/audit/encoder.ex

@@ -3,11 +3,13 @@ defmodule Plausible.Audit.EncoderError do
 end
 
 defprotocol Plausible.Audit.Encoder do
-  def encode(x, opts \\ [])
+  def encode(x)
+
+  def encode(x, opts)
 end
 
 defimpl Plausible.Audit.Encoder, for: Ecto.Changeset do
-  def encode(changeset, opts) do
+  def encode(changeset, opts \\ []) do
     changes =
       Enum.reduce(changeset.changes, %{}, fn {k, v}, acc ->
         Map.put(acc, k, Plausible.Audit.Encoder.encode(v, opts))
@@ -32,7 +34,7 @@ defimpl Plausible.Audit.Encoder, for: Ecto.Changeset do
 end
 
 defimpl Plausible.Audit.Encoder, for: Map do
-  def encode(x, opts) do
+  def encode(x, opts \\ []) do
     {allow_not_loaded, data} = Map.pop(x, :__allow_not_loaded__)
     raise_on_not_loaded? = Keyword.get(opts, :raise_on_not_loaded?, true)
 
@@ -53,22 +55,24 @@ defimpl Plausible.Audit.Encoder, for: Map do
 end
 
 defimpl Plausible.Audit.Encoder, for: [Integer, BitString, Float] do
-  def encode(x, _opts), do: x
+  def encode(x, _opts \\ []), do: x
 end
 
 defimpl Plausible.Audit.Encoder, for: [DateTime, Date, NaiveDateTime, Time] do
-  def encode(x, _opts), do: to_string(x)
+  def encode(x, _opts \\ []), do: to_string(x)
 end
 
 defimpl Plausible.Audit.Encoder, for: Atom do
+  def encode(x, opts \\ [])
+
   def encode(nil, _opts), do: nil
   def encode(true, _opts), do: true
   def encode(false, _opts), do: false
   def encode(x, _opts), do: Atom.to_string(x)
 end
 
 defimpl Plausible.Audit.Encoder, for: List do
-  def encode(x, opts) do
+  def encode(x, opts \\ []) do
     Enum.map(x, &Plausible.Audit.Encoder.encode(&1, opts))
   end
 end
@@ -116,12 +120,13 @@ defimpl Plausible.Audit.Encoder, for: Any do
 
     quote do
       defimpl Plausible.Audit.Encoder, for: unquote(module) do
-        def encode(struct, opts) do
+        def encode(struct, opts \\ []) do
           Plausible.Audit.Encoder.encode(unquote(extractor), opts)
         end
       end
     end
   end
 
+  def encode(_), do: raise("Implement me")
   def encode(_, _), do: raise("Implement me")
 end

extra/lib/plausible/auth/sso/domain/verification.ex

@@ -19,7 +19,6 @@ defmodule Plausible.Auth.SSO.Domain.Verification do
   """
 
   alias Plausible.Auth.SSO.Domain
-  require Domain
 
   @prefix "plausible-sso-verification"
 

extra/lib/plausible/installation_support/detection/diagnostics.ex

@@ -2,7 +2,6 @@ defmodule Plausible.InstallationSupport.Detection.Diagnostics do
   @moduledoc """
   Module responsible for translating diagnostics to user-friendly errors and recommendations.
   """
-  require Logger
 
   # in this struct, nil means indeterminate
   defstruct v1_detected: nil,

extra/lib/plausible/installation_support/verification/diagnostics.ex

@@ -2,7 +2,6 @@ defmodule Plausible.InstallationSupport.Verification.Diagnostics do
   @moduledoc """
   Module responsible for translating diagnostics to user-friendly errors and recommendations.
   """
-  require Logger
 
   # In this struct
   # - the default nil value for each field means that the value is indeterminate (e.g. we didn't even get to the part where response_status is set)

extra/lib/plausible_web/live/customer_support/team/components/billing.ex

@@ -11,8 +11,6 @@ defmodule PlausibleWeb.CustomerSupport.Team.Components.Billing do
   import Ecto.Query, only: [from: 2]
   import PlausibleWeb.Components.Generic
 
-  require Plausible.Billing.Subscription.Status
-
   def update(%{team: team}, socket) do
     usage = Teams.Billing.quota_usage(team, with_features: true)
 

lib/mix/tasks/create_free_subscription.ex

@@ -1,7 +1,9 @@
 defmodule Mix.Tasks.CreateFreeSubscription do
+  @moduledoc false
+
   use Mix.Task
   use Plausible.Repo
-  require Logger
+
   alias Plausible.Billing.Subscription
 
   # coveralls-ignore-start

lib/mix/tasks/generate_referrer_favicons.ex

@@ -1,7 +1,8 @@
 defmodule Mix.Tasks.GenerateReferrerFavicons do
+  @moduledoc false
+
   use Mix.Task
   use Plausible.Repo
-  require Logger
 
   @dialyzer {:nowarn_function, run: 1}
   # coveralls-ignore-start

lib/mix/tasks/send_pageview.ex

@@ -7,7 +7,6 @@ defmodule Mix.Tasks.SendPageview do
   """
 
   use Mix.Task
-  require Logger
 
   @default_host "http://localhost:8000"
   @default_ip_address "127.0.0.1"

lib/plausible.ex

@@ -26,7 +26,13 @@ defmodule Plausible do
 
   defmacro always(term) do
     quote do
-      :erlang.phash2(1, 1) == 0 && unquote(term)
+      case :erlang.phash2(1, 1) do
+        0 ->
+          unquote(term)
+
+        1 ->
+          not unquote(term)
+      end
     end
   end
 

lib/plausible/application.ex

@@ -4,8 +4,6 @@ defmodule Plausible.Application do
   use Application
   use Plausible
 
-  require Logger
-
   def start(_type, _args) do
     on_ee(do: Plausible.License.ensure_valid_license())
     on_ce(do: :inet_db.set_tcp_module(:happy_tcp))
@@ -359,7 +357,7 @@ defmodule Plausible.Application do
   end
 
   def setup_sentry() do
-    Logger.add_backend(Sentry.LoggerBackend)
+    LoggerBackends.add(Sentry.LoggerBackend)
 
     :telemetry.attach_many(
       "oban-errors",

lib/plausible/billing/billing.ex

@@ -6,7 +6,7 @@ defmodule Plausible.Billing do
   """
   use Plausible
   use Plausible.Repo
-  require Plausible.Billing.Subscription.Status
+
   alias Plausible.Auth
   alias Plausible.Billing.Subscription
   alias Plausible.Teams

lib/plausible/data_migration/populate_event_session_columns.ex

@@ -12,8 +12,6 @@ defmodule Plausible.DataMigration.PopulateEventSessionColumns do
   """
   use Plausible.DataMigration, dir: "PopulateEventSessionColumns", repo: Plausible.IngestRepo
 
-  require Logger
-
   # See https://clickhouse.com/docs/en/sql-reference/dictionaries#cache for meaning of these defaults
   @default_dictionary_config %{
     lifetime: 600_000,

lib/plausible/ecto/types/compiled_regex.ex

@@ -9,6 +9,6 @@ defmodule Plausible.Ecto.Types.CompiledRegex do
   def cast(val) when is_binary(val), do: {:ok, val}
   def cast(_), do: :error
 
-  def load(val), do: {:ok, Regex.compile!(val)}
+  def load(val), do: {:ok, Regex.compile!(val, "E")}
   def dump(val), do: {:ok, val}
 end

lib/plausible/google/api.ex

@@ -7,8 +7,6 @@ defmodule Plausible.Google.API do
   alias Plausible.Google.SearchConsole
   alias Plausible.Stats.Query
 
-  require Logger
-
   @search_console_scope URI.encode_www_form(
                           "email https://www.googleapis.com/auth/webmasters.readonly"
                         )

lib/plausible/ingestion/counters.ex

@@ -20,8 +20,6 @@ defmodule Plausible.Ingestion.Counters do
 
   @behaviour :gen_cycle
 
-  require Logger
-
   alias Plausible.Ingestion.Counters.Buffer
   alias Plausible.Ingestion.Counters.Record
   alias Plausible.Ingestion.Counters.TelemetryHandler

lib/plausible/ingestion/persistor/embedded.ex

@@ -5,8 +5,6 @@ defmodule Plausible.Ingestion.Persistor.Embedded do
 
   alias Plausible.ClickhouseEventV2
 
-  require Logger
-
   def persist_event(ingest_event, previous_user_id, opts) do
     event = ingest_event.clickhouse_event
     session_attrs = ingest_event.clickhouse_session_attrs

lib/plausible/open_telemetry.ex

@@ -1,10 +1,10 @@
 defmodule Plausible.OpenTelemetry do
   @moduledoc false
 
-  require OpenTelemetry.Tracer, as: Tracer
+  alias OpenTelemetry.Tracer
 
   def current_trace_id do
-    case OpenTelemetry.Tracer.current_span_ctx() do
+    case Tracer.current_span_ctx() do
       :undefined ->
         nil
 

lib/plausible/open_telemetry/logger.ex

@@ -7,8 +7,6 @@ defmodule Plausible.OpenTelemetry.Logger do
   to the Logger metadata when Phoenix router dispatch starts.
   """
 
-  require Logger
-
   @doc """
   Attaches telemetry handlers to set trace_id in Logger metadata.
 

lib/plausible/session/cache_store.ex

@@ -1,5 +1,8 @@
 defmodule Plausible.Session.CacheStore do
-  require Logger
+  @moduledoc """
+  Session management on the basis of incoming events.
+  """
+
   alias Plausible.Session.WriteBuffer
 
   @lock_timeout 1000

lib/plausible/site/gate_keeper.ex

@@ -27,8 +27,6 @@ defmodule Plausible.Site.GateKeeper do
   alias Plausible.{Site, RateLimit}
   alias Plausible.Site.Cache
 
-  require Logger
-
   @spec check(String.t(), Keyword.t()) :: t()
   def check(domain, opts \\ []) when is_binary(domain) do
     case policy(domain, opts) do

lib/plausible/stats/query.ex

@@ -1,4 +1,8 @@
 defmodule Plausible.Stats.Query do
+  @moduledoc """
+  Struct storing stats query parameters and configuration.
+  """
+
   use Plausible
 
   defstruct utc_time_range: nil,
@@ -32,7 +36,7 @@ defmodule Plausible.Stats.Query do
             sql_join_type: :left,
             smear_session_metrics: false
 
-  require OpenTelemetry.Tracer, as: Tracer
+  alias OpenTelemetry.Tracer
 
   alias Plausible.Stats.{
     DateTimeRange,

lib/plausible/stats/sparkline.ex

@@ -6,7 +6,6 @@ defmodule Plausible.Stats.Sparkline do
 
   alias Plausible.{Site, Stats}
   alias Plausible.Stats.QueryBuilder
-  require Logger
 
   @spec parallel_overview([Site.t()], NaiveDateTime.t()) :: map()
   def parallel_overview(sites, now \\ NaiveDateTime.utc_now()) when is_list(sites) do