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
Otel improvements (#6014)
Cenk Kücükebb0b053553b
diff --git a/config/runtime.exs b/config/runtime.exsindex 019a2e5229..0d2e628601 100644--- a/config/runtime.exs+++ b/config/runtime.exs@@ -234,10 +234,8 @@ help_scout_app_secret = get_var_from_path_or_env(config_dir, "HELP_SCOUT_APP_SEChelp_scout_signature_key = get_var_from_path_or_env(config_dir, "HELP_SCOUT_SIGNATURE_KEY")help_scout_vault_key = get_var_from_path_or_env(config_dir, "HELP_SCOUT_VAULT_KEY")-{otel_sampler_ratio, ""} =- config_dir- |> get_var_from_path_or_env("OTEL_SAMPLER_RATIO", "0.5")- |> Float.parse()+otlp_endpoint =+ get_var_from_path_or_env(config_dir, "OTLP_ENDPOINT", "https://api.honeycomb.io:443")geolite2_country_db =get_var_from_path_or_env(@@ -942,13 +940,12 @@ endif honeycomb_api_key && honeycomb_dataset doconfig :opentelemetry,resource: Plausible.OpenTelemetry.resource_attributes(runtime_metadata),- sampler: {Plausible.OpenTelemetry.Sampler, %{ratio: otel_sampler_ratio}},span_processor: :batch,traces_exporter: :otlpconfig :opentelemetry_exporter,otlp_protocol: :grpc,- otlp_endpoint: "https://api.honeycomb.io:443",+ otlp_endpoint: otlp_endpoint,otlp_headers: [{"x-honeycomb-team", honeycomb_api_key},{"x-honeycomb-dataset", honeycomb_dataset}diff --git a/lib/plausible/open_telemetry/sampler.ex b/lib/plausible/open_telemetry/sampler.exdeleted file mode 100644index 39ba762f4a..0000000000--- a/lib/plausible/open_telemetry/sampler.ex+++ /dev/null@@ -1,60 +0,0 @@-defmodule Plausible.OpenTelemetry.Sampler do- @moduledoc """- [Custom OpenTelemetry sampler](https://hexdocs.pm/opentelemetry/readme.html#samplers)- implementation that ignores particular traces to reduce noise. Ingestion- HTTP requests and queries to Oban tables are ignored, for example.-- For non-ignored traces, implements trace ID ratio-based sampling following the method- from [built-in sampler](https://github.com/open-telemetry/opentelemetry-erlang/blob/main/apps/opentelemetry/src/otel_sampler_trace_id_ratio_based.erl).- """-- import Bitwise, only: [&&&: 2]-- # mask for extracting first 64 bits of trace ID- # 2^63 - 1- @max_value 9_223_372_036_854_775_807-- @behaviour :otel_sampler- require OpenTelemetry.Tracer, as: Tracer-- @routes_to_ignore ["/api/event", "/api/event/", "/api//event", "//api/event"]- @tables_to_ignore ["oban_jobs", "site_imports"]-- @impl true- def setup(%{ratio: ratio}) when is_number(ratio) do- %{ratio: ratio, id_upper_bound: ratio * @max_value}- end-- @impl true- def description(%{ratio: ratio}) do- "#{inspect(__MODULE__)}{ratio=#{ratio}}"- end-- @impl true- def should_sample(context, trace_id, _links, _name, _kind, attributes, config) do- tracestate = context |> Tracer.current_span_ctx() |> OpenTelemetry.Span.tracestate()-- case attributes do- %{"db.instance": _db, source: source} when source in @tables_to_ignore ->- {:drop, [], tracestate}-- %{"http.target": http_target} when http_target in @routes_to_ignore ->- {:drop, [], tracestate}-- _any ->- {decide(trace_id, config.id_upper_bound), [], tracestate}- end- end-- defp decide(trace_id, id_upper_bound) when is_integer(trace_id) and trace_id > 0 do- lower_64_bits = trace_id &&& @max_value-- if abs(lower_64_bits) < id_upper_bound do- :record_and_sample- else- :drop- end- end-- defp decide(_, _), do: :drop-end