improve logger

.drone.yml

@@ -13,20 +13,24 @@ steps:
     mount:
       - _build
       - deps
-      - assets/node_modules/
+      - .npm
+      - .mix
 
 - name: test
   image: elixir:1.14.1-alpine
   environment:
     TEST_DATABASE_URL: ecto://postgres:postgres@database/cannery_test
     HOST: testing.example.tld
+    MIX_HOME: /drone/src/.mix
+    MIX_ARCHIVES: /drone/src/.mix/archives
+    MIX_ENV: test
   commands:
-  - apk add --no-cache build-base npm git python3
-  - mix local.rebar --force
-  - mix local.hex --force
+  - apk add --no-cache build-base npm git
+  - mix local.rebar --force --if-missing
+  - mix local.hex --force --if-missing
   - mix deps.get
-  - mix deps.compile
-  - npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
+  - npm set cache .npm
+  - npm --prefix ./assets ci --no-audit --prefer-offline
   - npm run --prefix ./assets deploy
   - mix do phx.digest, gettext.extract
   - mix test.all
@@ -76,7 +80,8 @@ steps:
     mount:
       - _build
       - deps
-      - assets/node_modules/
+      - .npm
+      - .mix
 
 services:
 - name: database

.tool-versions

@@ -1,3 +1,3 @@
 elixir 1.14.1-otp-25
 erlang 25.1.2
-nodejs 18.12.1
+nodejs 18.9.1

assets/package.json

@@ -3,8 +3,8 @@
   "description": " ",
   "license": "MIT",
   "engines": {
-    "node": "18.12.1",
-    "npm": "8.19.2"
+    "node": "v18.9.1",
+    "npm": "8.10.0"
   },
   "scripts": {
     "deploy": "NODE_ENV=production webpack --mode production",

lib/cannery/application.ex

@@ -4,7 +4,7 @@ defmodule Cannery.Application do
   @moduledoc false
 
   use Application
-  alias Cannery.ErrorReporter
+  alias Cannery.Logger
 
   @impl true
   def start(_type, _args) do
@@ -33,7 +33,7 @@ defmodule Cannery.Application do
           [:oban, :job, :start],
           [:oban, :job, :stop]
         ],
-        &ErrorReporter.handle_event/4,
+        &Logger.handle_event/4,
         []
       )
 

lib/cannery/logger.ex

@@ -1,4 +1,4 @@
-defmodule Cannery.ErrorReporter do
+defmodule Cannery.Logger do
   @moduledoc """
   Custom logger for telemetry events
 
@@ -12,41 +12,47 @@ defmodule Cannery.ErrorReporter do
     data =
       get_oban_job_data(meta, measure)
       |> Map.put(:stacktrace, Exception.format_stacktrace(stacktrace))
+      |> pretty_encode()
 
-    Logger.error(meta.reason, data: pretty_encode(data))
+    Logger.error(meta.reason, data: data)
   end
 
   def handle_event([:oban, :job, :start], measure, meta, _config) do
-    Logger.info("Started oban job", data: get_oban_job_data(meta, measure) |> pretty_encode())
+    data = get_oban_job_data(meta, measure) |> pretty_encode()
+    Logger.info("Started oban job", data: data)
   end
 
   def handle_event([:oban, :job, :stop], measure, meta, _config) do
-    Logger.info("Finished oban job", data: get_oban_job_data(meta, measure) |> pretty_encode())
+    data = get_oban_job_data(meta, measure) |> pretty_encode()
+    Logger.info("Finished oban job", data: data)
   end
 
   def handle_event([:oban, :job, unhandled_event], measure, meta, _config) do
     data =
       get_oban_job_data(meta, measure)
       |> Map.put(:event, unhandled_event)
+      |> pretty_encode()
 
-    Logger.warning("Unhandled oban job event", data: pretty_encode(data))
+    Logger.warning("Unhandled oban job event", data: data)
   end
 
   def handle_event(unhandled_event, measure, meta, config) do
-    data = %{
+    data =
+      pretty_encode(%{
         event: unhandled_event,
         meta: meta,
         measurements: measure,
         config: config
-    }
+      })
 
-    Logger.warning("Unhandled telemetry event", data: pretty_encode(data))
+    Logger.warning("Unhandled telemetry event", data: data)
   end
 
   defp get_oban_job_data(%{job: job}, measure) do
-    job
-    |> Map.take([:id, :args, :meta, :queue, :worker])
-    |> Map.merge(measure)
+    %{
+      job: job |> Map.take([:id, :args, :meta, :queue, :worker]),
+      measurements: measure
+    }
   end
 
   defp pretty_encode(data) do