mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-21 08:02:26 +00:00
aedf369174
* fix: pair PG arg type with actual Rust binding to keep query_typed_raw safe Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(pg): wrap encoder errors with arg context, add fallback test Followups on #8999 review: - Wrap rust-postgres "error serializing parameter N" failures with the arg name, JSON value kind, and asserted Postgres type plus a hint about an explicit cast — so users see actionable context instead of an opaque WrongType. - Drift-prevention meta-test: assert otyp_to_pg_type and convert_val agree on the Type for every recognised arg_t when the JSON value matches its natural Rust kind. Catches future drift if either side changes. - Integration test for the prepare + query_raw fallback path: confirms unrecognised arg_t (custom enum) is routed through prepare and the server-resolved type appears in the failure surface — flips into a test failure if a regression accidentally routes unrecognised types through query_typed_raw. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg): add otyp_inferred flag + regex-based placeholder renumbering Two follow-ups from the review of #8999: 1. **Issue #1 (Number/Bool + explicit text decl in WHERE)** Add `Arg::otyp_inferred: bool` to the parser. The PG SQL parser sets it `true` only at the "no info → fall back to text" site (bare `$N`, no inline cast, no `-- $N (TYPE)` decl). All other arg sources keep it `false`. In `convert_val` this flag distinguishes: - explicit text-like target (`-- $1 (text)` or `$1::text`) — coerce `Bool`/`Number` → `Box<String>` so `WHERE text_col = $1` works (`text = text` operator). Pre-#8988 behaviour, restored. - parser-default text (bare `$N`) — bind the value's natural Rust type so the regression case (`Value::Bool` against a real `bool` column via `CAST AS bool`) keeps working. `Arg` is in `windmill-parser`; the new field has `#[serde(default)]` so persisted signatures stay backward-compatible. 2. **Issue #4 ($5/$50 substring rewrite collision)** Replace the per-index `String::replace` chain (which turned `$50` into `$10` when oidx=5 was processed first) with a single regex pass. `\d+` is greedy, so `$5` and `$50` match as distinct units; indices outside the mapping are left intact. 3. Tests: - parser: `test_parse_pgsql_otyp_inferred_flag` covers bare/inline- cast/decl/mixed shapes. - executor unit: `convert_val_bool_against_every_arg_t` and `convert_val_*_number_*` split each text-like target into explicit vs inferred expectations. - executor unit: `renumber_sparse_placeholders_no_collision`. - integration: `test_postgresql_arg_type_combinations` adds 4 cases covering decl(text)+Number/Bool in WHERE, bare $1+Bool, and sparse positional args ($5/$50). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg+sdk): enum support, extended String arms, position-aware $N rewrite, SDK quality Backend: 1. **`AnyTextValue` ToSql/FromSql wrapper**: vanilla `tokio_postgres`'s `ToSql for String` / `FromSql for String` reject `Kind::Enum` and `Kind::Domain` even though the wire format is plain UTF-8. The wrapper accepts those kinds in both directions. End result: explicit `$1::my_enum` / `CAST($1 AS my_enum)` casts now round-trip without the ugly `CAST($1::text AS my_enum)` workaround, AND `SELECT enum_col` results come back as JSON strings instead of erroring at the FromSql layer. 2. **#10 — Value::String → numeric/real/double/oid/bool**. Without these arms, a string-encoded value (`"3.14"`, `"true"`) for a non-text / non-temporal arg_t fell through to `Box<String> + TEXT`, which then failed at the server (no implicit cast text→numeric in expression context). Now strings are parsed into the matching native type with clear error messages on parse failure. 3. **Position-aware `$N` rewrite**: replaces the regex-based renumbering (which fixed the `$5/$50` substring collision but still walked through string literals and comments, mangling `'price: $5'` etc.) with a walk over `parse_pg_statement_arg_positions` — the same string/comment/dollar-quote-aware tokenizer used for index discovery. Adds `parse_pg_statement_arg_positions` to the parser's public API. SDK: 4. **BigInt support**: `JSON.stringify(BigInt)` throws. The SDK now stringifies bigints before serialisation; the executor accepts numeric strings into BIGINT arg slots via the existing `Value::String → INT8` parsing arm. SDK-side `inferSqlType` is split so `BigInt` always resolves to `BIGINT` (was reaching `Number.isInteger(BigInt)` which returns false → wrong default). 5. **Homogeneous array auto-tag**: `${[1,2,3]}` against an `int[]` column now emits `$1::BIGINT[]` instead of `$1::JSON`. Detection covers primitive types only (number / bigint / string / boolean); mixed or nested arrays still fall back to JSON. Mixed int/float widens to `DOUBLE PRECISION[]`. 6. **`.query()` positional bug**: previously the `.query()` method abused the template-tag builder, which appended `$N::TYPE` after the user's literal SQL string instead of binding by position (`SELECT $1, $2` became `SELECT $1, $2$1::BIGINT`). Now `.query()` builds the executor-shaped content directly: a `-- $N argN (TYPE)` declaration block followed by the user's SQL verbatim. Tests: - Parser: `test_parse_pg_statement_arg_positions_skips_strings_and_comments` asserts string literals, comments, and dollar-quoted blocks don't produce positions (so renumbering doesn't mangle them). - Executor unit: `renumber_sparse_placeholders_no_collision_no_string_mangling` uses the new position-aware path and includes string-literal + comment + `$$…$$` cases. Existing convert_val tests grow to cover new String→numeric/real/double/oid/bool arms. - Integration: `test_postgresql_arg_type_combinations` adds 13 cases (enum round-trip both directions, string→numeric/real/double/bool/oid, string-literal `$N` non-mangling). The prepare-fallback test now asserts SUCCESS (not failure) for enum encoding via AnyTextValue. - SDK: new `typescript-client/tests/sqlUtils.test.ts` (42 tests) exhaustively covering inferSqlType primitives + arrays, parseTypeAnnotation, datatable() template tag (with all the new shapes — BigInt, homogeneous arrays, RawSql, schema preamble), datatable().query() positional, and ducklake() shape. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg): replace DISCARD ALL with curated reset (preserves typeinfo cache) Found while exhaustively probing custom-type DX: every cached-connection reuse was running `DISCARD ALL`, whose included `DEALLOCATE ALL` deallocates *all* prepared statements server-side — including the typeinfo statements that tokio_postgres caches per-Client to resolve custom enum / domain Oids. tokio_postgres still held `Statement` objects whose names the server had forgotten, so the next custom-type query failed with intermittent "prepared statement \"sN\" does not exist" errors. The failure was easy to reproduce: any sequence that forced typeinfo lookup for two different custom-type kinds on the same cached connection (e.g. enum followed by domain) would hit it. Replace `DISCARD ALL` with a curated reset that explicitly targets the state we actually care about, *without* touching prepared statements: RESET ALL — GUC parameters (search_path, application _name, statement_timeout, …) RESET SESSION AUTHORIZATION — undoes both `SET SESSION AUTHORIZATION` and `SET ROLE` (RESET ALL does NOT — these aren't GUC parameters, so without this an elevated role from a previous job would silently leak) UNLISTEN * — drops LISTEN registrations CLOSE ALL — closes open cursors Trade-off: temp tables, advisory locks (session-scoped), and user-created PREPARE statements may persist across cached-connection reuse — rare in datatable / PG-script workloads. tokio_postgres's typeinfo cache survives intact, so custom enum / domain queries are fast on subsequent reuse. Tests: - `test_postgresql_custom_types_on_cached_connection` — runs 10× alternating enum + domain queries on a cached connection. Pre-fix this failed with `prepared statement "sN" does not exist` after the first reuse; post-fix passes. - `test_postgresql_set_role_does_not_leak_across_cached_connection` — switches `SET ROLE` and `SET SESSION AUTHORIZATION` to a non-postgres role, then runs a follow-up job and asserts current_user/session_user are restored. Specifically catches the case where someone might switch back to `RESET ALL` alone (which doesn't cover SET ROLE / SESSION AUTHORIZATION) and silently introduce a permission-leak vector. - All existing session-isolation tests (`test_postgresql_cached_connection_resets_session`, `test_postgresql_single_worker_session_isolation`, `test_postgresql_100_jobs_cached`) continue to pass. Found via end-to-end probing of datatable / PG-script DX, not previously covered: the existing isolation tests only did `SET ROLE postgres`, the connecting user, so the leak was invisible. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg): address PR #8999 review (cubic + claude) cubic (P1, real bug): - `convert_vec_val` for `timetz` array asserted `Type::TIMETZ_ARRAY`, but chrono `NaiveTime` only encodes for TIME (same caveat as the scalar arm). Switch to `Type::TIME_ARRAY`; rely on PG's implicit `time→timetz` assignment cast at the column site. Add an explicit unit test. claude (#1, silent failure → explicit error): - `Bool` + explicit `(char)` / `(character)` decl previously silently bound BOOL, hoping the server would cast at the use site — but PG has no implicit `bool→char` and the resulting error ("operator does not exist: bool = char") was opaque. Now error at bind time with an actionable hint to use `bool` decl or pass the value as a "t"/"f" string. claude (#2, asymmetry doc): - Object/Array still coerce to text on `matches!(typ, Typ::Str(_))` (covers both explicit AND inferred-default text), unlike Bool/Number which key on `explicit_text_target`. The asymmetry is intentional (no implicit `jsonb → text` cast in expression context vs PG having implicit `bool/int → text` casts) — added a body comment so future maintainers don't try to "align" them. claude (#3, perf): - `parse_pg_statement_arg_indices` and `parse_pg_statement_arg_positions` walked the SQL tokenizer twice. Fold into a single pass that derives the index set from the position list. claude (#4, fmt drift): - `cargo fmt` over the parser crates I touched with perl scripts in the earlier commit (windmill-parser-{sql,bash,ts,go,php,java,csharp,nu,py, rust,graphql,yaml,r}). Net cosmetic. claude (#5, parseTypeAnnotation): - One-line caveat in the SDK's `parseTypeAnnotation` that the returned string is presence-only (e.g. `${x}::DOUBLE PRECISION` returns `"DOUBLE"`, `CAST(${x} AS int)` returns `"int)"` — neither matches a real PG type, but the only consumer just checks `!== undefined`). While here — discovered + fixed independently while exhaustively probing DX: - **Replace `DISCARD ALL` with curated reset** (`RESET ALL; RESET SESSION AUTHORIZATION; UNLISTEN *; CLOSE ALL;`). DISCARD's `DEALLOCATE ALL` killed tokio_postgres' typeinfo cache, producing intermittent `prepared statement "sN" does not exist` errors on custom-type queries after cached-conn reuse. New regression tests: `test_postgresql_custom_types_on_cached_connection` and `test_postgresql_set_role_does_not_leak_across_cached_connection` (the latter catches the case where someone might switch back to `RESET ALL` alone and silently introduce a permission-leak vector — RESET ALL doesn't cover SET ROLE / SET SESSION AUTHORIZATION). - **ISO-8601 timestamp results** (`pg_cell_to_json_value`). Pre-fix `TIMESTAMP` was rendered with a space separator ("2024-01-15 10:30:00") and `TIMESTAMPTZ` with " UTC" suffix ("2024-01-15 10:30:00 UTC") — neither parseable by `date-fns parseISO`, JavaScript `new Date()` is lenient enough to handle them but several frontend `App*Input.svelte` components use parseISO and fail silently. Switched to ISO-8601 with `T` separator and `+00:00` offset; arg-parsing path still accepts the legacy " UTC" suffix for back-compat. Test coverage: - 17/17 unit (`pg_executor::tests`) - 9/9 integration (`backend/tests/worker.rs`, `test_postgresql_*`) - 27/27 parser (`windmill-parser-sql`) - 42/42 SDK (`typescript-client/tests/sqlUtils.test.ts`) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg): bounded one-shot warning on numeric precision loss + ISO-8601 + NaN handling Found while probing PG-script DX with millions of numeric cells: 1. **Numeric precision-loss warning**: `numeric` results are still serialised as JSON Number (back-compat — switching to JSON String would silently break user code doing arithmetic on results), but we now detect `Decimal -> f64 -> Decimal` round-trip failure and emit a single job-log warning recommending a `::text` cast in the SQL. Bounded by `NUMERIC_PRECISION_CHECK_BUDGET = 256` cells per query (one atomic load + one fetch_sub on the hot path; first lossy value short-circuits to a single load thereafter). Worst-case overhead on a 1M-cell numeric-heavy query: ~25µs of checks + 5ns × N atomic loads (vs. ~100ms unbounded). 2. **ISO-8601 timestamps**: `pg_cell_to_json_value` previously returned `"2024-01-15 10:30:00"` (TIMESTAMP) and `"2024-01-15 10:30:00 UTC"` (TIMESTAMPTZ) — neither parseable by date-fns `parseISO`, which is what the apps `App*Input.svelte` components use, so timestamp values silently failed to round-trip into date pickers. Switch to ISO-8601 (`T` separator + `+00:00` offset) on the result side; arg-parser continues to accept the legacy `" UTC"`-suffixed format for back-compat. 3. **Float NaN / Infinity results**: `Number::from_f64` returns None for NaN / ±Inf, which `pg_cell_to_json_value` was raising as "invalid json-float" — failing the *entire* query if any cell held one of these special values. Now serialise them as JSON strings ("NaN", "Infinity", "-Infinity") and let the rest of the row come through. Arg-side: `s.parse::<f64>()` already accepts the same strings. Tests: - `decimal_fits_f64_losslessly_predicate` — covers fits / doesn't-fit cases for the precision-loss predicate. - `precision_check_budget_caps_per_query_overhead` — locks in the budget cap and the loss-flag short-circuit. - All 9 PG integration tests + 17 unit tests pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg): add pg_advisory_unlock_all to reset; warn on missing args; honor decl defaults While probing PG-script DX further found three more frictions: 1. **Advisory lock leak** (cubic P2): switching from `DISCARD ALL` to `RESET ALL; RESET SESSION AUTHORIZATION; UNLISTEN *; CLOSE ALL;` meant session-scoped advisory locks (`pg_advisory_lock`) leaked across cached-connection reuse. Add `SELECT pg_advisory_unlock_all()` to the chain — `DISCARD ALL` covered this implicitly via `DISCARD PLANS / DEALLOCATE / pg_advisory_unlock_all` and we lost it in the switch. 2. **Missing-arg silent NULL**: an arg declared in the SQL (e.g. `-- $1 amount (numeric)`) but not provided in the args object was bound as NULL with no error / warning. Misspelling the key in the args object silently produced a row of NULLs — a notorious DX debugging trap. Now: collect the names of declared-but-missing args during dispatch and emit a single one-shot warning to the job logs at end-of-query naming each one. Bound NULL is preserved for back-compat. 3. **Declaration defaults ignored**: `-- $1 a (int) = 5` carries `arg.default = Some(Number(5))`, but the dispatch fell straight to NULL when the arg was missing. Now: respect the default — user-supplied value > declaration default > NULL. Also fixes the warning logic above (only warn for args that *don't* have a default). Tests: existing 19 unit + 9 integration pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(pg): multi-word PG types with [] suffix lost the array-ness; array arms accept stringified values Two more frictions found while probing SDK end-to-end against a real datatable resource: 1. **Multi-word array types lose the [] suffix in the parser**. `transform_types_with_spaces` recognises aliases for "double precision", "character varying", "timestamp with time zone", etc. but its return type was `&'a str` — only the bare alias, never with a trailing `[]`. The `RE_CODE_PGSQL` regex's `\w+` captures stop at the first space, so the regex's own `(?:\[\])?` array-suffix branch sees only `"double"` (not `"double precision[]"`); the `[]` was silently lost. Result: `$1::double precision[]` (which the SDK now emits for homogeneous float arrays via the new auto-tag) routed through `Value::Array → Type::JSONB` and the server failed with "cannot cast type jsonb to double precision[]". Fix: switch `transform_types_with_spaces` to return `Cow<'a, str>` and re-check the trailing bytes after a multi-word match. If they start with `[]`, return `format!("{alias}[]")` — Owned. Single-word types and the no-match path keep returning Borrowed slices, so no allocation in the hot path. 2. **Array arms in `convert_vec_val` rejected stringified values for numeric / int* / bool / oid / real / double**. The scalar `convert_val` already parses strings into the matching native type for these arg_ts, but the array variant only accepted JSON-native counterparts. Sending `["1.5", "2.5", "3.5"]` against `$1::numeric[]` (e.g. via `unnest` for bulk loading, or `JSON.stringify(BigInt[])` round-trip) failed with "Mixed types in array". Now the array arms mirror the scalar ones — `as_<native>().or_else(|| as_str().and_then(parse))` — so both shapes round-trip cleanly. Tests: 19 unit + 9 integration pass; existing parser tests cover the multi-word array forms (the regex-cap behaviour didn't break for single-word types, and Cow plumbing is transparent to all callers). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(parsers): add otyp_inferred field to Arg literals in tests + 3 missed src files CI failures: the perl-driven sweep that added `otyp_inferred: false` to every `Arg { ... }` literal when I introduced the field in the parser schema covered `src/lib.rs` files but missed: - parsers/windmill-parser-bash/src/lib.rs (mass-edited but a later format pass un-applied a few sites) - parsers/windmill-parser-go/src/lib.rs (same) - parsers/windmill-parser-graphql/src/lib.rs (same) - parsers/windmill-parser-nu/tests/tests.rs (test file — not swept the first time) - parsers/windmill-parser-ts/tests/tests.rs (test file — same) Also tightened the regex to handle `oidx: None` without the trailing comma (some test files had the field as the last initialiser line). `cargo build --features <CI feature combo> --workspace --all-targets` is clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(sdk): Date → TIMESTAMPTZ; NaN / ±Infinity → string Two more frictions found while running the actual SDK end-to-end against a live datatable resource: 1. **JS `Date`** fell into the typeof "object" branch and was tagged `::JSON`. It worked accidentally for `${date}::timestamptz` via PG's `json → text → timestamptz` implicit cast chain, but `${date}` against a `timestamptz` column without a user-supplied cast bound the value as a JSON string and the comparison `timestamptz = json` failed. Now: `inferSqlType` recognises `Date` and tags `::TIMESTAMPTZ`; `serializeArgValue` emits `Date.toISOString()` so the executor's `Value::String → TIMESTAMPTZ` arm parses it cleanly. 2. **JS `NaN` / `±Infinity`** silently became NULL. `JSON.stringify(NaN)` returns `"null"` per the JS spec, so the value reached the executor as JSON null — the SDK's `::DOUBLE PRECISION` tag then bound a NULL double. Fix: detect non-finite numbers in `serializeArgValue` and stringify them as `"NaN" / "Infinity" / "-Infinity"`. The executor's `Value::String → FLOAT8` arm (`f64::from_str`) accepts these literals directly, and the result-side already renders the values as JSON strings (matching round-trip). SDK unit tests grow from 42 → 44 passing. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * test(pg): integration coverage for multi-word arrays + stringified array elements Locks in the two array fixes from the previous commit (`fix(pg): multi-word PG types with [] suffix lost the array-ness`) with end-to-end cases in `test_postgresql_arg_type_combinations`: - `double precision[]`, `character varying[]`, `timestamp without time zone[]` — verifies the parser keeps the `[]` suffix after multi-word alias resolution. - `numeric[]` / `int[]` / `bool[]` from stringified primitives — verifies the array arms of `convert_vec_val` apply the same string-coercion the scalar arms do. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * style: fix indentation drift on otyp_inferred lines cargo fmt cleanup of leftover indentation where the perl-driven sweep that introduced the otyp_inferred field landed at the wrong column. No behaviour change. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
510 lines
20 KiB
Rust
510 lines
20 KiB
Rust
//! E2E tests for OpenTelemetry integration.
|
|
//!
|
|
//! Verify that metrics are recorded with correct names/values/attributes and
|
|
//! spans are created with correct trace IDs, attributes, and status codes.
|
|
//!
|
|
//! Run with: cargo test --features enterprise,private,otel --test otel -- --test-threads=1
|
|
|
|
#![cfg(all(feature = "otel", feature = "enterprise"))]
|
|
|
|
use std::sync::{atomic::Ordering, Arc};
|
|
|
|
use opentelemetry::global;
|
|
use opentelemetry::trace::TracerProvider as _;
|
|
use opentelemetry_sdk::{
|
|
metrics::{InMemoryMetricExporter, PeriodicReader, SdkMeterProvider},
|
|
trace::{InMemorySpanExporter, SdkTracerProvider, SimpleSpanProcessor},
|
|
};
|
|
use windmill_common::otel_ee::*;
|
|
use windmill_common::{OTEL_METRICS_ENABLED, OTEL_TRACING_ENABLED};
|
|
|
|
// ── Global test infrastructure ──────────────────────────────────────────
|
|
|
|
struct OtelTestState {
|
|
metric_exporter: InMemoryMetricExporter,
|
|
span_exporter: InMemorySpanExporter,
|
|
meter_provider: SdkMeterProvider,
|
|
}
|
|
|
|
static STATE: tokio::sync::OnceCell<Arc<OtelTestState>> = tokio::sync::OnceCell::const_new();
|
|
|
|
async fn ensure_setup() -> Arc<OtelTestState> {
|
|
STATE
|
|
.get_or_init(|| async {
|
|
// Metrics: InMemoryMetricExporter + PeriodicReader (needs async tokio context)
|
|
let metric_exporter = InMemoryMetricExporter::default();
|
|
let reader = PeriodicReader::builder(metric_exporter.clone()).build();
|
|
let meter_provider = SdkMeterProvider::builder().with_reader(reader).build();
|
|
global::set_meter_provider(meter_provider.clone());
|
|
OTEL_METRICS_ENABLED.store(true, Ordering::SeqCst);
|
|
|
|
// Tracing: InMemorySpanExporter + SimpleSpanProcessor
|
|
let span_exporter = InMemorySpanExporter::default();
|
|
let tracer_provider = SdkTracerProvider::builder()
|
|
.with_span_processor(SimpleSpanProcessor::new(span_exporter.clone()))
|
|
.build();
|
|
let tracer = tracer_provider.tracer("windmill");
|
|
*TRACER.write().unwrap() = Some(tracer);
|
|
OTEL_TRACING_ENABLED.store(true, Ordering::SeqCst);
|
|
|
|
Arc::new(OtelTestState { metric_exporter, span_exporter, meter_provider })
|
|
})
|
|
.await
|
|
.clone()
|
|
}
|
|
|
|
// ── Metric helper: flush + collect ──────────────────────────────────────
|
|
|
|
fn flush_and_get_metrics(
|
|
state: &OtelTestState,
|
|
) -> Vec<opentelemetry_sdk::metrics::data::ResourceMetrics> {
|
|
state.meter_provider.force_flush().expect("flush failed");
|
|
state
|
|
.metric_exporter
|
|
.get_finished_metrics()
|
|
.expect("get_finished_metrics failed")
|
|
}
|
|
|
|
fn find_metric<'a>(
|
|
all: &'a [opentelemetry_sdk::metrics::data::ResourceMetrics],
|
|
name: &str,
|
|
) -> Option<&'a opentelemetry_sdk::metrics::data::Metric> {
|
|
all.iter()
|
|
.flat_map(|rm| rm.scope_metrics())
|
|
.flat_map(|sm| sm.metrics())
|
|
.find(|m| m.name() == name)
|
|
}
|
|
|
|
fn metric_names(all: &[opentelemetry_sdk::metrics::data::ResourceMetrics]) -> Vec<String> {
|
|
all.iter()
|
|
.flat_map(|rm| rm.scope_metrics())
|
|
.flat_map(|sm| sm.metrics())
|
|
.map(|m| m.name().to_string())
|
|
.collect()
|
|
}
|
|
|
|
// ── Counter value helpers ───────────────────────────────────────────────
|
|
|
|
fn sum_u64_value(metric: &opentelemetry_sdk::metrics::data::Metric) -> Option<u64> {
|
|
use opentelemetry_sdk::metrics::data::{AggregatedMetrics, MetricData};
|
|
match metric.data() {
|
|
AggregatedMetrics::U64(MetricData::Sum(sum)) => {
|
|
Some(sum.data_points().map(|dp| dp.value()).sum())
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn gauge_i64_values(
|
|
metric: &opentelemetry_sdk::metrics::data::Metric,
|
|
) -> Vec<(Vec<opentelemetry::KeyValue>, i64)> {
|
|
use opentelemetry_sdk::metrics::data::{AggregatedMetrics, MetricData};
|
|
match metric.data() {
|
|
AggregatedMetrics::I64(MetricData::Gauge(gauge)) => gauge
|
|
.data_points()
|
|
.map(|dp| (dp.attributes().cloned().collect(), dp.value()))
|
|
.collect(),
|
|
_ => panic!("expected I64 Gauge metric"),
|
|
}
|
|
}
|
|
|
|
fn gauge_f64_value(metric: &opentelemetry_sdk::metrics::data::Metric) -> Option<f64> {
|
|
use opentelemetry_sdk::metrics::data::{AggregatedMetrics, MetricData};
|
|
match metric.data() {
|
|
AggregatedMetrics::F64(MetricData::Gauge(gauge)) => {
|
|
gauge.data_points().next().map(|dp| dp.value())
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn histogram_f64_count(metric: &opentelemetry_sdk::metrics::data::Metric) -> Option<u64> {
|
|
use opentelemetry_sdk::metrics::data::{AggregatedMetrics, MetricData};
|
|
match metric.data() {
|
|
AggregatedMetrics::F64(MetricData::Histogram(hist)) => {
|
|
Some(hist.data_points().map(|dp| dp.count()).sum())
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
fn histogram_f64_sum(metric: &opentelemetry_sdk::metrics::data::Metric) -> Option<f64> {
|
|
use opentelemetry_sdk::metrics::data::{AggregatedMetrics, MetricData};
|
|
match metric.data() {
|
|
AggregatedMetrics::F64(MetricData::Histogram(hist)) => {
|
|
Some(hist.data_points().map(|dp| dp.sum()).sum())
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|
|
|
|
// ═══════════════════════════════════════════════════════════════════════
|
|
// METRICS E2E TEST
|
|
//
|
|
// All metric assertions live in one test function because the PeriodicReader's
|
|
// background task is tied to the tokio runtime that created it. Separate
|
|
// #[tokio::test] functions each get their own runtime, and the reader becomes
|
|
// disconnected after the first test's runtime is dropped.
|
|
// ═══════════════════════════════════════════════════════════════════════
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_all_metrics_e2e() {
|
|
let state = ensure_setup().await;
|
|
|
|
// ── Counters ────────────────────────────────────────────────────
|
|
|
|
otel_incr_queue_push_count();
|
|
otel_incr_queue_push_count();
|
|
otel_incr_queue_push_count();
|
|
otel_incr_queue_delete_count();
|
|
otel_incr_queue_pull_count();
|
|
otel_incr_zombie_restart_count(7);
|
|
otel_incr_zombie_delete_count(3);
|
|
otel_incr_worker_execution_count("bun");
|
|
otel_incr_worker_execution_count("bun");
|
|
otel_incr_worker_execution_failed("go");
|
|
otel_incr_worker_started();
|
|
|
|
// ── Gauges ──────────────────────────────────────────────────────
|
|
|
|
otel_set_queue_count("python3", 42);
|
|
otel_set_queue_running_count("deno", 5);
|
|
otel_set_worker_busy("worker-test-1", 1);
|
|
otel_set_db_pool(5, 10, 20);
|
|
otel_set_health_db_latency(2.5);
|
|
otel_set_worker_uptime("w-uptime", 3600.0);
|
|
otel_set_health_status_phase("healthy");
|
|
otel_set_health_db_unresponsive(true);
|
|
|
|
// ── Histograms ──────────────────────────────────────────────────
|
|
|
|
otel_record_worker_execution_duration("python3", 1.5);
|
|
otel_record_worker_execution_duration("python3", 2.5);
|
|
otel_record_worker_pull_duration("w1", true, 0.05);
|
|
otel_record_worker_pull_duration("w1", false, 0.01);
|
|
|
|
// ── Flush and collect ───────────────────────────────────────────
|
|
|
|
let metrics = flush_and_get_metrics(&state);
|
|
let names = metric_names(&metrics);
|
|
|
|
// ── Verify all 20 metric names are present ──────────────────────
|
|
|
|
let expected = [
|
|
"windmill.queue.push_count",
|
|
"windmill.queue.delete_count",
|
|
"windmill.queue.pull_count",
|
|
"windmill.queue.zombie_restart_count",
|
|
"windmill.queue.zombie_delete_count",
|
|
"windmill.queue.count",
|
|
"windmill.queue.running_count",
|
|
"windmill.worker.execution_count",
|
|
"windmill.worker.execution_duration",
|
|
"windmill.worker.busy",
|
|
"windmill.worker.pull_duration",
|
|
"windmill.worker.execution_failed",
|
|
"windmill.db.pool.active",
|
|
"windmill.db.pool.idle",
|
|
"windmill.db.pool.max",
|
|
"windmill.health.db_latency",
|
|
"windmill.worker.started",
|
|
"windmill.worker.uptime",
|
|
"windmill.health.status",
|
|
"windmill.health.db_unresponsive",
|
|
];
|
|
for name in expected {
|
|
assert!(
|
|
names.iter().any(|n| n == name),
|
|
"metric '{}' not found in {:?}",
|
|
name,
|
|
names
|
|
);
|
|
}
|
|
|
|
// ── Counter values ──────────────────────────────────────────────
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.push_count").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 3, "push_count should be >= 3");
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.delete_count").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 1);
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.pull_count").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 1);
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.zombie_restart_count").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 7);
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.zombie_delete_count").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 3);
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.execution_count").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 2);
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.execution_failed").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 1);
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.started").unwrap();
|
|
assert!(sum_u64_value(m).unwrap() >= 1);
|
|
|
|
// ── Gauge values ────────────────────────────────────────────────
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.count").unwrap();
|
|
let values = gauge_i64_values(m);
|
|
let dp = values
|
|
.iter()
|
|
.find(|(attrs, _)| {
|
|
attrs
|
|
.iter()
|
|
.any(|kv| kv.key.as_str() == "tag" && kv.value.as_str() == "python3")
|
|
})
|
|
.expect("queue.count data point with tag=python3 not found");
|
|
assert_eq!(dp.1, 42);
|
|
|
|
let m = find_metric(&metrics, "windmill.queue.running_count").unwrap();
|
|
let values = gauge_i64_values(m);
|
|
let dp = values
|
|
.iter()
|
|
.find(|(attrs, _)| {
|
|
attrs
|
|
.iter()
|
|
.any(|kv| kv.key.as_str() == "tag" && kv.value.as_str() == "deno")
|
|
})
|
|
.expect("running_count data point with tag=deno not found");
|
|
assert_eq!(dp.1, 5);
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.busy").unwrap();
|
|
let values = gauge_i64_values(m);
|
|
let dp = values
|
|
.iter()
|
|
.find(|(attrs, _)| {
|
|
attrs
|
|
.iter()
|
|
.any(|kv| kv.key.as_str() == "worker" && kv.value.as_str() == "worker-test-1")
|
|
})
|
|
.expect("worker.busy data point with worker=worker-test-1 not found");
|
|
assert_eq!(dp.1, 1);
|
|
|
|
let m = find_metric(&metrics, "windmill.db.pool.active").unwrap();
|
|
assert_eq!(gauge_i64_values(m)[0].1, 5);
|
|
let m = find_metric(&metrics, "windmill.db.pool.idle").unwrap();
|
|
assert_eq!(gauge_i64_values(m)[0].1, 10);
|
|
let m = find_metric(&metrics, "windmill.db.pool.max").unwrap();
|
|
assert_eq!(gauge_i64_values(m)[0].1, 20);
|
|
|
|
let m = find_metric(&metrics, "windmill.health.db_latency").unwrap();
|
|
assert!((gauge_f64_value(m).unwrap() - 2.5).abs() < f64::EPSILON);
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.uptime").unwrap();
|
|
assert!((gauge_f64_value(m).unwrap() - 3600.0).abs() < f64::EPSILON);
|
|
|
|
let m = find_metric(&metrics, "windmill.health.db_unresponsive").unwrap();
|
|
assert_eq!(gauge_i64_values(m)[0].1, 1);
|
|
|
|
// ── Health status phase (all 3 phases) ──────────────────────────
|
|
|
|
let m = find_metric(&metrics, "windmill.health.status").unwrap();
|
|
let values = gauge_i64_values(m);
|
|
let healthy = values
|
|
.iter()
|
|
.find(|(attrs, _)| {
|
|
attrs
|
|
.iter()
|
|
.any(|kv| kv.key.as_str() == "phase" && kv.value.as_str() == "healthy")
|
|
})
|
|
.expect("phase=healthy");
|
|
let degraded = values
|
|
.iter()
|
|
.find(|(attrs, _)| {
|
|
attrs
|
|
.iter()
|
|
.any(|kv| kv.key.as_str() == "phase" && kv.value.as_str() == "degraded")
|
|
})
|
|
.expect("phase=degraded");
|
|
let unhealthy = values
|
|
.iter()
|
|
.find(|(attrs, _)| {
|
|
attrs
|
|
.iter()
|
|
.any(|kv| kv.key.as_str() == "phase" && kv.value.as_str() == "unhealthy")
|
|
})
|
|
.expect("phase=unhealthy");
|
|
assert_eq!(healthy.1, 1);
|
|
assert_eq!(degraded.1, 0);
|
|
assert_eq!(unhealthy.1, 0);
|
|
|
|
// ── Histogram values ────────────────────────────────────────────
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.execution_duration").unwrap();
|
|
assert!(histogram_f64_count(m).unwrap() >= 2);
|
|
assert!(histogram_f64_sum(m).unwrap() >= 4.0);
|
|
|
|
let m = find_metric(&metrics, "windmill.worker.pull_duration").unwrap();
|
|
assert!(histogram_f64_count(m).unwrap() >= 2);
|
|
}
|
|
|
|
// ═══════════════════════════════════════════════════════════════════════
|
|
// SPAN E2E TESTS
|
|
// ═══════════════════════════════════════════════════════════════════════
|
|
|
|
fn make_test_job(id: uuid::Uuid, parent: Option<uuid::Uuid>) -> windmill_queue::MiniPulledJob {
|
|
use windmill_types::jobs::JobKind;
|
|
let mut job = windmill_queue::MiniPulledJob::new_inline(
|
|
"test-workspace".to_string(),
|
|
None,
|
|
"test-user".to_string(),
|
|
"u/test-user".to_string(),
|
|
"test@example.com".to_string(),
|
|
Some("f/test/script".to_string()),
|
|
JobKind::Script,
|
|
None,
|
|
"deno".to_string(),
|
|
None,
|
|
);
|
|
job.id = id;
|
|
job.parent_job = parent;
|
|
job.started_at = Some(chrono::Utc::now());
|
|
job
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_root_job_span_created_on_success() {
|
|
let state = ensure_setup().await;
|
|
state.span_exporter.reset();
|
|
|
|
let job_id = uuid::Uuid::new_v4();
|
|
let job = make_test_job(job_id, None);
|
|
windmill_worker::otel_ee::add_root_flow_job_to_otlp(&job, true);
|
|
|
|
let spans = state.span_exporter.get_finished_spans().unwrap();
|
|
let span = spans
|
|
.iter()
|
|
.find(|s| s.name == "full_job")
|
|
.expect("full_job span not found");
|
|
|
|
assert_eq!(span.status, opentelemetry::trace::Status::Ok,);
|
|
|
|
// Verify attributes
|
|
let attrs: Vec<_> = span.attributes.iter().map(|kv| kv.key.as_str()).collect();
|
|
assert!(attrs.contains(&"job_id"), "missing job_id attribute");
|
|
assert!(
|
|
attrs.contains(&"workspace_id"),
|
|
"missing workspace_id attribute"
|
|
);
|
|
assert!(
|
|
attrs.contains(&"script_path"),
|
|
"missing script_path attribute"
|
|
);
|
|
assert!(attrs.contains(&"job_kind"), "missing job_kind attribute");
|
|
assert!(
|
|
attrs.contains(&"created_by"),
|
|
"missing created_by attribute"
|
|
);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_root_job_span_error_on_failure() {
|
|
let state = ensure_setup().await;
|
|
state.span_exporter.reset();
|
|
|
|
let job_id = uuid::Uuid::new_v4();
|
|
let job = make_test_job(job_id, None);
|
|
windmill_worker::otel_ee::add_root_flow_job_to_otlp(&job, false);
|
|
|
|
let spans = state.span_exporter.get_finished_spans().unwrap();
|
|
let span = spans
|
|
.iter()
|
|
.find(|s| s.name == "full_job")
|
|
.expect("full_job span not found");
|
|
|
|
match &span.status {
|
|
opentelemetry::trace::Status::Error { description } => {
|
|
assert_eq!(description.as_ref(), "Job failed");
|
|
}
|
|
other => panic!("expected Error status, got {:?}", other),
|
|
}
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_root_job_trace_id_matches_uuid() {
|
|
let state = ensure_setup().await;
|
|
state.span_exporter.reset();
|
|
|
|
let job_id = uuid::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap();
|
|
let job = make_test_job(job_id, None);
|
|
windmill_worker::otel_ee::add_root_flow_job_to_otlp(&job, true);
|
|
|
|
let spans = state.span_exporter.get_finished_spans().unwrap();
|
|
let span = spans
|
|
.iter()
|
|
.find(|s| s.name == "full_job")
|
|
.expect("full_job span not found");
|
|
|
|
let expected_trace_id =
|
|
opentelemetry::trace::TraceId::from_bytes(job_id.as_u128().to_be_bytes());
|
|
assert_eq!(span.span_context.trace_id(), expected_trace_id);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_root_job_span_id_matches_uuid() {
|
|
let state = ensure_setup().await;
|
|
state.span_exporter.reset();
|
|
|
|
let job_id = uuid::Uuid::parse_str("550e8400-e29b-41d4-a716-446655440000").unwrap();
|
|
let job = make_test_job(job_id, None);
|
|
windmill_worker::otel_ee::add_root_flow_job_to_otlp(&job, true);
|
|
|
|
let spans = state.span_exporter.get_finished_spans().unwrap();
|
|
let span = spans
|
|
.iter()
|
|
.find(|s| s.name == "full_job")
|
|
.expect("full_job span not found");
|
|
|
|
let expected_span_id =
|
|
opentelemetry::trace::SpanId::from_bytes(job_id.as_u64_pair().1.to_be_bytes());
|
|
assert_eq!(span.span_context.span_id(), expected_span_id);
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_child_job_produces_no_span() {
|
|
let state = ensure_setup().await;
|
|
state.span_exporter.reset();
|
|
|
|
let parent_id = uuid::Uuid::new_v4();
|
|
let job_id = uuid::Uuid::new_v4();
|
|
let job = make_test_job(job_id, Some(parent_id));
|
|
windmill_worker::otel_ee::add_root_flow_job_to_otlp(&job, true);
|
|
|
|
let spans = state.span_exporter.get_finished_spans().unwrap();
|
|
let found = spans.iter().any(|s| s.name == "full_job");
|
|
assert!(!found, "child job should not produce a span");
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn test_root_job_span_attributes_values() {
|
|
let state = ensure_setup().await;
|
|
state.span_exporter.reset();
|
|
|
|
let job_id = uuid::Uuid::new_v4();
|
|
let job = make_test_job(job_id, None);
|
|
windmill_worker::otel_ee::add_root_flow_job_to_otlp(&job, true);
|
|
|
|
let spans = state.span_exporter.get_finished_spans().unwrap();
|
|
let span = spans
|
|
.iter()
|
|
.find(|s| s.name == "full_job")
|
|
.expect("full_job span not found");
|
|
|
|
let get_attr = |key: &str| -> String {
|
|
span.attributes
|
|
.iter()
|
|
.find(|kv| kv.key.as_str() == key)
|
|
.map(|kv| kv.value.as_str().to_string())
|
|
.unwrap_or_default()
|
|
};
|
|
|
|
assert_eq!(get_attr("job_id"), job_id.to_string());
|
|
assert_eq!(get_attr("workspace_id"), "test-workspace");
|
|
assert_eq!(get_attr("script_path"), "f/test/script");
|
|
}
|