Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Add telemetry to tracker script generation (#5437)
Karl-Aksel Puulmann692fd30a3e1c
diff --git a/lib/plausible/telemetry/plausible_metrics.ex b/lib/plausible/telemetry/plausible_metrics.exindex 49c6dce3c8..84ac365f57 100644--- a/lib/plausible/telemetry/plausible_metrics.ex+++ b/lib/plausible/telemetry/plausible_metrics.ex@@ -109,6 +109,18 @@ defmodule Plausible.PromEx.Plugins.PlausibleMetrics do],unit: {:native, :microsecond},measurement: :duration+ ),+ counter(+ metric_prefix ++ [:tracker_script, :request, :v2],+ event_name: PlausibleWeb.TrackerPlug.telemetry_event(:v2),+ tags: [:status],+ tag_values: &%{status: &1.status}+ ),+ counter(+ metric_prefix ++ [:tracker_script, :request, :legacy],+ event_name: PlausibleWeb.TrackerPlug.telemetry_event(:legacy),+ tags: [:status],+ tag_values: &%{status: &1.status})])diff --git a/lib/plausible_web/plugs/tracker_plug.ex b/lib/plausible_web/plugs/tracker_plug.exindex abde702779..508bed30ab 100644--- a/lib/plausible_web/plugs/tracker_plug.ex+++ b/lib/plausible_web/plugs/tracker_plug.ex@@ -59,6 +59,8 @@ defmodule PlausibleWeb.TrackerPlug doendend+ def telemetry_event(name), do: [:plausible, :tracker_script, :request, name]+defp request_tracker_script(tag, conn) dotracker_script_configuration =Plausible.Repo.one(@@ -68,6 +70,12 @@ defmodule PlausibleWeb.TrackerPlug doif tracker_script_configuration doscript_tag = PlausibleWeb.Tracker.plausible_main_script_tag(tracker_script_configuration)+ :telemetry.execute(+ telemetry_event(:v2),+ %{},+ %{status: 200}+ )+conn|> put_resp_header("content-type", "application/javascript")|> put_resp_header("x-content-type-options", "nosniff")@@ -80,6 +88,12 @@ defmodule PlausibleWeb.TrackerPlug do|> send_resp(200, script_tag)|> halt()else+ :telemetry.execute(+ telemetry_event(:v2),+ %{},+ %{status: 404}+ )+conn|> send_resp(404, "Not found")|> halt()@@ -90,6 +104,12 @@ defmodule PlausibleWeb.TrackerPlug doif filename && MapSet.member?(files_available, filename) dolocation = Application.app_dir(:plausible, "priv/tracker/js/" <> filename)+ :telemetry.execute(+ telemetry_event(:legacy),+ %{},+ %{status: 200}+ )+conn|> put_resp_header("content-type", "application/javascript")|> put_resp_header("x-content-type-options", "nosniff")