Skip to content

Commit

Permalink
Update Test Harness dependencies to their latest versions (#72)
Browse files Browse the repository at this point in the history
* Update Test Harness dependencies to their latest versions

- Run tests on Elixir 1.16, 1.17, 1.18 and Erlang 25, 26, 27
- Update LiveView to 1.0 and Dataloader to 2.0 while accepting lower versions too.
- Drop Elixir 1.16 as it does not support Erlang 27

Signed-off-by: Maciej Szlosarczyk ([email protected])
  • Loading branch information
maciej-szlosarczyk authored Jan 24, 2025
1 parent a301572 commit f33fa5b
Show file tree
Hide file tree
Showing 10 changed files with 108 additions and 99 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gh-action-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
# Specify the OTP and Elixir versions to use when building
# and running the workflow steps.
matrix:
otp: ["25.2", "26.2"]
elixir: ["1.15.6", "1.16.1"]
otp: ["26.2", "27.2"]
elixir: ["1.17", "1.18"]
services:
db:
env:
Expand Down
4 changes: 1 addition & 3 deletions .known_dialyzer_warnings
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
lib/mv_opentelemetry/ecto.ex:126: The call 'Elixir.OpenTelemetry.Ctx':attach(_context@1::{'span_ctx',non_neg_integer(),non_neg_integer(),'undefined' | integer(),[{_,_}],'false' | 'true' | 'undefined',boolean(),'false' | 'true' | 'undefined','undefined' | {atom(),_}}) will never return since it differs in the 1st argument from the success typing arguments: (map())
lib/mv_opentelemetry/ecto.ex:129: The variable _context@1 can never match since previous clauses completely covered the type 'undefined'
lib/mv_opentelemetry/dataloader.ex:81: The call 'Elixir.OpenTelemetry.Ctx':detach(_context@1::map()) does not have an opaque term of type otel_ctx:token() as 1st argument
lib/mv_opentelemetry/tesla.ex:88: The call 'Elixir.OpenTelemetry.Ctx':detach(_context@1::map()) does not have an opaque term of type otel_ctx:token() as 1st argument
lib/mv_opentelemetry/ecto.ex:142: The call 'Elixir.OpenTelemetry.Ctx':detach(_context@1::map()) does not have an opaque term of type otel_ctx:token() as 1st argument
The call 'Elixir.OpenTelemetry.Ctx':detach(_context@1::map()) does not have an opaque term of type otel_ctx:token() as 1st argument
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ defmodule MvOpentelemetry.MixProject do
{:mv_opentelemetry_harness, path: "./mv_opentelemetry_harness", only: [:dev, :test]},
{:phoenix_live_reload, "~> 1.2", only: :dev},
{:plug, "~> 1.0", optional: true},
{:phoenix_live_view, "~> 0.16", optional: true},
{:phoenix_live_view, "~> 0.20 or ~> 1.0", optional: true},
{:absinthe, "~> 1.0", optional: true},
{:floki, ">= 0.30.0", only: :test},
{:credo, "~> 1.5", only: [:dev, :test], runtime: false},
Expand Down
88 changes: 46 additions & 42 deletions mix.lock

Large diffs are not rendered by default.

10 changes: 4 additions & 6 deletions mv_opentelemetry_harness/lib/mv_opentelemetry_harness_web.ex
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ defmodule MvOpentelemetryHarnessWeb do
def live_view do
quote do
use Phoenix.LiveView,
layout: {MvOpentelemetryHarnessWeb.LayoutView, "live.html"}
layout: {MvOpentelemetryHarnessWeb.LayoutView, :live}

unquote(view_helpers())
end
Expand Down Expand Up @@ -76,11 +76,9 @@ defmodule MvOpentelemetryHarnessWeb do

defp view_helpers do
quote do
# Use all HTML functionality (forms, tags, etc)
use Phoenix.HTML

# Import basic rendering functionality (render, render_layout, etc)
import Phoenix.View
import Phoenix.HTML
import Phoenix.HTML.Form
use PhoenixHTMLHelpers

import MvOpentelemetryHarnessWeb.ErrorHelpers
alias MvOpentelemetryHarnessWeb.Router.Helpers, as: Routes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<nav role="navigation">
<ul>
<li><a href="https://hexdocs.pm/phoenix/overview.html">Get Started</a></li>

</ul>
</nav>
<a href="https://phoenixframework.org/" class="phx-logo">
Expand All @@ -23,8 +23,8 @@
</section>
</header>
<main role="main" class="container">
<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p>
<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p>
<p class="alert alert-info" role="alert"><%= Phoenix.Flash.get(@flash, :info) %></p>
<p class="alert alert-danger" role="alert"><%= Phoenix.Flash.get(@flash, :error) %></p>
<%= @inner_content %>
</main>
</body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ defmodule MvOpentelemetryHarnessWeb.ErrorHelpers do
Conveniences for translating and building error messages.
"""

use Phoenix.HTML
import Phoenix.HTML.Form
use PhoenixHTMLHelpers

@doc """
Generates tag for inlined form input errors.
Expand Down
10 changes: 6 additions & 4 deletions mv_opentelemetry_harness/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defmodule MvOpentelemetryHarness.MixProject do
version: "0.1.0",
elixir: "~> 1.7",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: [:phoenix] ++ Mix.compilers(),
compilers: Mix.compilers(),
start_permanent: Mix.env() == :prod,
aliases: aliases(),
deps: deps()
Expand Down Expand Up @@ -37,9 +37,11 @@ defmodule MvOpentelemetryHarness.MixProject do
{:phoenix_ecto, "~> 4.1"},
{:ecto_sql, "~> 3.4"},
{:postgrex, ">= 0.0.0"},
{:phoenix_html, "~> 3.0"},
{:phoenix_html, "~> 4.0"},
{:phoenix_html_helpers, "~> 1.0"},
{:phoenix_view, "~> 2.0"},
{:phoenix_live_reload, "~> 1.2", only: :dev},
{:phoenix_live_view, "~> 0.16.0"},
{:phoenix_live_view, "~> 1.0"},
{:telemetry_metrics, "~> 0.4"},
{:telemetry_poller, "~> 1.0"},
{:jason, "~> 1.0"},
Expand All @@ -49,7 +51,7 @@ defmodule MvOpentelemetryHarness.MixProject do
# Absinthe
{:absinthe, "~> 1.6"},
{:absinthe_plug, "~> 1.5"},
{:dataloader, "~> 1.0.0"},
{:dataloader, "~> 1.0 or ~> 2.0"},

# Oban
{:oban, "~> 2.0"},
Expand Down
Loading

0 comments on commit f33fa5b

Please sign in to comment.