Add timezone to Oban Integration (#862)

Co-authored-by: Andrea Leopardi <[email protected]>

Author: savhappy

lib/sentry/integrations/oban/cron.ex

@@ -89,6 +89,7 @@ defmodule Sentry.Integrations.Oban.Cron do
 
   defp job_to_check_in_opts(job, config) when is_struct(job, Oban.Job) do
     monitor_config_opts = Sentry.Config.integrations()[:monitor_config_defaults]
+    monitor_config_opts = maybe_put_timezone_option(monitor_config_opts, job)
 
     monitor_slug =
       case config[:monitor_slug_generator] do
@@ -170,6 +171,14 @@ defmodule Sentry.Integrations.Oban.Cron do
     end
   end
 
+  defp maybe_put_timezone_option(opts, %{meta: %{"cron_tz" => tz}} = _job) do
+    Keyword.put(opts, :timezone, tz)
+  end
+
+  defp maybe_put_timezone_option(opts, _job) do
+    opts
+  end
+
   defp duration_in_seconds(%{duration: duration} = _measurements) do
     duration
     |> System.convert_time_unit(:native, :millisecond)

test/sentry/integrations/oban/cron_test.exs

@@ -135,7 +135,8 @@ defmodule Sentry.Integrations.Oban.CronTest do
                    "type" => "interval",
                    "value" => 1,
                    "unit" => unquote(expected_unit)
-                 }
+                 },
+                 "timezone" => "Europe/Rome"
                }
 
         send(test_pid, {ref, :done})
@@ -150,7 +151,7 @@ defmodule Sentry.Integrations.Oban.CronTest do
         job: %Oban.Job{
           worker: "Sentry.MyWorker",
           id: 942,
-          meta: %{"cron" => true, "cron_expr" => unquote(frequency)}
+          meta: %{"cron" => true, "cron_expr" => unquote(frequency), "cron_tz" => "Europe/Rome"}
         }
       })
 
@@ -179,7 +180,8 @@ defmodule Sentry.Integrations.Oban.CronTest do
                "schedule" => %{
                  "type" => "crontab",
                  "value" => "* 1 1 1 1"
-               }
+               },
+               "timezone" => "Europe/Rome"
              }
 
       send(test_pid, {ref, :done})
@@ -194,7 +196,7 @@ defmodule Sentry.Integrations.Oban.CronTest do
       job: %Oban.Job{
         worker: "Sentry.MyWorker",
         id: 942,
-        meta: %{"cron" => true, "cron_expr" => "* 1 1 1 1"}
+        meta: %{"cron" => true, "cron_expr" => "* 1 1 1 1", "cron_tz" => "Europe/Rome"}
       }
     })
 
@@ -226,7 +228,8 @@ defmodule Sentry.Integrations.Oban.CronTest do
                "schedule" => %{
                  "type" => "crontab",
                  "value" => "* 1 1 1 1"
-               }
+               },
+               "timezone" => "Europe/Rome"
              }
 
       send(test_pid, {ref, :done})
@@ -239,7 +242,7 @@ defmodule Sentry.Integrations.Oban.CronTest do
       job: %Oban.Job{
         worker: "Sentry.MyWorker",
         id: 942,
-        meta: %{"cron" => true, "cron_expr" => "* 1 1 1 1"}
+        meta: %{"cron" => true, "cron_expr" => "* 1 1 1 1", "cron_tz" => "Europe/Rome"}
       }
     })
 
@@ -265,7 +268,7 @@ defmodule Sentry.Integrations.Oban.CronTest do
       job: %Oban.Job{
         worker: "Sentry.MyWorker",
         id: 123,
-        meta: %{"cron" => true, "cron_expr" => "@daily"}
+        meta: %{"cron" => true, "cron_expr" => "@daily", "cron_tz" => "Europe/Rome"}
       }
     })
 
@@ -293,14 +296,14 @@ defmodule Sentry.Integrations.Oban.CronTest do
         worker: "Sentry.ClientWorker",
         id: 123,
         args: %{"client" => client_name},
-        meta: %{"cron" => true, "cron_expr" => "@daily"}
+        meta: %{"cron" => true, "cron_expr" => "@daily", "cron_tz" => "Europe/Rome"}
       }
     })
 
     assert_receive {^ref, :done}, 1000
   end
 
-  test "custom options", %{bypass: bypass} do
+  test "custom options overide job metadata", %{bypass: bypass} do
     test_pid = self()
     ref = make_ref()
 
@@ -339,7 +342,7 @@ defmodule Sentry.Integrations.Oban.CronTest do
         worker: inspect(WorkerWithCustomOptions),
         id: 123,
         args: %{},
-        meta: %{"cron" => true, "cron_expr" => "@daily"}
+        meta: %{"cron" => true, "cron_expr" => "@daily", "cron_tz" => "America/Chicago"}
       }
     })