Merge pull request #1011 from eyra/hotfix/6.2

Hotfix/6.2

CHANGELOG.md

@@ -11,6 +11,10 @@
 
 ## \#7 unreleased
 
+## \#6.2 unreleased
+
+* Added: AppSignal support
+
 ## \#6.1 2024-11-19
 
 * Fixed: Memory issues by temporary removing Sentry support

core/config/runtime.exs

@@ -117,6 +117,15 @@ if config_env() == :prod do
     access_key: System.get_env("UNSPLASH_ACCESS_KEY"),
     app_name: System.get_env("UNSPLASH_APP_NAME")
 
+  if push_api_key = System.get_env("APPSIGNAL_PUSH_API_KEY") do
+    config :appsignal, :config,
+      otp_app: :core,
+      name: "Next",
+      env: app_domain,
+      push_api_key: push_api_key,
+      active: true
+  end
+
   config :core, :storage,
     services:
       System.get_env("STORAGE_SERVICES", "builtin, yoda")

core/mix.exs

@@ -67,6 +67,7 @@ defmodule Core.MixProject do
       # Workaround for conflicting versions in ex_aws & ex_phone_number
       {:sweet_xml, "~> 0.7", override: true},
       # Deps
+      {:appsignal_phoenix, "~> 2.3.9"},
       {:assent, "~> 0.2.3"},
       {:bamboo_phoenix, git: "https://github.com/populimited/bamboo_phoenix.git", ref: "bf3e320"},
       {:bamboo_ses, "~> 0.3.0"},
@@ -100,7 +101,6 @@ defmodule Core.MixProject do
       {:plug_cowboy, "~> 2.5"},
       {:postgrex, ">= 0.15.13"},
       {:remote_ip, "~> 1.1"},
-      {:sentry, "~> 10.7"},
       {:slugify, "~> 1.3"},
       {:statistics, "~> 0.6.2"},
       {:tailwind, "~> 0.2.0", runtime: Mix.env() == :dev},

core/mix.lock

@@ -1,4 +1,7 @@
 %{
+  "appsignal": {:hex, :appsignal, "2.13.2", "d21f885882de31e24219f6c0fbb9bdf64b009ce3f53ec32d60789d9875e372dc", [:make, :mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:decorator, "~> 1.2.3 or ~> 1.3", [hex: :decorator, repo: "hexpm", optional: false]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "0debf8717d612146d21cd21f9798b8b1f6a07ac4b1feb3d52eb01c4508ecf5cd"},
+  "appsignal_phoenix": {:hex, :appsignal_phoenix, "2.3.9", "7e3a5f47f833aa499ec1a5d114f5797c7ac4bcd0ad908e6da1e2197aea53baf9", [:mix], [{:appsignal, ">= 2.11.0 and < 3.0.0", [hex: :appsignal, repo: "hexpm", optional: false]}, {:appsignal_plug, ">= 2.0.15 and < 3.0.0", [hex: :appsignal_plug, repo: "hexpm", optional: false]}, {:hackney, "~> 1.6", [hex: :hackney, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.11 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_live_view, "~> 0.9", [hex: :phoenix_live_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "bd0f8acef5e0b7f5344f2299b01f5740f51a1a5279889b93ae676b0a2b1cf631"},
+  "appsignal_plug": {:hex, :appsignal_plug, "2.0.15", "758a8a78944878e8461bbc77ca86219121a56f4299c6d79940ab083cf9afea00", [:mix], [{:appsignal, ">= 2.7.6 and < 3.0.0", [hex: :appsignal, repo: "hexpm", optional: false]}, {:plug, ">= 1.1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "1c6059049e2081e808aaef04e2b9917e06277f61a35a0e103db860d08cbc41f1"},
   "assent": {:hex, :assent, "0.2.3", "414d77ea27349dacc980b612e9edeed06c4d64a3df99a0fa8e42e6940ed20c16", [:mix], [{:certifi, ">= 0.0.0", [hex: :certifi, repo: "hexpm", optional: true]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: true]}, {:mint, "~> 1.0", [hex: :mint, repo: "hexpm", optional: true]}, {:ssl_verify_fun, ">= 0.0.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: true]}], "hexpm", "a39bc5b57920632b003bd175fd58fcb355c10efbe614bba03682ce2a76d4133f"},
   "azurex": {:hex, :azurex, "0.1.5", "59a8ba34320a38c2d7ee1e4fd4477b59da7ef95b719f47362b5021f9643e8bd4", [:mix], [{:httpoison, "~> 1.6", [hex: :httpoison, repo: "hexpm", optional: false]}, {:timex, "~> 3.7", [hex: :timex, repo: "hexpm", optional: false]}], "hexpm", "fb5e2b47b15713f2ce9db8ac7641b604482fb70d3559b95182bb2950ec7c44b3"},
   "bamboo": {:hex, :bamboo, "2.3.0", "d2392a2cabe91edf488553d3c70638b532e8db7b76b84b0a39e3dfe492ffd6fc", [:mix], [{:hackney, ">= 1.15.2", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:mime, "~> 1.4 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "dd0037e68e108fd04d0e8773921512c940e35d981e097b5793543e3b2f9cd3f6"},
@@ -23,6 +26,7 @@
   "currency_formatter": {:hex, :currency_formatter, "0.8.1", "ab410d520713ba3a5b56eaf4ef944471df67c870dd0e5cd5a9f7e22f9b634777", [:mix], [{:phoenix_html, ">= 0.0.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:poison, "~> 3.1.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "e1aafb0c2eba8d63d0d1055e118a674f8b60bd1095d86a701a9732803e410214"},
   "db_connection": {:hex, :db_connection, "2.4.3", "3b9aac9f27347ec65b271847e6baeb4443d8474289bd18c1d6f4de655b70c94d", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c127c15b0fa6cfb32eed07465e05da6c815b032508d4ed7c116122871df73c12"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
+  "decorator": {:hex, :decorator, "1.4.0", "a57ac32c823ea7e4e67f5af56412d12b33274661bb7640ec7fc882f8d23ac419", [:mix], [], "hexpm", "0a07cedd9083da875c7418dea95b78361197cf2bf3211d743f6f7ce39656597f"},
   "dialyxir": {:hex, :dialyxir, "1.2.0", "58344b3e87c2e7095304c81a9ae65cb68b613e28340690dfe1a5597fd08dec37", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "61072136427a851674cab81762be4dbeae7679f85b1272b6d25c3a839aff8463"},
   "digital_token": {:hex, :digital_token, "0.4.0", "2ad6894d4a40be8b2890aad286ecd5745fa473fa5699d80361a8c94428edcd1f", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "a178edf61d1fee5bb3c34e14b0f4ee21809ee87cade8738f87337e59e5e66e26"},
   "dns": {:hex, :dns, "2.2.0", "4721a79c2bccc25481930dffbfd06f40851321c3d679986af307111214bf124c", [:mix], [{:socket, "~> 0.3.13", [hex: :socket, repo: "hexpm", optional: false]}], "hexpm", "13ed1ef36ce896211ec6ce5e02709dbfb12aa61d6255bda8d531577a0a5a56e0"},

core/systems/admin/actions_view.ex

@@ -53,11 +53,24 @@ defmodule Systems.Admin.ActionsView do
       }
     }
 
+    crash_button = %{
+      action: %{
+        type: :send,
+        event: "crash"
+      },
+      face: %{
+        type: :primary,
+        bg_color: "bg-delete",
+        label: "Raise a test exception"
+      }
+    }
+
     socket
     |> assign(
       rollback_expired_deposits_button: rollback_expired_deposits_button,
       expire_button: expire_button,
-      expire_force_button: expire_force_button
+      expire_force_button: expire_force_button,
+      crash_button: crash_button
     )
   end
 
@@ -85,6 +98,12 @@ defmodule Systems.Admin.ActionsView do
     {:noreply, socket}
   end
 
+  @impl true
+  def handle_event("crash", _, socket) do
+    raise "Test exception"
+    {:noreply, socket}
+  end
+
   @impl true
   def render(assigns) do
     ~H"""
@@ -106,6 +125,14 @@ defmodule Systems.Admin.ActionsView do
         <Button.dynamic {@expire_button} />
         <.spacing value="S" />
       </.wrap>
+      <.spacing value="XL" />
+      <Text.title3 margin="">Monitoring</Text.title3>
+      <.spacing value="S" />
+      <.wrap>
+        <Button.dynamic {@crash_button} />
+        <.spacing value="S" />
+      </.wrap>
+
       <%= if feature_enabled?(:debug_expire_force) do %>
         <.wrap>
           <Button.dynamic {@expire_force_button} />

core/systems/assignment/crew_page.ex

@@ -181,6 +181,8 @@ defmodule Systems.Assignment.CrewPage do
 
   @impl true
   def handle_event(name, event, socket) do
+    Logger.debug("[CrewPage] Forwarding event to flow: #{name}")
+
     {
       :noreply,
       socket |> send_event(:flow, name, event)

core/systems/storage/delivery.ex

@@ -28,7 +28,7 @@ defmodule Systems.Storage.Delivery do
   end
 
   def deliver(backend, endpoint, data, meta_data) do
-    Logger.debug("[Storage.Delivery] delivery started",
+    Logger.notice("[Storage.Delivery] delivery started, #{byte_size(data)} bytes",
       ansi_color: :light_magenta
     )