Fix compilation warnings introduced in Elixir v1.19

alco · alco · commit 0c6fea9f9b7d · 2025-10-21T12:23:48.000+02:00
diff --git a/packages/sync-service/lib/electric.ex b/packages/sync-service/lib/electric.ex
@@ -115,8 +115,6 @@ defmodule Electric do
     use a provided value as stack id, but nothing else.
   """
 
-  require Logger
-
   @doc false
   def connection_opts_schema do
     @connection_opts
diff --git a/packages/sync-service/lib/electric/plug/delete_shape_plug.ex b/packages/sync-service/lib/electric/plug/delete_shape_plug.ex
@@ -3,8 +3,6 @@ defmodule Electric.Plug.DeleteShapePlug do
 
   alias Electric.Shapes.Api
 
-  require Logger
-
   plug :fetch_query_params
   plug :put_resp_content_type, "application/json"
 
diff --git a/packages/sync-service/lib/electric/plug/health_check_plug.ex b/packages/sync-service/lib/electric/plug/health_check_plug.ex
@@ -1,8 +1,8 @@
 defmodule Electric.Plug.HealthCheckPlug do
+  use Plug.Builder
+
   alias Plug.Conn
   alias Electric.StatusMonitor
-  require Logger
-  use Plug.Builder
 
   plug :fetch_query_params
   plug :check_service_status
diff --git a/packages/sync-service/lib/electric/plug/options_shape_plug.ex b/packages/sync-service/lib/electric/plug/options_shape_plug.ex
@@ -1,8 +1,6 @@
 defmodule Electric.Plug.OptionsShapePlug do
   use Plug.Builder
 
-  require Logger
-
   plug :call_options_api
 
   defp call_options_api(%Plug.Conn{} = conn, _) do
diff --git a/packages/sync-service/lib/electric/plug/trace_context_plug.ex b/packages/sync-service/lib/electric/plug/trace_context_plug.ex
@@ -2,9 +2,8 @@ defmodule Electric.Plug.TraceContextPlug do
   @moduledoc """
   A plug that extracts trace context from incoming HTTP headers and sets it as the parent span.
   """
-  @behaviour Plug
 
-  require Logger
+  @behaviour Plug
 
   def init(opts), do: opts
 
diff --git a/packages/sync-service/lib/electric/replication/changes.ex b/packages/sync-service/lib/electric/replication/changes.ex
@@ -13,8 +13,6 @@ defmodule Electric.Replication.Changes do
   alias Electric.Replication.Changes
   alias Electric.Replication.LogOffset
 
-  require Logger
-
   @type db_identifier() :: String.t()
   @type xid() :: non_neg_integer()
   @type relation_name() :: {schema :: db_identifier(), table :: db_identifier()}
diff --git a/packages/sync-service/lib/electric/replication/persistent_replication_state.ex b/packages/sync-service/lib/electric/replication/persistent_replication_state.ex
@@ -1,7 +1,6 @@
 defmodule Electric.Replication.PersistentReplicationState do
   alias Electric.PersistentKV
   alias Electric.Replication.Changes
-  require Logger
 
   @type opts() :: [
           stack_id: String.t(),
diff --git a/packages/sync-service/lib/electric/replication/shape_log_collector/flush_tracker.ex b/packages/sync-service/lib/electric/replication/shape_log_collector/flush_tracker.ex
@@ -1,5 +1,4 @@
 defmodule Electric.Replication.ShapeLogCollector.FlushTracker do
-  require Electric.Replication.LogOffset
   alias Electric.Replication.LogOffset
   alias Electric.Replication.Changes.Transaction
 
diff --git a/packages/sync-service/lib/electric/shape_cache/pure_file_storage/key_index.ex b/packages/sync-service/lib/electric/shape_cache/pure_file_storage/key_index.ex
@@ -30,7 +30,7 @@ defmodule Electric.ShapeCache.PureFileStorage.KeyIndex do
         with <<total_size::32, _label::8, tx_offset::64, op_offset::64, op_type::8,
                log_file_entry_start_pos::64,
                json_size::64>> <- IO.binread(file, @key_index_full_size),
-             <<key::binary-size(total_size - @key_index_entry_size)>> <-
+             <<key::binary-size(^total_size - @key_index_entry_size)>> <-
                IO.binread(file, total_size - @key_index_entry_size) do
           {{key, LogOffset.new(tx_offset, op_offset), op_type, log_file_entry_start_pos,
             json_size}, {file, pos + total_size + 4}}
@@ -68,7 +68,7 @@ defmodule Electric.ShapeCache.PureFileStorage.KeyIndex do
     Stream.unfold(search_start_pos, fn position ->
       with <<total_size::32, _::8, _::64, _::64, _::8, line_start_pos::64, json_size::64>> <-
              IO.binread(file, @key_index_full_size),
-           <<_::binary-size(total_size - @key_index_full_size)>> <-
+           <<_::binary-size(^total_size - @key_index_full_size)>> <-
              IO.binread(file, total_size - @key_index_full_size) do
         {
           LogFile.expected_position(
@@ -100,7 +100,7 @@ defmodule Electric.ShapeCache.PureFileStorage.KeyIndex do
         with <<total_size::32, label::8, tx_offset::64, op_offset::64, op_type::8,
                log_file_entry_start_pos::64,
                json_size::64>> <- IO.binread(file, @key_index_full_size),
-             <<key::binary-size(total_size - @key_index_entry_size)>> <-
+             <<key::binary-size(^total_size - @key_index_entry_size)>> <-
                IO.binread(file, total_size - @key_index_entry_size) do
           {[
              {{total_size - @key_index_entry_size, key}, label,
diff --git a/packages/sync-service/lib/electric/shape_cache/pure_file_storage/log_file.ex b/packages/sync-service/lib/electric/shape_cache/pure_file_storage/log_file.ex
@@ -84,9 +84,9 @@ defmodule Electric.ShapeCache.PureFileStorage.LogFile do
 
   defp read_line(file) do
     with <<tx_offset::64, op_offset::64, key_size::32>> <- IO.binread(file, 20),
-         <<key::binary-size(key_size)>> <- IO.binread(file, key_size),
+         <<key::binary-size(^key_size)>> <- IO.binread(file, key_size),
          <<op_type::8, processed_flag::8, json_size::64>> <- IO.binread(file, 10),
-         <<json::binary-size(json_size)>> <- IO.binread(file, json_size) do
+         <<json::binary-size(^json_size)>> <- IO.binread(file, json_size) do
       {LogOffset.new(tx_offset, op_offset), key_size, key, op_type, processed_flag, json_size,
        json}
     end
@@ -173,9 +173,9 @@ defmodule Electric.ShapeCache.PureFileStorage.LogFile do
 
         {file, position} ->
           with <<tx_offset::64, op_offset::64, key_size::32>> <- IO.binread(file, 20),
-               <<key::binary-size(key_size)>> <- IO.binread(file, key_size),
+               <<key::binary-size(^key_size)>> <- IO.binread(file, key_size),
                <<op_type::8, flag::8, json_size::64>> <- IO.binread(file, 10),
-               <<json::binary-size(json_size)>> <- IO.binread(file, json_size) do
+               <<json::binary-size(^json_size)>> <- IO.binread(file, json_size) do
             entry =
               {LogOffset.new(tx_offset, op_offset), key_size, key, op_type, flag, json_size, json}
 
@@ -323,9 +323,9 @@ defmodule Electric.ShapeCache.PureFileStorage.LogFile do
 
       Stream.unfold(search_start_pos, fn position ->
         with <<tx_offset::64, op_offset::64, key_size::32>> <- IO.binread(file, 20),
-             <<_::binary-size(key_size)>> <- IO.binread(file, key_size),
+             <<_::binary-size(^key_size)>> <- IO.binread(file, key_size),
              <<_::8, _::8, json_size::64>> <- IO.binread(file, 10),
-             <<_::binary-size(json_size)>> <- IO.binread(file, json_size) do
+             <<_::binary-size(^json_size)>> <- IO.binread(file, json_size) do
           read = 20 + key_size + json_size + 10
           {{LogOffset.new(tx_offset, op_offset), position + read, read}, position + read}
         else
diff --git a/packages/sync-service/lib/electric/shapes.ex b/packages/sync-service/lib/electric/shapes.ex
@@ -3,7 +3,6 @@ defmodule Electric.Shapes do
   alias Electric.ShapeCache.Storage
   alias Electric.ShapeCache
   alias Electric.Shapes.Shape
-  require Logger
 
   @type shape_handle :: Electric.ShapeCacheBehaviour.shape_handle()
 
diff --git a/packages/sync-service/lib/electric/shapes/api.ex b/packages/sync-service/lib/electric/shapes/api.ex
@@ -598,10 +598,10 @@ defmodule Electric.Shapes.Api do
 
   defp do_serve_shape_log(%Request{params: %{offset: :now}} = request) do
     # For "now" offset, return an immediate up-to-date response with no log data
-    %{global_last_seen_lsn: global_last_seen_lsn} = request
+    %{response: %Response{} = response, global_last_seen_lsn: global_last_seen_lsn} = request
 
-    %Response{
-      request.response
+    %{
+      response
       | status: 200,
         body: encode_log(request, [up_to_date_ctl(global_last_seen_lsn)]),
         finalized?: true
diff --git a/packages/sync-service/lib/electric/shapes/consumer_supervisor.ex b/packages/sync-service/lib/electric/shapes/consumer_supervisor.ex
@@ -1,8 +1,6 @@
 defmodule Electric.Shapes.ConsumerSupervisor do
   use Supervisor, restart: :transient
 
-  require Logger
-
   @name_schema_tuple {:tuple, [:atom, :atom, :any]}
   # TODO: unify these with ShapeCache
   @schema NimbleOptions.new!(
diff --git a/packages/sync-service/lib/electric/shapes/filter/indexes/equality_index.ex b/packages/sync-service/lib/electric/shapes/filter/indexes/equality_index.ex
@@ -11,7 +11,6 @@ defmodule Electric.Shapes.Filter.Indexes.EqualityIndex do
   alias Electric.Shapes.Filter.Index
   alias Electric.Shapes.Filter.Indexes.EqualityIndex
   alias Electric.Shapes.Filter.WhereCondition
-  require Logger
 
   defstruct [:type, :values]
 
diff --git a/packages/sync-service/lib/electric/shapes/filter/indexes/inclusion_index.ex b/packages/sync-service/lib/electric/shapes/filter/indexes/inclusion_index.ex
@@ -19,7 +19,6 @@ defmodule Electric.Shapes.Filter.Indexes.InclusionIndex do
   alias Electric.Shapes.Filter.Index
   alias Electric.Shapes.Filter.Indexes.InclusionIndex
   alias Electric.Shapes.Filter.WhereCondition
-  require Logger
 
   empty_node = %{keys: []}
   @empty_node empty_node
diff --git a/packages/sync-service/lib/electric/shapes/querying.ex b/packages/sync-service/lib/electric/shapes/querying.ex
@@ -4,8 +4,6 @@ defmodule Electric.Shapes.Querying do
   alias Electric.Shapes.Shape
   alias Electric.Telemetry.OpenTelemetry
 
-  require Logger
-
   def query_subset(conn, shape, subset, mark) do
     # When querying a subset, we select same columns as the base shape
     table = Utils.relation_to_sql(shape.root_table)
diff --git a/packages/sync-service/lib/electric/snapshot_error.ex b/packages/sync-service/lib/electric/snapshot_error.ex
@@ -1,6 +1,4 @@
 defmodule Electric.SnapshotError do
-  require Logger
-
   alias Electric.SnapshotError
 
   defexception [:message, :type, :original_error]
diff --git a/packages/sync-service/lib/electric/telemetry/open_telemetry.ex b/packages/sync-service/lib/electric/telemetry/open_telemetry.ex
@@ -29,9 +29,6 @@ defmodule Electric.Telemetry.OpenTelemetry do
   [2]: https://github.com/open-telemetry/opentelemetry-erlang
   """
 
-  require Logger
-  require OpenTelemetry.SemanticConventions.Trace
-
   alias Electric.Telemetry.Sampler
   alias Electric.Telemetry.IntervalTimer
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`defmodule Electric.Replication.ShapeLogCollector.FlushTracker do`
`2`		`- require Electric.Replication.LogOffset`
`3`	`2`	`alias Electric.Replication.LogOffset`
`4`	`3`	`alias Electric.Replication.Changes.Transaction`
`5`	`4`