From 6637ca89baf53e7fe378e5af2f4b72e49969a2ee Mon Sep 17 00:00:00 2001 From: Stefan Kurek Date: Tue, 5 Nov 2024 15:42:19 -0500 Subject: [PATCH] Updates OTEL dependencies to v0.112.0 (#1816) Co-authored-by: Ridwan Sharif <18472685+ridwanmsharif@users.noreply.github.com> --- apps/couchbase.go | 8 +- apps/mysql.go | 64 +--------- apps/oracledb.go | 70 +++++------ apps/sqlreceiver_common.go | 2 +- confgenerator/agentmetrics.go | 25 ++-- confgenerator/otel/ottl/ottl.go | 11 ++ confgenerator/otel/processors.go | 117 ++++++++++++++---- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../builtin/golden/linux-dataproc/otel.yaml | 32 +++-- .../builtin/golden/linux-gpu/otel.yaml | 32 +++-- .../goldens/builtin/golden/linux/otel.yaml | 32 +++-- .../builtin/golden/windows-2012/otel.yaml | 32 +++-- .../goldens/builtin/golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 38 ++++-- .../golden/linux/otel.yaml | 38 ++++-- .../golden/windows-2012/otel.yaml | 48 ++++--- .../golden/windows/otel.yaml | 48 ++++--- .../golden/linux-gpu/otel.yaml | 38 ++++-- .../golden/linux/otel.yaml | 38 ++++-- .../golden/windows-2012/otel.yaml | 48 ++++--- .../golden/windows/otel.yaml | 48 ++++--- .../golden/linux-gpu/otel.yaml | 36 ++++-- .../golden/linux/otel.yaml | 36 ++++-- .../golden/windows-2012/otel.yaml | 46 ++++--- .../golden/windows/otel.yaml | 46 ++++--- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 42 +++++-- .../golden/linux/otel.yaml | 42 +++++-- .../golden/windows-2012/otel.yaml | 42 +++++-- .../golden/windows/otel.yaml | 42 +++++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 85 +++++-------- .../golden/linux/otel.yaml | 85 +++++-------- .../golden/windows-2012/otel.yaml | 85 +++++-------- .../golden/windows/otel.yaml | 85 +++++-------- .../golden/linux-gpu/otel.yaml | 85 +++++-------- .../golden/linux/otel.yaml | 85 +++++-------- .../golden/windows-2012/otel.yaml | 85 +++++-------- .../golden/windows/otel.yaml | 85 +++++-------- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 100 ++++++++------- .../golden/linux/otel.yaml | 100 ++++++++------- .../golden/windows-2012/otel.yaml | 100 ++++++++------- .../golden/windows/otel.yaml | 100 ++++++++------- .../golden/linux-gpu/otel.yaml | 100 ++++++++------- .../golden/linux/otel.yaml | 100 ++++++++------- .../golden/windows-2012/otel.yaml | 100 ++++++++------- .../golden/windows/otel.yaml | 100 ++++++++------- .../golden/linux-gpu/otel.yaml | 100 ++++++++------- .../golden/linux/otel.yaml | 100 ++++++++------- .../golden/windows-2012/otel.yaml | 100 ++++++++------- .../golden/windows/otel.yaml | 100 ++++++++------- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 34 +++-- .../golden/linux/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 36 ++++-- .../golden/windows/otel.yaml | 36 ++++-- .../golden/windows-2012/otel.yaml | 36 ++++-- .../golden/windows/otel.yaml | 36 ++++-- .../golden/linux-gpu/otel.yaml | 32 +++-- .../golden/linux/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 32 +++-- .../golden/windows/otel.yaml | 32 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- .../golden/windows-2012/otel.yaml | 34 +++-- .../golden/windows/otel.yaml | 34 +++-- go.mod | 25 ++-- go.sum | 50 ++++---- integration_test/ops_agent_test/main_test.go | 4 +- submodules/opentelemetry-operations-collector | 2 +- .../output_otel.yaml | 42 ++++--- .../testdata/test_timezone/output_otel.yaml | 2 +- 708 files changed, 17556 insertions(+), 6758 deletions(-) diff --git a/apps/couchbase.go b/apps/couchbase.go index 39312d64ed..04382c67b7 100644 --- a/apps/couchbase.go +++ b/apps/couchbase.go @@ -211,7 +211,7 @@ var metrics = map[string]couchbaseMetric{ } func (r MetricsReceiverCouchbase) transformMetrics() []otel.TransformQuery { - operations := []otel.TransformQuery{} + queries := []otel.TransformQuery{} // persisting order so config generation is non-random keys := []string{} @@ -223,11 +223,11 @@ func (r MetricsReceiverCouchbase) transformMetrics() []otel.TransformQuery { for _, metricName := range keys { m := metrics[metricName] if m.castToSum { - operations = append(operations, otel.ConvertGaugeToSum(metricName)) + queries = append(queries, otel.ConvertGaugeToSum(metricName)) } - operations = append(operations, otel.SetDescription(metricName, m.description), otel.SetUnit(metricName, m.unit)) + queries = append(queries, otel.SetDescription(metricName, m.description), otel.SetUnit(metricName, m.unit)) } - return operations + return queries } func init() { diff --git a/apps/mysql.go b/apps/mysql.go index 6221884679..f0bbf044b4 100644 --- a/apps/mysql.go +++ b/apps/mysql.go @@ -23,8 +23,6 @@ import ( "github.com/GoogleCloudPlatform/ops-agent/confgenerator/fluentbit" "github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel" "github.com/GoogleCloudPlatform/ops-agent/internal/secret" - - "github.com/go-sql-driver/mysql" ) type MetricsReceiverMySql struct { @@ -57,35 +55,7 @@ func (r MetricsReceiverMySql) Pipelines(_ context.Context) ([]otel.ReceiverPipel r.Username = "root" } - // MySQL replication metrics are implemented separate to the main metrics pipeline so that 5.7 and 8.0 are both supported - sqlReceiverDriverConfig := mysql.Config{ - User: r.Username, - Passwd: r.Password.SecretValue(), - Net: transport, - Addr: r.Endpoint, - // This defaults to true in the mysql receiver, but we need to set it explicitly here - AllowNativePasswords: true, - } - return []otel.ReceiverPipeline{ - { - Receiver: otel.Component{ - Type: "sqlquery", - Config: map[string]interface{}{ - "collection_interval": r.CollectionIntervalString(), - "driver": "mysql", - "datasource": sqlReceiverDriverConfig.FormatDSN(), - "queries": sqlReceiverQueriesConfig(mysqlLegacyReplicationQueries), - }, - }, - Processors: map[string][]otel.Component{"metrics": { - otel.NormalizeSums(), - otel.MetricsTransform( - otel.AddPrefix("workload.googleapis.com"), - ), - otel.ModifyInstrumentationScope(r.Type(), "1.0"), - }}, - }, { Receiver: otel.Component{ Type: "mysql", @@ -124,10 +94,10 @@ func (r MetricsReceiverMySql) Pipelines(_ context.Context) ([]otel.ReceiverPipel "enabled": false, }, "mysql.replica.sql_delay": map[string]interface{}{ - "enabled": false, + "enabled": true, }, "mysql.replica.time_behind_source": map[string]interface{}{ - "enabled": false, + "enabled": true, }, }, }, @@ -156,36 +126,6 @@ func (r MetricsReceiverMySql) Pipelines(_ context.Context) ([]otel.ReceiverPipel }, nil } -var mysqlLegacyReplicationQueries = []sqlReceiverQuery{ - { - query: `SHOW SLAVE STATUS`, - metrics: []sqlReceiverMetric{ - { - metric_name: "mysql.replica.sql_delay", - value_column: "SQL_Delay", - unit: "s", - description: "The number of seconds that the replica must lag the source.", - data_type: "sum", - monotonic: "false", - value_type: "int", - attribute_columns: []string{}, - static_attributes: map[string]string{}, - }, - { - metric_name: "mysql.replica.time_behind_source", - value_column: "Seconds_Behind_Master", - unit: "s", - description: "This field is an indication of how “late” the replica is.", - data_type: "sum", - monotonic: "false", - value_type: "int", - attribute_columns: []string{}, - static_attributes: map[string]string{}, - }, - }, - }, -} - func init() { confgenerator.MetricsReceiverTypes.RegisterType(func() confgenerator.MetricsReceiver { return &MetricsReceiverMySql{} }) } diff --git a/apps/oracledb.go b/apps/oracledb.go index 927fa64851..f360b82908 100644 --- a/apps/oracledb.go +++ b/apps/oracledb.go @@ -144,7 +144,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The size of tablespaces in the database.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "TABLESPACE_NAME", "CONTENTS"}, static_attributes: map[string]string{ @@ -158,7 +158,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The size of tablespaces in the database.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "TABLESPACE_NAME", "CONTENTS"}, static_attributes: map[string]string{ @@ -177,7 +177,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{tablespaces}", description: "The number of tablespaces in the database.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "STATUS", "CONTENTS"}, static_attributes: map[string]string{ @@ -196,7 +196,7 @@ var oracleQueries = []sqlReceiverQuery{ // unit: "s", // description: "The number of seconds the instance has been up.", // data_type: "sum", - // monotonic: "true", + // monotonic: true, // value_type: "int", // attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "INSTANCE_ROLE"}, // static_attributes: map[string]string{ @@ -214,7 +214,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "s", description: "The number of seconds since the last RMAN backup.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME"}, static_attributes: map[string]string{ @@ -246,7 +246,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{processes}", description: "The current number of processes.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -259,7 +259,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{processes}", description: "The maximum number of processes allowed.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -272,7 +272,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{sessions}", description: "The current number of sessions.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -285,7 +285,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{sessions}", description: "The maximum number of sessions allowed.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -303,7 +303,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The programmable global area memory allocated by process.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "PROGRAM"}, static_attributes: map[string]string{ @@ -317,7 +317,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The programmable global area memory allocated by process.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "PROGRAM"}, static_attributes: map[string]string{ @@ -336,7 +336,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{events}", description: "The number of wait events experienced.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "WAIT_CLASS"}, static_attributes: map[string]string{ @@ -350,7 +350,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{events}", description: "The number of wait events experienced.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "WAIT_CLASS"}, static_attributes: map[string]string{ @@ -364,7 +364,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "cs", description: "The amount of time waited for wait events.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "WAIT_CLASS"}, static_attributes: map[string]string{ @@ -378,7 +378,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "cs", description: "The amount of time waited for wait events.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "WAIT_CLASS"}, static_attributes: map[string]string{ @@ -392,7 +392,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{timeouts}", description: "The number of timeouts for wait events.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "WAIT_CLASS"}, static_attributes: map[string]string{ @@ -406,7 +406,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{timeouts}", description: "The number of timeouts for wait events.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID", "WAIT_CLASS"}, static_attributes: map[string]string{ @@ -511,7 +511,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{cursors}", description: "The total number of cursors.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -524,7 +524,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{cursors}", description: "The current number of cursors.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -537,7 +537,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{logons}", description: "The total number of logons.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -550,7 +550,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{logons}", description: "The current number of logons.", data_type: "sum", - monotonic: "false", + monotonic: false, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -563,7 +563,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{sorts}", description: "The total number of sorts.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -577,7 +577,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{sorts}", description: "The total number of sorts.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -591,7 +591,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{rows}", description: "The total number of rows sorted.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -604,7 +604,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{operations}", description: "The number of physical disk operations.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -618,7 +618,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The number of bytes affected by physical disk operations.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -632,7 +632,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{operations}", description: "The number of physical disk operations.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -646,7 +646,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The number of bytes affected by physical disk operations.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -660,7 +660,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The total number of bytes communicated on the network.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -675,7 +675,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The total number of bytes communicated on the network.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -690,7 +690,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The total number of bytes communicated on the network.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -705,7 +705,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "by", description: "The total number of bytes communicated on the network.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -720,7 +720,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{calls}", description: "The total number of user calls such as login, parse, fetch, or execute.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -733,7 +733,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{commits}", description: "The total number of user transaction commits.", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ @@ -746,7 +746,7 @@ var oracleQueries = []sqlReceiverQuery{ unit: "{rollbacks}", description: "The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions", data_type: "sum", - monotonic: "true", + monotonic: true, value_type: "int", attribute_columns: []string{"DATABASE_ID", "GLOBAL_NAME", "INSTANCE_ID"}, static_attributes: map[string]string{ diff --git a/apps/sqlreceiver_common.go b/apps/sqlreceiver_common.go index 257908a687..5696df5a5d 100644 --- a/apps/sqlreceiver_common.go +++ b/apps/sqlreceiver_common.go @@ -20,7 +20,7 @@ type sqlReceiverMetric struct { unit string description string data_type string - monotonic string + monotonic bool value_type string attribute_columns []string static_attributes map[string]string diff --git a/confgenerator/agentmetrics.go b/confgenerator/agentmetrics.go index fd95600084..63e7b51dd0 100644 --- a/confgenerator/agentmetrics.go +++ b/confgenerator/agentmetrics.go @@ -18,6 +18,7 @@ import ( "fmt" "github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel" + "github.com/GoogleCloudPlatform/ops-agent/confgenerator/otel/ottl" ) // AgentSelfMetrics provides the agent.googleapis.com/agent/ metrics. @@ -54,8 +55,20 @@ func (r AgentSelfMetrics) MetricsSubmodulePipeline() otel.ReceiverPipeline { "strict", "otelcol_process_uptime", "otelcol_process_memory_rss", - "otelcol_grpc_io_client_completed_rpcs", - "otelcol_googlecloudmonitoring_point_count", + "grpc_client_attempt_duration", + "googlecloudmonitoring_point_count", + ), + otel.Transform("metric", "metric", + // create new count metric from histogram metric + ottl.ExtractCountMetric(true, "grpc_client_attempt_duration"), + ), + otel.MetricsFilter( + "include", + "strict", + "otelcol_process_uptime", + "otelcol_process_memory_rss", + "grpc_client_attempt_duration_count", + "googlecloudmonitoring_point_count", ), otel.MetricsTransform( otel.RenameMetric("otelcol_process_uptime", "agent/uptime", @@ -69,19 +82,17 @@ func (r AgentSelfMetrics) MetricsSubmodulePipeline() otel.ReceiverPipeline { // remove service.version label otel.AggregateLabels("sum"), ), - otel.RenameMetric("otelcol_grpc_io_client_completed_rpcs", "agent/api_request_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, + otel.RenameMetric("grpc_client_attempt_duration_count", "agent/api_request_count", // TODO: below is proposed new configuration for the metrics transform processor // ignore any non "google.monitoring" RPCs (note there won't be any other RPCs for now) // - action: select_label_values // label: grpc_client_method // value_regexp: ^google\.monitoring - otel.RenameLabel("grpc_client_status", "state"), + otel.RenameLabel("grpc_status", "state"), // delete grpc_client_method dimension & service.version label, retaining only state otel.AggregateLabels("sum", "state"), ), - otel.RenameMetric("otelcol_googlecloudmonitoring_point_count", "agent/monitoring/point_count", + otel.RenameMetric("googlecloudmonitoring_point_count", "agent/monitoring/point_count", // change data type from double -> int64 otel.ToggleScalarDataType, // Remove service.version label diff --git a/confgenerator/otel/ottl/ottl.go b/confgenerator/otel/ottl/ottl.go index dab8c7e56f..8da9697caf 100644 --- a/confgenerator/otel/ottl/ottl.go +++ b/confgenerator/otel/ottl/ottl.go @@ -202,6 +202,17 @@ func IsNotNil(a Value) Value { return valuef(`%s != nil`, a) } +// ExtractCountMetric creates a new metric based on the count value of a Histogram metric +func ExtractCountMetric(monotonic bool, metricName string) Statements { + monotonicStr := "false" + if monotonic { + monotonicStr = "true" + } + return Statements{ + statementf(`extract_count_metric(%s) where name == "%s"`, monotonicStr, metricName), + } +} + func (a LValue) SetToBool(b Value) Statements { // https://github.com/fluent/fluent-bit/blob/fd402681ad0ca0427395b07bb8a37c7c1c846cca/src/flb_parser.c#L1261 // "true" = true, "false" = false, else error diff --git a/confgenerator/otel/processors.go b/confgenerator/otel/processors.go index 54b6a15ade..4a0f948ede 100644 --- a/confgenerator/otel/processors.go +++ b/confgenerator/otel/processors.go @@ -98,7 +98,7 @@ func CumulativeToDelta(metrics ...string) Component { Type: "cumulativetodelta", Config: map[string]interface{}{ "include": map[string]interface{}{ - "metrics": metrics, + "metrics": metrics, "match_type": "strict", }, }, @@ -157,9 +157,11 @@ func Transform(statementType, context string, statements ottl.Statements) Compon Type: "transform", Config: map[string]any{ "error_mode": "ignore", - fmt.Sprintf("%s_statements", statementType): map[string]any{ - "context": context, - "statements": statements, + fmt.Sprintf("%s_statements", statementType): []map[string]any{ + { + "context": context, + "statements": statements, + }, }, }, } @@ -184,83 +186,150 @@ func Filter(dataType, context string, expressions []ottl.Value) Component { // TransformationMetrics returns a transform processor object that contains all the queries passed into it. func TransformationMetrics(queries ...TransformQuery) Component { - queryStrings := []string{} + metricQueryStrings := []string{} + datapointQueryStrings := []string{} for _, q := range queries { - queryStrings = append(queryStrings, string(q)) + switch q.Context { + case Metric: + metricQueryStrings = append(metricQueryStrings, string(q.Statement)) + default: + datapointQueryStrings = append(datapointQueryStrings, string(q.Statement)) + } + } + + // Only add metricStatement type if any queuries to go with it + metricStatements := []map[string]any{} + if len(metricQueryStrings) != 0 { + metricMetricStatement := map[string]any{ + "context": "metric", + "statements": metricQueryStrings, + } + metricStatements = append(metricStatements, metricMetricStatement) + } + if len(datapointQueryStrings) != 0 { + datapointMetricStatement := map[string]any{ + "context": "datapoint", + "statements": datapointQueryStrings, + } + metricStatements = append(metricStatements, datapointMetricStatement) } return Component{ Type: "transform", - Config: map[string]map[string]interface{}{ - "metric_statements": { - "context": "datapoint", - "statements": queryStrings, - }, + Config: map[string]any{ + "metric_statements": metricStatements, }, } } +// TransformQueryContext is a type wrapper for the context of a query expression within the transoform processor +type TransformQueryContext string + +const ( + Metric TransformQueryContext = "metric" + Datapoint TransformQueryContext = "datapoint" +) + // TransformQuery is a type wrapper for query expressions supported by the transform // processor found here: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/transformprocessor -type TransformQuery string +type TransformQuery struct { + Context TransformQueryContext + Statement string +} // FlattenResourceAttribute returns an expression that brings down a resource attribute to a // metric attribute. func FlattenResourceAttribute(resourceAttribute, metricAttribute string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(attributes["%s"], resource.attributes["%s"])`, metricAttribute, resourceAttribute)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(attributes["%s"], resource.attributes["%s"])`, metricAttribute, resourceAttribute), + } } // GroupByAttribute returns an expression that makes a metric attribute into a resource attribute. func GroupByAttribute(attribute string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(resource.attributes["%s"], attributes["%s"])`, attribute, attribute)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(resource.attributes["%s"], attributes["%s"])`, attribute, attribute), + } } // DeleteMetricAttribute returns an expression that removes the metric attribute specified. func DeleteMetricAttribute(metricAttribute string) TransformQuery { - return TransformQuery(fmt.Sprintf(`delete_key(attributes, "%s")`, metricAttribute)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`delete_key(attributes, "%s")`, metricAttribute), + } } // ConvertGaugeToSum returns an expression where a gauge metric can be converted into a sum func ConvertGaugeToSum(metricName string) TransformQuery { - return TransformQuery(fmt.Sprintf(`convert_gauge_to_sum("cumulative", true) where metric.name == "%s"`, metricName)) + return TransformQuery{ + Context: Metric, + Statement: fmt.Sprintf(`convert_gauge_to_sum("cumulative", true) where name == "%s"`, metricName), + } } // ConvertFloatToInt returns an expression where a float-valued metric can be converted to an int func ConvertFloatToInt(metricName string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(value_int, Int(value_double)) where metric.name == "%s"`, metricName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(value_int, Int(value_double)) where metric.name == "%s"`, metricName), + } } // SetDescription returns a metrics transform expression where the metrics description will be set to what is provided func SetDescription(metricName, metricDescription string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(metric.description, "%s") where metric.name == "%s"`, metricDescription, metricName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(metric.description, "%s") where metric.name == "%s"`, metricDescription, metricName), + } } // SetUnit returns a metrics transform expression where the metric unit is set to provided value func SetUnit(metricName, unit string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(metric.unit, "%s") where metric.name == "%s"`, unit, metricName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(metric.unit, "%s") where metric.name == "%s"`, unit, metricName), + } } // SetName returns a metrics transform expression where the metric name is set to provided value func SetName(oldName, newName string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(metric.name, "%s") where metric.name == "%s"`, newName, oldName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(metric.name, "%s") where metric.name == "%s"`, newName, oldName), + } } func SetAttribute(metricName, attributeKey, attributeValue string) TransformQuery { - return TransformQuery(fmt.Sprintf(`set(attributes["%s"], "%s") where metric.name == "%s"`, attributeKey, attributeValue, metricName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`set(attributes["%s"], "%s") where metric.name == "%s"`, attributeKey, attributeValue, metricName), + } } // SummarySumValToSum creates a new Sum metric out of a summary metric's sum value. The new metric has a name of "_sum". func SummarySumValToSum(metricName, aggregation string, isMonotonic bool) TransformQuery { - return TransformQuery(fmt.Sprintf(`convert_summary_sum_val_to_sum("%s", %t) where metric.name == "%s"`, aggregation, isMonotonic, metricName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`convert_summary_sum_val_to_sum("%s", %t) where metric.name == "%s"`, aggregation, isMonotonic, metricName), + } } // SummaryCountValToSum creates a new Sum metric out of a summary metric's count value. The new metric has a name of "_count". func SummaryCountValToSum(metricName, aggregation string, isMonotonic bool) TransformQuery { - return TransformQuery(fmt.Sprintf(`convert_summary_count_val_to_sum("%s", %t) where metric.name == "%s"`, aggregation, isMonotonic, metricName)) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`convert_summary_count_val_to_sum("%s", %t) where metric.name == "%s"`, aggregation, isMonotonic, metricName), + } } // RetainResource retains the resource attributes provided, and drops all other attributes. func RetainResource(resourceAttributeKeys ...string) TransformQuery { - return TransformQuery(fmt.Sprintf(`keep_keys(resource.attributes, [%s])`, strings.Join(resourceAttributeKeys[:], ","))) + return TransformQuery{ + Context: Datapoint, + Statement: fmt.Sprintf(`keep_keys(resource.attributes, [%s])`, strings.Join(resourceAttributeKeys[:], ",")), + } } // RenameMetric returns a config snippet that renames old to new, applying zero or more transformations. diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml index 54e4333e2b..e68dc71b38 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -391,7 +400,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -413,19 +422,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -440,6 +448,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -508,7 +522,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml index 9e78d92b46..9cd7ad0c1e 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -367,7 +376,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -389,19 +398,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -416,6 +424,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -474,7 +488,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml index e7930ec358..d74496723c 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -374,7 +383,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -396,19 +405,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -423,6 +431,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -484,7 +498,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml index e7930ec358..d74496723c 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -374,7 +383,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -396,19 +405,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -423,6 +431,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -484,7 +498,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml index b473ceb89c..959f61d4f4 100644 --- a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -538,7 +552,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml index 3b0d846818..5529ee2836 100644 --- a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -490,7 +504,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml index f7caa7e6e0..10a4538ce8 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -418,7 +427,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -440,19 +449,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,10 +483,16 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -584,7 +598,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml index c5c946828c..87dd60cc07 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -389,7 +398,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -411,19 +420,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,10 +454,16 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -544,7 +558,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml index f6ee83e4c2..2155871cf2 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,10 +526,16 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -673,7 +687,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml index f6ee83e4c2..2155871cf2 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,10 +526,16 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -673,7 +687,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml index 645b9b9066..57f9b81f37 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -480,6 +488,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -554,7 +568,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml index a0bad6931c..4ebbba10b1 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -451,6 +459,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -514,7 +528,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml index b1fba64d6b..3f99851af4 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -523,6 +531,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -643,7 +657,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml index b1fba64d6b..3f99851af4 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -523,6 +531,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -643,7 +657,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml index 210671a038..1a4cefe15e 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -418,7 +427,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -440,19 +449,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -559,7 +573,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml index 66cdc290e4..3d392e0ed4 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -389,7 +398,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -411,19 +420,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -519,7 +533,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml index dfe89c4fe0..673fca0a2a 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml index dfe89c4fe0..673fca0a2a 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml index 210671a038..1a4cefe15e 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -418,7 +427,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -440,19 +449,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -559,7 +573,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml index 66cdc290e4..3d392e0ed4 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -389,7 +398,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -411,19 +420,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -519,7 +533,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml index dfe89c4fe0..673fca0a2a 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml index dfe89c4fe0..673fca0a2a 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml index 82c27401cc..1de78123b3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -418,7 +427,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -440,19 +449,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -559,7 +573,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml index e420602d73..8a95935b7b 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -389,7 +398,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -411,19 +420,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -519,7 +533,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml index fac32bc4a5..63b3c80209 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml index fac32bc4a5..63b3c80209 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml index 5d1d08a1da..a544804254 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -410,7 +419,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -432,19 +441,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -463,6 +471,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -547,7 +561,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml index 1fd007e442..fff14df0dd 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -381,7 +390,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -403,19 +412,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -434,6 +442,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -507,7 +521,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml index 51f0dc9f59..42729e19be 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -446,7 +455,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -468,19 +477,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -506,6 +514,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -636,7 +650,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml index 51f0dc9f59..42729e19be 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/otlp_2: keys: - namespace @@ -446,7 +455,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -468,19 +477,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -506,6 +514,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/otlp_1: error_mode: ignore metric_statements: @@ -636,7 +650,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml index 5552c5b353..7028732c77 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -461,7 +469,7 @@ processors: transform/logs_p1_sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["source"]) where (body != nil and body["source"] != nil) @@ -547,10 +555,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -567,7 +581,7 @@ processors: transform/syslog_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -691,7 +705,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml index 625c7a668b..e167273b43 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -432,7 +440,7 @@ processors: transform/logs_p1_sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["source"]) where (body != nil and body["source"] != nil) @@ -518,10 +526,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -538,7 +552,7 @@ processors: transform/syslog_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml index a8c358ce0b..a57be6072a 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -504,7 +512,7 @@ processors: transform/logs_p1_sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["source"]) where (body != nil and body["source"] != nil) @@ -590,10 +598,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -610,7 +624,7 @@ processors: transform/windows__event__log_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -686,7 +700,7 @@ processors: transform/windows__event__log_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -703,7 +717,7 @@ processors: transform/windows__event__log_1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -779,7 +793,7 @@ processors: transform/windows__event__log_1_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -796,7 +810,7 @@ processors: transform/windows__event__log_2_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -872,7 +886,7 @@ processors: transform/windows__event__log_2_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -1061,7 +1075,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml index a8c358ce0b..a57be6072a 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -504,7 +512,7 @@ processors: transform/logs_p1_sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["source"]) where (body != nil and body["source"] != nil) @@ -590,10 +598,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/sample__logs_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -610,7 +624,7 @@ processors: transform/windows__event__log_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -686,7 +700,7 @@ processors: transform/windows__event__log_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -703,7 +717,7 @@ processors: transform/windows__event__log_1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -779,7 +793,7 @@ processors: transform/windows__event__log_1_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -796,7 +810,7 @@ processors: transform/windows__event__log_2_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -872,7 +886,7 @@ processors: transform/windows__event__log_2_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -1061,7 +1075,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml index fdfe68bac3..b460c70581 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -461,7 +469,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -478,7 +486,7 @@ processors: transform/logs_pipeline1_log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - set(cache["__parsed_json"], ParseJSON(body["key_1"])) where (body != nil and body["key_1"] != nil) - delete_key(body, "key_1") where ((body != nil and body["key_1"] != nil) and (cache != nil and cache["__parsed_json"] != nil)) @@ -530,10 +538,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/syslog_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -658,7 +672,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml index 427ade273e..bbdae56f31 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -432,7 +440,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -449,7 +457,7 @@ processors: transform/logs_pipeline1_log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - set(cache["__parsed_json"], ParseJSON(body["key_1"])) where (body != nil and body["key_1"] != nil) - delete_key(body, "key_1") where ((body != nil and body["key_1"] != nil) and (cache != nil and cache["__parsed_json"] != nil)) @@ -501,10 +509,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/syslog_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -618,7 +632,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml index d8eb5ca49a..4f395dec07 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -504,7 +512,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -521,7 +529,7 @@ processors: transform/logs_pipeline1_log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - set(cache["__parsed_json"], ParseJSON(body["key_1"])) where (body != nil and body["key_1"] != nil) - delete_key(body, "key_1") where ((body != nil and body["key_1"] != nil) and (cache != nil and cache["__parsed_json"] != nil)) @@ -573,10 +581,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/windows__event__log_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -652,7 +666,7 @@ processors: transform/windows__event__log_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -669,7 +683,7 @@ processors: transform/windows__event__log_1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -745,7 +759,7 @@ processors: transform/windows__event__log_1_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -762,7 +776,7 @@ processors: transform/windows__event__log_2_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -838,7 +852,7 @@ processors: transform/windows__event__log_2_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -1028,7 +1042,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml index d8eb5ca49a..4f395dec07 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -504,7 +512,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -521,7 +529,7 @@ processors: transform/logs_pipeline1_log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - set(cache["__parsed_json"], ParseJSON(body["key_1"])) where (body != nil and body["key_1"] != nil) - delete_key(body, "key_1") where ((body != nil and body["key_1"] != nil) and (cache != nil and cache["__parsed_json"] != nil)) @@ -573,10 +581,16 @@ processors: - set(cache["__setif_value"], cache["value"]) - replace_pattern(cache["__setif_value"], "^projects/([^/]*)/traces/", "") - set(trace_id.string, cache["__setif_value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/windows__event__log_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -652,7 +666,7 @@ processors: transform/windows__event__log_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -669,7 +683,7 @@ processors: transform/windows__event__log_1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -745,7 +759,7 @@ processors: transform/windows__event__log_1_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -762,7 +776,7 @@ processors: transform/windows__event__log_2_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -838,7 +852,7 @@ processors: transform/windows__event__log_2_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -1028,7 +1042,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index 23b824c423..0bd7714b25 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -461,7 +469,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -475,10 +483,16 @@ processors: - set(cache["value"], cache["__field_1"]) - set(cache["value"], "log_source_id1") where cache["value"] == nil - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/syslog_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -602,7 +616,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml index c7972ff545..2f6a9a4615 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -432,7 +440,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -446,10 +454,16 @@ processors: - set(cache["value"], cache["__field_1"]) - set(cache["value"], "log_source_id1") where cache["value"] == nil - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/syslog_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -562,7 +576,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 2390065bbf..1e5bb2ca10 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -504,7 +512,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -518,10 +526,16 @@ processors: - set(cache["value"], cache["__field_1"]) - set(cache["value"], "log_source_id1") where cache["value"] == nil - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/windows__event__log_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -597,7 +611,7 @@ processors: transform/windows__event__log_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -614,7 +628,7 @@ processors: transform/windows__event__log_1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -690,7 +704,7 @@ processors: transform/windows__event__log_1_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -707,7 +721,7 @@ processors: transform/windows__event__log_2_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -783,7 +797,7 @@ processors: transform/windows__event__log_2_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -972,7 +986,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml index 2390065bbf..1e5bb2ca10 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -504,7 +512,7 @@ processors: transform/log__source__id1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -518,10 +526,16 @@ processors: - set(cache["value"], cache["__field_1"]) - set(cache["value"], "log_source_id1") where cache["value"] == nil - set(attributes["gcp.log_name"], cache["value"]) where (cache != nil and cache["value"] != nil) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/windows__event__log_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -597,7 +611,7 @@ processors: transform/windows__event__log_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -614,7 +628,7 @@ processors: transform/windows__event__log_1_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -690,7 +704,7 @@ processors: transform/windows__event__log_1_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -707,7 +721,7 @@ processors: transform/windows__event__log_2_0: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], body["channel"]) where (body != nil and body["channel"] != nil) @@ -783,7 +797,7 @@ processors: transform/windows__event__log_2_1: error_mode: ignore log_statements: - context: log + - context: log statements: - delete_key(cache, "__field_0") where (cache != nil and cache["__field_0"] != nil) - set(cache["__field_0"], attributes["compute.googleapis.com/resource_name"]) where (attributes != nil and attributes["compute.googleapis.com/resource_name"] != nil) @@ -972,7 +986,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml index 27d2ba8055..a48b095b93 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml index f16410a8e3..260320f369 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml index 52ea762bc6..f9b158853f 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml index 6def02f101..9495bca195 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml index 626bce9000..d7e7a80cd4 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml index 626bce9000..d7e7a80cd4 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml index 4fd7fc1cf2..e4d1bf4916 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml index 4fd7fc1cf2..e4d1bf4916 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml index 47ed786330..fa26577f2b 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml index 47ed786330..fa26577f2b 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml index e776035391..935a54b4b7 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -377,7 +386,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -399,19 +408,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -426,6 +434,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -485,7 +499,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml index e776035391..935a54b4b7 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -377,7 +386,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -399,19 +408,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -426,6 +434,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -485,7 +499,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml index 1ed792e1b9..ae9f0848f7 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml @@ -72,8 +72,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -508,6 +516,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -624,7 +638,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml index 1ed792e1b9..ae9f0848f7 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml @@ -72,8 +72,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -508,6 +516,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -624,7 +638,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml index 0299f23ec8..f6e7fe0701 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -403,7 +412,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -425,19 +434,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -452,6 +460,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml index 756253094a..f766036384 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml index 71478278ac..00b435332f 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml index 71478278ac..00b435332f 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml index 9cd01239b1..944e51f28e 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,6 +462,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -524,7 +538,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml index 42bbaeffb2..004618270e 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml @@ -44,8 +44,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -374,7 +383,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -396,19 +405,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -423,6 +431,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -482,7 +496,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml index 2d5eeba314..e8b0cf7d4c 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml @@ -63,8 +63,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -443,7 +452,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -465,19 +474,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -499,6 +507,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -615,7 +629,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml index 2d5eeba314..e8b0cf7d4c 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml @@ -63,8 +63,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -443,7 +452,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -465,19 +474,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -499,6 +507,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -615,7 +629,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml index d1eb6af855..5ba25cdb9f 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,6 +462,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -524,7 +538,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml index 9ea370aab4..2a678e17cd 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml @@ -44,8 +44,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -374,7 +383,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -396,19 +405,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -423,6 +431,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -482,7 +496,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml index 864f0412fe..af3eb91db0 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml @@ -63,8 +63,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -443,7 +452,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -465,19 +474,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -499,6 +507,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -615,7 +629,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml index 864f0412fe..af3eb91db0 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml @@ -63,8 +63,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -443,7 +452,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -465,19 +474,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -499,6 +507,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -615,7 +629,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml index ec1a6c406b..93a31767ac 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -403,7 +412,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -425,19 +434,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -452,6 +460,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml index 484a477ef6..3017147169 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml index 8790026266..9487d74119 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml index 8790026266..9487d74119 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml index 982bedc18a..0a691582d7 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/otlp_otlp_0: metrics: exclude: @@ -420,7 +429,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -442,19 +451,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -491,6 +499,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -565,7 +579,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml index 691d2fd292..100a5057a1 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml @@ -52,8 +52,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/otlp_otlp_0: metrics: exclude: @@ -389,7 +398,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -411,19 +420,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -460,6 +468,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -523,7 +537,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml index c05df3f75d..f963b3bc47 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/otlp_otlp_0: metrics: exclude: @@ -458,7 +467,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -480,19 +489,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -656,7 +670,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml index c05df3f75d..f963b3bc47 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/otlp_otlp_0: metrics: exclude: @@ -458,7 +467,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -480,19 +489,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: detectors: - gcp override: false + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -656,7 +670,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml index 561d31df2f..caf5c9b134 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml @@ -73,8 +73,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -427,7 +436,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -449,19 +458,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -476,6 +484,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -550,7 +564,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml index dff89e18e9..e02cd2e238 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -385,7 +394,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -407,19 +416,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -434,6 +442,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -495,7 +509,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml index 1d5f10fdaf..b223899324 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -392,7 +401,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -414,19 +423,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -441,6 +449,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -505,7 +519,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml index 1d5f10fdaf..b223899324 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -392,7 +401,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -414,19 +423,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -441,6 +449,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -505,7 +519,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml index 3851553143..ac5c985fab 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -464,6 +472,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -536,7 +550,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml index 19270a27ce..742d58e0ab 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -379,7 +388,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -401,19 +410,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -428,6 +436,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -488,7 +502,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml index c8bdced3bb..fdcc2796fb 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -435,6 +443,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -498,7 +512,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml index c8bdced3bb..fdcc2796fb 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -435,6 +443,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -498,7 +512,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml index 54e4333e2b..e68dc71b38 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -391,7 +400,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -413,19 +422,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -440,6 +448,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -508,7 +522,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml index 9e78d92b46..9cd7ad0c1e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -367,7 +376,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -389,19 +398,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -416,6 +424,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -474,7 +488,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml index e7930ec358..d74496723c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -374,7 +383,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -396,19 +405,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -423,6 +431,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -484,7 +498,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml index e7930ec358..d74496723c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml @@ -37,8 +37,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -374,7 +383,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -396,19 +405,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -423,6 +431,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -484,7 +498,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml index eb5871c138..f6d21a6234 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml index 3ff2bef8bd..c5ffec7348 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml index bc340af51b..239c9bb9f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml index bc340af51b..239c9bb9f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml index eb5871c138..f6d21a6234 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml index 3ff2bef8bd..c5ffec7348 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml index bc340af51b..239c9bb9f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml index bc340af51b..239c9bb9f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/activemq_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml index 3a48f25a91..db8a0367ca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/aerospike_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -470,10 +478,16 @@ processors: - gcp transform/aerospike_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["node_name"], resource.attributes["aerospike.node.name"]) - set(attributes["namespace_name"], resource.attributes["aerospike.namespace"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: aerospike/aerospike: collect_cluster_metrics: false @@ -562,7 +576,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml index 11cf2b97fe..b4faa68f34 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/aerospike_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -441,10 +449,16 @@ processors: - gcp transform/aerospike_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["node_name"], resource.attributes["aerospike.node.name"]) - set(attributes["namespace_name"], resource.attributes["aerospike.namespace"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: aerospike/aerospike: collect_cluster_metrics: false @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml index 3b0eaa6478..6874663961 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/aerospike_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -513,10 +521,16 @@ processors: - gcp transform/aerospike_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["node_name"], resource.attributes["aerospike.node.name"]) - set(attributes["namespace_name"], resource.attributes["aerospike.namespace"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: aerospike/aerospike: collect_cluster_metrics: false @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml index 3b0eaa6478..6874663961 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/aerospike_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -513,10 +521,16 @@ processors: - gcp transform/aerospike_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["node_name"], resource.attributes["aerospike.node.name"]) - set(attributes["namespace_name"], resource.attributes["aerospike.namespace"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: aerospike/aerospike: collect_cluster_metrics: false @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml index 08a27aca53..52b4e004f4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -421,7 +430,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -443,19 +452,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -476,9 +484,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 60s @@ -564,7 +578,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml index 5f668e273e..d0cc3d92ff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml @@ -56,8 +56,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -392,7 +401,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -414,19 +423,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -447,9 +455,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 60s @@ -524,7 +538,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml index b0c57be3bf..1abf789ae5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -457,7 +466,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -479,19 +488,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -519,9 +527,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 60s @@ -653,7 +667,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml index b0c57be3bf..1abf789ae5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -457,7 +466,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -479,19 +488,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -519,9 +527,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 60s @@ -653,7 +667,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml index b01346a2c8..6ce79b7feb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -421,7 +430,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -443,19 +452,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -476,9 +484,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 10s @@ -564,7 +578,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml index 9ff9958c57..d711aa652b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml @@ -56,8 +56,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -392,7 +401,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -414,19 +423,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -447,9 +455,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 10s @@ -524,7 +538,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml index 5786498300..9f6aae9245 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -457,7 +466,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -479,19 +488,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -519,9 +527,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 10s @@ -653,7 +667,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml index 5786498300..9f6aae9245 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/apache_2: transforms: - action: update @@ -457,7 +466,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -479,19 +488,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -519,9 +527,15 @@ processors: - gcp transform/apache_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["server_name"], resource.attributes["apache.server.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: apache/apache: collection_interval: 10s @@ -653,7 +667,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml index 4f87437120..4a181ba207 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml index eeb44b5cc6..54b7d75859 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml index ab4da29ab3..9bece1e1b1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml index ab4da29ab3..9bece1e1b1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml index a56a5433bc..fdb4aded19 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml index 05b4b7a46d..794e2849fe 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml index a254cc94d1..abddb96e81 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml index a254cc94d1..abddb96e81 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/cassandra_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml index 361b4d5209..84f84f7be6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchbase_2: transforms: - action: update @@ -505,7 +514,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -527,19 +536,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -560,14 +568,17 @@ processors: - gcp transform/couchbase_3: metric_statements: - context: datapoint + - context: metric + statements: + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.error.oom.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.operation.count" + - context: datapoint statements: - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of out of memory errors.") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.unit, "{errors}") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of items that belong to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - set(metric.unit, "{items}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "Number of item value ejections from memory to disk.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.unit, "{ejections}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "The memory usage at which items will be ejected.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.high_water_mark.limit" @@ -576,11 +587,16 @@ processors: - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.low_water_mark.limit" - set(metric.description, "Usage of total memory available to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of operations on the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.unit, "{operations}") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of non-resident vBuckets.") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" - set(metric.unit, "{vbuckets}") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -679,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml index 392563b745..beac467609 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchbase_2: transforms: - action: update @@ -476,7 +485,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -531,14 +539,17 @@ processors: - gcp transform/couchbase_3: metric_statements: - context: datapoint + - context: metric + statements: + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.error.oom.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.operation.count" + - context: datapoint statements: - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of out of memory errors.") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.unit, "{errors}") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of items that belong to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - set(metric.unit, "{items}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "Number of item value ejections from memory to disk.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.unit, "{ejections}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "The memory usage at which items will be ejected.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.high_water_mark.limit" @@ -547,11 +558,16 @@ processors: - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.low_water_mark.limit" - set(metric.description, "Usage of total memory available to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of operations on the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.unit, "{operations}") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of non-resident vBuckets.") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" - set(metric.unit, "{vbuckets}") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -639,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml index 87d264a458..fe34cb30ce 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml @@ -75,8 +75,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchbase_2: transforms: - action: update @@ -541,7 +550,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -563,19 +572,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -603,14 +611,17 @@ processors: - gcp transform/couchbase_3: metric_statements: - context: datapoint + - context: metric + statements: + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.error.oom.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.operation.count" + - context: datapoint statements: - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of out of memory errors.") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.unit, "{errors}") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of items that belong to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - set(metric.unit, "{items}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "Number of item value ejections from memory to disk.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.unit, "{ejections}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "The memory usage at which items will be ejected.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.high_water_mark.limit" @@ -619,11 +630,16 @@ processors: - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.low_water_mark.limit" - set(metric.description, "Usage of total memory available to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of operations on the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.unit, "{operations}") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of non-resident vBuckets.") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" - set(metric.unit, "{vbuckets}") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -768,7 +784,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml index 87d264a458..fe34cb30ce 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml @@ -75,8 +75,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchbase_2: transforms: - action: update @@ -541,7 +550,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -563,19 +572,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -603,14 +611,17 @@ processors: - gcp transform/couchbase_3: metric_statements: - context: datapoint + - context: metric + statements: + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.error.oom.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" + - convert_gauge_to_sum("cumulative", true) where name == "workload.googleapis.com/couchbase.bucket.operation.count" + - context: datapoint statements: - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of out of memory errors.") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.unit, "{errors}") where metric.name == "workload.googleapis.com/couchbase.bucket.error.oom.count" - set(metric.description, "Number of items that belong to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - set(metric.unit, "{items}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.count" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "Number of item value ejections from memory to disk.") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.unit, "{ejections}") where metric.name == "workload.googleapis.com/couchbase.bucket.item.ejection.count" - set(metric.description, "The memory usage at which items will be ejected.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.high_water_mark.limit" @@ -619,11 +630,16 @@ processors: - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.low_water_mark.limit" - set(metric.description, "Usage of total memory available to the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - set(metric.unit, "By") where metric.name == "workload.googleapis.com/couchbase.bucket.memory.usage" - - convert_gauge_to_sum("cumulative", true) where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of operations on the bucket.") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.unit, "{operations}") where metric.name == "workload.googleapis.com/couchbase.bucket.operation.count" - set(metric.description, "Number of non-resident vBuckets.") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" - set(metric.unit, "{vbuckets}") where metric.name == "workload.googleapis.com/couchbase.bucket.vbucket.count" + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -768,7 +784,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml index aca5599757..5ba5895023 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchdb_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: couchdb/couchdb: collection_interval: 60s @@ -553,7 +567,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml index abc3231055..c92de081b7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchdb_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: couchdb/couchdb: collection_interval: 60s @@ -513,7 +527,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml index 7bc7489b87..710b7f1921 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchdb_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: couchdb/couchdb: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml index 7bc7489b87..710b7f1921 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/couchdb_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: couchdb/couchdb: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml index 89148348b0..350382b7a6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml @@ -47,8 +47,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -450,6 +458,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 30s @@ -520,7 +534,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml index d89a358a23..bdba89c488 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -372,7 +381,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -394,19 +403,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -421,6 +429,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 30s @@ -480,7 +494,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml index acc5b8b459..d9b3d59889 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 30s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml index acc5b8b459..d9b3d59889 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 30s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml index dc0b4a4a24..d3ef66a624 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/dcgm_0: transforms: - action: update @@ -481,7 +490,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -503,19 +512,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -535,11 +543,17 @@ processors: - gcp transform/dcgm_5: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["model"], resource.attributes["gpu.model"]) - set(attributes["gpu_number"], resource.attributes["gpu.number"]) - set(attributes["uuid"], resource.attributes["gpu.uuid"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: dcgm/dcgm: collection_interval: 60s @@ -660,7 +674,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml index c77452a500..c2ec38a939 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/dcgm_0: transforms: - action: update @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -506,11 +514,17 @@ processors: - gcp transform/dcgm_5: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["model"], resource.attributes["gpu.model"]) - set(attributes["gpu_number"], resource.attributes["gpu.number"]) - set(attributes["uuid"], resource.attributes["gpu.uuid"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: dcgm/dcgm: collection_interval: 60s @@ -620,7 +634,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml index b0f67411e7..15e3bb17c7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/dcgm_0: transforms: - action: update @@ -459,7 +468,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -481,19 +490,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -513,11 +521,17 @@ processors: - gcp transform/dcgm_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["model"], resource.attributes["gpu.model"]) - set(attributes["gpu_number"], resource.attributes["gpu.number"]) - set(attributes["uuid"], resource.attributes["gpu.uuid"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: dcgm/dcgm: collection_interval: 60s @@ -602,7 +616,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml index aed5681d4d..397f80e366 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/dcgm_0: transforms: - action: update @@ -430,7 +439,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -452,19 +461,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -484,11 +492,17 @@ processors: - gcp transform/dcgm_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["model"], resource.attributes["gpu.model"]) - set(attributes["gpu_number"], resource.attributes["gpu.number"]) - set(attributes["uuid"], resource.attributes["gpu.uuid"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: dcgm/dcgm: collection_interval: 60s @@ -562,7 +576,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml index 6a89194864..c23b190dc4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -419,7 +428,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -441,19 +450,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,6 +480,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -592,7 +606,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml index 25416ddf07..f62f2749c6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -390,7 +399,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -412,19 +421,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,6 +451,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml index c17e5a99f4..74b55c8212 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml index c17e5a99f4..74b55c8212 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml index 46f2f11c6f..cfe7d6d0aa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -419,7 +428,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -441,19 +450,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,6 +480,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -592,7 +606,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml index 5c329fd115..eb580aec8c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -390,7 +399,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -412,19 +421,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,6 +451,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml index 1f5c0ea445..a032f4766a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml index 1f5c0ea445..a032f4766a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml index 45a4e396e2..b0bd80e5e6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -419,7 +428,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -441,19 +450,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,6 +480,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -592,7 +606,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml index a1f9a26411..d1b299cdd3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -390,7 +399,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -412,19 +421,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,6 +451,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml index d2409b0e96..038571fb64 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml index d2409b0e96..038571fb64 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml index 51ad1a59d1..085213f024 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -419,7 +428,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -441,19 +450,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,6 +480,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -592,7 +606,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml index 87e31be080..ba6f5dc6a7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -390,7 +399,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -412,19 +421,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,6 +451,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml index 3711b5e450..20e2d4ea8a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml index 3711b5e450..20e2d4ea8a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -681,7 +695,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml index 04e895f932..9516604e7d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -419,7 +428,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -441,19 +450,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,6 +480,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -614,7 +628,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml index dae133299a..170c899b1b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -390,7 +399,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -412,19 +421,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,6 +451,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -574,7 +588,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml index 0030b9c066..b72f2b43a7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -703,7 +717,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml index 0030b9c066..b72f2b43a7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -703,7 +717,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml index b47ef17371..a1517f7649 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml @@ -59,8 +59,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -419,7 +428,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -441,19 +450,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,6 +480,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -594,7 +608,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml index aebda2901d..b4d9bf7536 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml @@ -54,8 +54,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -390,7 +399,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -412,19 +421,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,6 +451,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -554,7 +568,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml index d46e609b91..19a19dd4bd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -683,7 +697,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml index d46e609b91..19a19dd4bd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml @@ -69,8 +69,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/elasticsearch_2: transforms: - action: update @@ -455,7 +464,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -477,19 +486,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,6 +523,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: elasticsearch/elasticsearch: collection_interval: 60s @@ -683,7 +697,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml index cc4c0cb271..895f52d380 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml index cc4c0cb271..895f52d380 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml index 9c6915b9a9..fb2957b644 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml index 9c6915b9a9..fb2957b644 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml index 928ea3c3bb..f703335cda 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -403,7 +412,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -425,19 +434,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -452,6 +460,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml index 850710f66a..6d3bd5446d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml index a8e3750fb7..95e7d67a82 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml index a8e3750fb7..95e7d67a82 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml index a9d3333f3a..73201a5b3b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/flink_1: transforms: - action: update @@ -439,7 +448,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -461,19 +470,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -494,7 +502,7 @@ processors: - gcp transform/flink_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host_name"], resource.attributes["host.name"]) - set(attributes["taskmanager_id"], resource.attributes["flink.taskmanager.id"]) @@ -502,6 +510,12 @@ processors: - set(attributes["task_name"], resource.attributes["flink.task.name"]) - set(attributes["subtask_index"], resource.attributes["flink.subtask.index"]) - set(attributes["resource_type"], resource.attributes["flink.resource.type"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: flinkmetrics/flink: collection_interval: 60s @@ -586,7 +600,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml index 98e49e668a..b02dc14909 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/flink_1: transforms: - action: update @@ -410,7 +419,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -432,19 +441,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -465,7 +473,7 @@ processors: - gcp transform/flink_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host_name"], resource.attributes["host.name"]) - set(attributes["taskmanager_id"], resource.attributes["flink.taskmanager.id"]) @@ -473,6 +481,12 @@ processors: - set(attributes["task_name"], resource.attributes["flink.task.name"]) - set(attributes["subtask_index"], resource.attributes["flink.subtask.index"]) - set(attributes["resource_type"], resource.attributes["flink.resource.type"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: flinkmetrics/flink: collection_interval: 60s @@ -546,7 +560,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml index 0bdd17460b..2b379d458a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/flink_1: transforms: - action: update @@ -475,7 +484,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -497,19 +506,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -537,7 +545,7 @@ processors: - gcp transform/flink_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host_name"], resource.attributes["host.name"]) - set(attributes["taskmanager_id"], resource.attributes["flink.taskmanager.id"]) @@ -545,6 +553,12 @@ processors: - set(attributes["task_name"], resource.attributes["flink.task.name"]) - set(attributes["subtask_index"], resource.attributes["flink.subtask.index"]) - set(attributes["resource_type"], resource.attributes["flink.resource.type"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: flinkmetrics/flink: collection_interval: 60s @@ -675,7 +689,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml index 0bdd17460b..2b379d458a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/flink_1: transforms: - action: update @@ -475,7 +484,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -497,19 +506,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -537,7 +545,7 @@ processors: - gcp transform/flink_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host_name"], resource.attributes["host.name"]) - set(attributes["taskmanager_id"], resource.attributes["flink.taskmanager.id"]) @@ -545,6 +553,12 @@ processors: - set(attributes["task_name"], resource.attributes["flink.task.name"]) - set(attributes["subtask_index"], resource.attributes["flink.subtask.index"]) - set(attributes["resource_type"], resource.attributes["flink.resource.type"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: flinkmetrics/flink: collection_interval: 60s @@ -675,7 +689,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml index 68f9cf4461..e180dbe9ec 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml index 69473c3a89..a81f2586c9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml index cae91499d4..0e3cfbc935 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml index cae91499d4..0e3cfbc935 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml index d710eb7b8b..5c94bad6ec 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml index 5e1cbe4d7e..09add762d7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml index 956e6138de..b11939db6d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml index 956e6138de..b11939db6d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml index db6b142ed8..ab5825af7d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -422,7 +431,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -444,19 +453,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -562,7 +576,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml index 80d2ebce7e..519434635e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -393,7 +402,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -415,19 +424,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml index 2c45d3f80d..f3ab061a18 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -458,7 +467,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -480,19 +489,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml index 2c45d3f80d..f3ab061a18 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -458,7 +467,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -480,19 +489,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml index dec18b1abd..ab208f72a3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -422,7 +431,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -444,19 +453,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -562,7 +576,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml index d0efb1b253..31721273a8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -393,7 +402,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -415,19 +424,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml index ef52b2f5e1..aec8a7ff3b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -458,7 +467,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -480,19 +489,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml index ef52b2f5e1..aec8a7ff3b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -458,7 +467,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -480,19 +489,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml index 9ba9f64225..8256ef6e87 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -553,7 +567,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml index 388f8f8087..3218b64865 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -513,7 +527,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml index ccbc6cb431..613294fe9f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml index ccbc6cb431..613294fe9f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml index 592dcc660f..7f8664523f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml index ee7ab1957d..1a738eee31 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml index 805b26f264..c2e7879e32 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml index 805b26f264..c2e7879e32 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml index f6a9d9a430..d91318b8b1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -553,7 +567,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml index a85d56e4dd..fc8a34a924 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -513,7 +527,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml index e4090e7a0e..9d02ce77f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml index e4090e7a0e..9d02ce77f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml index 5d2ebf2e53..c268e052c3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml index 78aa808b5e..213a23cdd5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml index b386747888..d3832a9dcf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml index b386747888..d3832a9dcf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml index bb50c554a0..eb99603dfa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -553,7 +567,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml index ab09725725..2745575b67 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -513,7 +527,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml index 2217e1518b..62c2bb45c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml index 2217e1518b..62c2bb45c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml index 6911c1792d..af342da867 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml @@ -70,8 +70,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -430,7 +439,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -452,19 +461,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -483,6 +491,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -571,7 +585,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml index 9e531307d6..8c970208bb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,6 +462,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -531,7 +545,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml index e1461cd2a7..ab586c9e8f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml @@ -80,8 +80,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -466,7 +475,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -488,19 +497,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -526,6 +534,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -660,7 +674,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml index e1461cd2a7..ab586c9e8f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml @@ -80,8 +80,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -466,7 +475,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -488,19 +497,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -526,6 +534,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -660,7 +674,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml index 771174c003..a52277882e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml @@ -70,8 +70,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -430,7 +439,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -452,19 +461,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -483,6 +491,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -571,7 +585,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml index e9aa9edbd5..56d85c8b53 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -401,7 +410,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -423,19 +432,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,6 +462,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -531,7 +545,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml index 00b8322762..f2081cdab5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml @@ -80,8 +80,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -466,7 +475,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -488,19 +497,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -526,6 +534,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -660,7 +674,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml index 00b8322762..f2081cdab5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml @@ -80,8 +80,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -466,7 +475,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -488,19 +497,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -526,6 +534,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -660,7 +674,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml index 352f379d16..06e1df021e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -421,7 +430,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -443,19 +452,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -474,6 +482,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -559,7 +573,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml index 660aa9ada3..a964748c34 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml @@ -56,8 +56,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -392,7 +401,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -414,19 +423,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -445,6 +453,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -519,7 +533,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml index 91fbe49efd..15fef24683 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -457,7 +466,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -479,19 +488,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -517,6 +525,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml index 91fbe49efd..15fef24683 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml @@ -71,8 +71,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -457,7 +466,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -479,19 +488,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -517,6 +525,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml index be4b114031..13f14d2f8d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -557,7 +571,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml index 7732b5c3df..c4f31d7604 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -517,7 +531,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml index 1c81a1b401..6262d014f0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -646,7 +660,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml index 1c81a1b401..6262d014f0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -646,7 +660,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml index 8b18009bc2..f940c4fedf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -555,7 +569,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml index 9d861476ad..cf57a52425 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -515,7 +529,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml index e399b335db..45947b041a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml index e399b335db..45947b041a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -644,7 +658,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml index 444bf8976f..af610cff35 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -410,12 +419,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysql_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysql_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -441,7 +444,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +466,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -487,17 +489,19 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - modifyscope/mysql_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysql_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/mysql_0: {} - normalizesums/mysql_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -513,7 +517,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysql_1: + mysql/mysql: collection_interval: 30s endpoint: localhost:3306 metrics: @@ -530,9 +534,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -561,31 +565,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysql: - collection_interval: 30s - datasource: usr:pwd@tcp(localhost:3306)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS service: pipelines: metrics/default__pipeline_hostmetrics: @@ -626,23 +605,15 @@ service: - modifyscope/mysql_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysql - metrics/mysql_mysql_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysql_1_0 - - metricstransform/mysql_1_1 - - modifyscope/mysql_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysql_1 + - mysql/mysql metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml index a36f5526e6..5d56df2ce5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -381,12 +390,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysql_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysql_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -412,7 +415,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -434,19 +437,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -458,17 +460,19 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - modifyscope/mysql_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysql_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/mysql_0: {} - normalizesums/mysql_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -484,7 +488,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysql_1: + mysql/mysql: collection_interval: 30s endpoint: localhost:3306 metrics: @@ -501,9 +505,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -530,31 +534,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysql: - collection_interval: 30s - datasource: usr:pwd@tcp(localhost:3306)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS service: pipelines: metrics/default__pipeline_hostmetrics: @@ -586,23 +565,15 @@ service: - modifyscope/mysql_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysql - metrics/mysql_mysql_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysql_1_0 - - metricstransform/mysql_1_1 - - modifyscope/mysql_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysql_1 + - mysql/mysql metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml index e25be934f7..fe377fae14 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -446,12 +455,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysql_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysql_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -477,7 +480,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -499,19 +502,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -529,18 +531,20 @@ processors: modifyscope/mssql_1: override_scope_name: agent.googleapis.com/mssql override_scope_version: "1.0" - modifyscope/mysql_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysql_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/iis_2: {} normalizesums/mysql_0: {} - normalizesums/mysql_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -559,7 +563,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysql_1: + mysql/mysql: collection_interval: 30s endpoint: localhost:3306 metrics: @@ -576,9 +580,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -605,31 +609,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysql: - collection_interval: 30s - datasource: usr:pwd@tcp(localhost:3306)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -715,23 +694,15 @@ service: - modifyscope/mysql_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysql - metrics/mysql_mysql_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysql_1_0 - - metricstransform/mysql_1_1 - - modifyscope/mysql_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysql_1 + - mysql/mysql metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml index e25be934f7..fe377fae14 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -446,12 +455,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysql_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysql_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -477,7 +480,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -499,19 +502,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -529,18 +531,20 @@ processors: modifyscope/mssql_1: override_scope_name: agent.googleapis.com/mssql override_scope_version: "1.0" - modifyscope/mysql_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysql_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/iis_2: {} normalizesums/mysql_0: {} - normalizesums/mysql_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -559,7 +563,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysql_1: + mysql/mysql: collection_interval: 30s endpoint: localhost:3306 metrics: @@ -576,9 +580,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -605,31 +609,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysql: - collection_interval: 30s - datasource: usr:pwd@tcp(localhost:3306)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -715,23 +694,15 @@ service: - modifyscope/mysql_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysql - metrics/mysql_mysql_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysql_1_0 - - metricstransform/mysql_1_1 - - modifyscope/mysql_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysql_1 + - mysql/mysql metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml index 0cf6baf0a7..7bd1d06bc6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -410,12 +419,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysqlmetrics_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysqlmetrics_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -441,7 +444,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +466,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -487,17 +489,19 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - modifyscope/mysqlmetrics_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysqlmetrics_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/mysqlmetrics_0: {} - normalizesums/mysqlmetrics_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -513,7 +517,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysqlmetrics_1: + mysql/mysqlmetrics: collection_interval: 30s endpoint: /var/run/mysqld/mysqld.sock metrics: @@ -530,9 +534,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -561,31 +565,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysqlmetrics: - collection_interval: 30s - datasource: usr:pwd@unix(/var/run/mysqld/mysqld.sock)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS service: pipelines: metrics/default__pipeline_hostmetrics: @@ -626,23 +605,15 @@ service: - modifyscope/mysqlmetrics_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysqlmetrics - metrics/mysqlpipeline_mysqlmetrics_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysqlmetrics_1_0 - - metricstransform/mysqlmetrics_1_1 - - modifyscope/mysqlmetrics_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysqlmetrics_1 + - mysql/mysqlmetrics metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml index 5043f3a6a5..bdb5b25c50 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -381,12 +390,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysqlmetrics_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysqlmetrics_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -412,7 +415,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -434,19 +437,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -458,17 +460,19 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - modifyscope/mysqlmetrics_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysqlmetrics_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/mysqlmetrics_0: {} - normalizesums/mysqlmetrics_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -484,7 +488,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysqlmetrics_1: + mysql/mysqlmetrics: collection_interval: 30s endpoint: /var/run/mysqld/mysqld.sock metrics: @@ -501,9 +505,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -530,31 +534,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysqlmetrics: - collection_interval: 30s - datasource: usr:pwd@unix(/var/run/mysqld/mysqld.sock)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS service: pipelines: metrics/default__pipeline_hostmetrics: @@ -586,23 +565,15 @@ service: - modifyscope/mysqlmetrics_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysqlmetrics - metrics/mysqlpipeline_mysqlmetrics_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysqlmetrics_1_0 - - metricstransform/mysqlmetrics_1_1 - - modifyscope/mysqlmetrics_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysqlmetrics_1 + - mysql/mysqlmetrics metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml index 2ec84b7b9a..e8ee961ff6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -446,12 +455,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysqlmetrics_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysqlmetrics_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -477,7 +480,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -499,19 +502,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -529,18 +531,20 @@ processors: modifyscope/mssql_1: override_scope_name: agent.googleapis.com/mssql override_scope_version: "1.0" - modifyscope/mysqlmetrics_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysqlmetrics_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/iis_2: {} normalizesums/mysqlmetrics_0: {} - normalizesums/mysqlmetrics_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -559,7 +563,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysqlmetrics_1: + mysql/mysqlmetrics: collection_interval: 30s endpoint: /var/run/mysqld/mysqld.sock metrics: @@ -576,9 +580,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -605,31 +609,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysqlmetrics: - collection_interval: 30s - datasource: usr:pwd@unix(/var/run/mysqld/mysqld.sock)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -715,23 +694,15 @@ service: - modifyscope/mysqlmetrics_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysqlmetrics - metrics/mysqlpipeline_mysqlmetrics_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysqlmetrics_1_0 - - metricstransform/mysqlmetrics_1_1 - - modifyscope/mysqlmetrics_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysqlmetrics_1 + - mysql/mysqlmetrics metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml index 2ec84b7b9a..e8ee961ff6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -446,12 +455,6 @@ processors: match_type: regexp new_name: agent.googleapis.com/$${1} metricstransform/mysqlmetrics_1: - transforms: - - action: update - include: ^(.*)$$ - match_type: regexp - new_name: workload.googleapis.com/$${1} - metricstransform/mysqlmetrics_1_1: transforms: - action: update include: "^mysql\\.buffer_pool\\.(.*)$$" @@ -477,7 +480,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -499,19 +502,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -529,18 +531,20 @@ processors: modifyscope/mssql_1: override_scope_name: agent.googleapis.com/mssql override_scope_version: "1.0" - modifyscope/mysqlmetrics_1_2: - override_scope_name: agent.googleapis.com/mysql - override_scope_version: "1.0" modifyscope/mysqlmetrics_2: override_scope_name: agent.googleapis.com/mysql override_scope_version: "1.0" normalizesums/iis_2: {} normalizesums/mysqlmetrics_0: {} - normalizesums/mysqlmetrics_1_0: {} resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -559,7 +563,7 @@ receivers: mute_process_exe_error: true mute_process_name_error: true processes: {} - mysql/mysqlmetrics_1: + mysql/mysqlmetrics: collection_interval: 30s endpoint: /var/run/mysqld/mysqld.sock metrics: @@ -576,9 +580,9 @@ receivers: mysql.prepared_statements: enabled: false mysql.replica.sql_delay: - enabled: false + enabled: true mysql.replica.time_behind_source: - enabled: false + enabled: true mysql.table.io.wait.count: enabled: false mysql.table.io.wait.time: @@ -605,31 +609,6 @@ receivers: static_configs: - targets: - 0.0.0.0:20201 - sqlquery/mysqlmetrics: - collection_interval: 30s - datasource: usr:pwd@unix(/var/run/mysqld/mysqld.sock)/?checkConnLiveness=false&maxAllowedPacket=0 - driver: mysql - queries: - - metrics: - - attribute_columns: [] - data_type: sum - description: The number of seconds that the replica must lag the source. - metric_name: mysql.replica.sql_delay - monotonic: "false" - static_attributes: {} - unit: s - value_column: SQL_Delay - value_type: int - - attribute_columns: [] - data_type: sum - description: This field is an indication of how “late” the replica is. - metric_name: mysql.replica.time_behind_source - monotonic: "false" - static_attributes: {} - unit: s - value_column: Seconds_Behind_Master - value_type: int - sql: SHOW SLAVE STATUS windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -715,23 +694,15 @@ service: - modifyscope/mysqlmetrics_2 - resourcedetection/_global_0 receivers: - - sqlquery/mysqlmetrics - metrics/mysqlpipeline_mysqlmetrics_1: - exporters: - - googlecloud/otel - processors: - - normalizesums/mysqlmetrics_1_0 - - metricstransform/mysqlmetrics_1_1 - - modifyscope/mysqlmetrics_1_2 - - resourcedetection/_global_0 - receivers: - - mysql/mysqlmetrics_1 + - mysql/mysqlmetrics metrics/otel: exporters: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml index 3fb0e03c83..3ebab2bbd4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -551,7 +565,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml index 9f54f6d363..62616e5351 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -511,7 +525,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml index 6852c56c42..07ce4d6d42 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -640,7 +654,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml index 6852c56c42..07ce4d6d42 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -640,7 +654,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml index 337a432571..06579db845 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -551,7 +565,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml index 4cb0b10dec..6c04d2c9ad 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -511,7 +525,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml index 72a5b15687..8593356810 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -640,7 +654,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml index 72a5b15687..8593356810 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -640,7 +654,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml index fd4959c120..64466c9d9d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -541,7 +555,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -556,7 +570,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -573,7 +587,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -587,7 +601,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -602,7 +616,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -615,7 +629,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -628,7 +642,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -641,7 +655,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -687,7 +701,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -704,7 +718,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -719,7 +733,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -734,7 +748,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -749,7 +763,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -764,7 +778,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -779,7 +793,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -849,7 +863,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -862,7 +876,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -875,7 +889,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -888,7 +902,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -901,7 +915,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -915,7 +929,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -929,7 +943,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -942,7 +956,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -956,7 +970,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -970,7 +984,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -984,7 +998,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -998,7 +1012,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1013,7 +1027,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1043,7 +1057,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1058,7 +1072,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1071,7 +1085,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1084,7 +1098,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1168,7 +1182,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml index ddde048111..0068d6cf73 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -411,7 +420,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -433,19 +442,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -464,6 +472,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -510,7 +524,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -525,7 +539,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -542,7 +556,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -556,7 +570,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -571,7 +585,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -584,7 +598,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -597,7 +611,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -610,7 +624,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -641,7 +655,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -656,7 +670,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -673,7 +687,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -688,7 +702,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -703,7 +717,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -718,7 +732,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -733,7 +747,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -818,7 +832,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -831,7 +845,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -844,7 +858,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -857,7 +871,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -870,7 +884,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -884,7 +898,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -898,7 +912,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -911,7 +925,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -925,7 +939,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -939,7 +953,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -953,7 +967,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -967,7 +981,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -982,7 +996,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -997,7 +1011,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1012,7 +1026,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1027,7 +1041,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1040,7 +1054,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1053,7 +1067,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1128,7 +1142,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml index 2dac5db2c0..9fc7a5832c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -476,7 +485,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -585,7 +599,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -600,7 +614,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -617,7 +631,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -631,7 +645,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -646,7 +660,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -659,7 +673,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -685,7 +699,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -716,7 +730,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -731,7 +745,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -763,7 +777,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -778,7 +792,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -793,7 +807,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -808,7 +822,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -823,7 +837,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -893,7 +907,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -906,7 +920,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -919,7 +933,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -932,7 +946,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -945,7 +959,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -959,7 +973,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -973,7 +987,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -986,7 +1000,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1000,7 +1014,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1014,7 +1028,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1042,7 +1056,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1057,7 +1071,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1072,7 +1086,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1087,7 +1101,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1102,7 +1116,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1115,7 +1129,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1128,7 +1142,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1257,7 +1271,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml index 2dac5db2c0..9fc7a5832c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -476,7 +485,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -585,7 +599,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -600,7 +614,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -617,7 +631,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -631,7 +645,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -646,7 +660,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -659,7 +673,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -685,7 +699,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -716,7 +730,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -731,7 +745,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -763,7 +777,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -778,7 +792,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -793,7 +807,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -808,7 +822,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -823,7 +837,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -893,7 +907,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -906,7 +920,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -919,7 +933,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -932,7 +946,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -945,7 +959,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -959,7 +973,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -973,7 +987,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -986,7 +1000,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1000,7 +1014,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1014,7 +1028,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1042,7 +1056,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1057,7 +1071,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1072,7 +1086,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1087,7 +1101,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1102,7 +1116,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1115,7 +1129,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1128,7 +1142,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1257,7 +1271,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml index a6967ccac7..b501c524bb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -541,7 +555,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -556,7 +570,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -573,7 +587,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -587,7 +601,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -602,7 +616,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -615,7 +629,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -628,7 +642,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -641,7 +655,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -687,7 +701,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -704,7 +718,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -719,7 +733,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -734,7 +748,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -749,7 +763,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -764,7 +778,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -779,7 +793,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -849,7 +863,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -862,7 +876,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -875,7 +889,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -888,7 +902,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -901,7 +915,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -915,7 +929,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -929,7 +943,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -942,7 +956,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -956,7 +970,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -970,7 +984,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -984,7 +998,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -998,7 +1012,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1013,7 +1027,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1043,7 +1057,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1058,7 +1072,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1071,7 +1085,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1084,7 +1098,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1168,7 +1182,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml index ae1537cd69..a57c67ba9f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -411,7 +420,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -433,19 +442,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -464,6 +472,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -510,7 +524,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -525,7 +539,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -542,7 +556,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -556,7 +570,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -571,7 +585,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -584,7 +598,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -597,7 +611,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -610,7 +624,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -641,7 +655,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -656,7 +670,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -673,7 +687,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -688,7 +702,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -703,7 +717,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -718,7 +732,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -733,7 +747,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -818,7 +832,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -831,7 +845,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -844,7 +858,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -857,7 +871,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -870,7 +884,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -884,7 +898,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -898,7 +912,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -911,7 +925,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -925,7 +939,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -939,7 +953,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -953,7 +967,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -967,7 +981,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -982,7 +996,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -997,7 +1011,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1012,7 +1026,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1027,7 +1041,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1040,7 +1054,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1053,7 +1067,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1128,7 +1142,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml index 6c7015220f..85f50a0357 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -476,7 +485,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -585,7 +599,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -600,7 +614,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -617,7 +631,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -631,7 +645,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -646,7 +660,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -659,7 +673,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -685,7 +699,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -716,7 +730,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -731,7 +745,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -763,7 +777,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -778,7 +792,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -793,7 +807,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -808,7 +822,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -823,7 +837,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -893,7 +907,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -906,7 +920,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -919,7 +933,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -932,7 +946,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -945,7 +959,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -959,7 +973,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -973,7 +987,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -986,7 +1000,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1000,7 +1014,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1014,7 +1028,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1042,7 +1056,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1057,7 +1071,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1072,7 +1086,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1087,7 +1101,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1102,7 +1116,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1115,7 +1129,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1128,7 +1142,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1257,7 +1271,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml index 6c7015220f..85f50a0357 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -476,7 +485,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -585,7 +599,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -600,7 +614,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -617,7 +631,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -631,7 +645,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -646,7 +660,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -659,7 +673,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -685,7 +699,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -716,7 +730,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -731,7 +745,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -763,7 +777,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -778,7 +792,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -793,7 +807,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -808,7 +822,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -823,7 +837,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -893,7 +907,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -906,7 +920,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -919,7 +933,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -932,7 +946,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -945,7 +959,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -959,7 +973,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -973,7 +987,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -986,7 +1000,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1000,7 +1014,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1014,7 +1028,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1042,7 +1056,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1057,7 +1071,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1072,7 +1086,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1087,7 +1101,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1102,7 +1116,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1115,7 +1129,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1128,7 +1142,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1257,7 +1271,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml index 0e0bbab479..e5aca8b5c4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -541,7 +555,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -556,7 +570,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -573,7 +587,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -587,7 +601,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -602,7 +616,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -615,7 +629,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -628,7 +642,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -641,7 +655,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -687,7 +701,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -704,7 +718,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -719,7 +733,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -734,7 +748,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -749,7 +763,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -764,7 +778,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -779,7 +793,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -849,7 +863,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -862,7 +876,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -875,7 +889,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -888,7 +902,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -901,7 +915,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -915,7 +929,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -929,7 +943,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -942,7 +956,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -956,7 +970,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -970,7 +984,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -984,7 +998,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -998,7 +1012,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1013,7 +1027,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1043,7 +1057,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1058,7 +1072,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1071,7 +1085,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1084,7 +1098,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1168,7 +1182,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml index 0866a76ddd..1f1fe44ef0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -411,7 +420,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -433,19 +442,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -464,6 +472,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -510,7 +524,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -525,7 +539,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -542,7 +556,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -556,7 +570,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -571,7 +585,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -584,7 +598,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -597,7 +611,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -610,7 +624,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -641,7 +655,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -656,7 +670,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -673,7 +687,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -688,7 +702,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -703,7 +717,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -718,7 +732,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -733,7 +747,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -818,7 +832,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -831,7 +845,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -844,7 +858,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -857,7 +871,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -870,7 +884,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -884,7 +898,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -898,7 +912,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -911,7 +925,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -925,7 +939,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -939,7 +953,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -953,7 +967,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -967,7 +981,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -982,7 +996,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -997,7 +1011,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1012,7 +1026,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1027,7 +1041,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1040,7 +1054,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1053,7 +1067,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1128,7 +1142,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml index 19612642bb..c4079fa98d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -476,7 +485,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -585,7 +599,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -600,7 +614,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -617,7 +631,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -631,7 +645,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -646,7 +660,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -659,7 +673,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -685,7 +699,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -716,7 +730,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -731,7 +745,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -763,7 +777,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -778,7 +792,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -793,7 +807,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -808,7 +822,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -823,7 +837,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -893,7 +907,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -906,7 +920,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -919,7 +933,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -932,7 +946,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -945,7 +959,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -959,7 +973,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -973,7 +987,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -986,7 +1000,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1000,7 +1014,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1014,7 +1028,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1042,7 +1056,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1057,7 +1071,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1072,7 +1086,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1087,7 +1101,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1102,7 +1116,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1115,7 +1129,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1128,7 +1142,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1257,7 +1271,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml index 19612642bb..c4079fa98d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -476,7 +485,7 @@ processors: - action: update_label label: WAIT_CLASS new_label: wait_class - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -498,19 +507,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -536,6 +544,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -585,7 +599,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -600,7 +614,7 @@ receivers: data_type: sum description: The size of tablespaces in the database. metric_name: oracle.tablespace.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -617,7 +631,7 @@ receivers: data_type: sum description: The number of tablespaces in the database. metric_name: oracle.tablespace.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{tablespaces}" @@ -631,7 +645,7 @@ receivers: data_type: sum description: The number of seconds since the last RMAN backup. metric_name: oracle.backup.latest - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: s @@ -646,7 +660,7 @@ receivers: data_type: sum description: The current number of processes. metric_name: oracle.process.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -659,7 +673,7 @@ receivers: data_type: sum description: The maximum number of processes allowed. metric_name: oracle.process.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{processes}" @@ -672,7 +686,7 @@ receivers: data_type: sum description: The current number of sessions. metric_name: oracle.session.count - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -685,7 +699,7 @@ receivers: data_type: sum description: The maximum number of sessions allowed. metric_name: oracle.session.limit - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{sessions}" @@ -716,7 +730,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: used @@ -731,7 +745,7 @@ receivers: data_type: sum description: The programmable global area memory allocated by process. metric_name: oracle.process.pga_memory.size - monotonic: "false" + monotonic: false static_attributes: db.system: oracle state: free @@ -748,7 +762,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -763,7 +777,7 @@ receivers: data_type: sum description: The number of wait events experienced. metric_name: oracle.wait.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -778,7 +792,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -793,7 +807,7 @@ receivers: data_type: sum description: The amount of time waited for wait events. metric_name: oracle.wait.time - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -808,7 +822,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: foreground @@ -823,7 +837,7 @@ receivers: data_type: sum description: The number of timeouts for wait events. metric_name: oracle.wait.timeouts - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: background @@ -893,7 +907,7 @@ receivers: data_type: sum description: The total number of cursors. metric_name: oracle.cursor.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{cursors}" @@ -906,7 +920,7 @@ receivers: data_type: sum description: The current number of cursors. metric_name: oracle.cursor.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{cursors}" @@ -919,7 +933,7 @@ receivers: data_type: sum description: The total number of logons. metric_name: oracle.logon.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{logons}" @@ -932,7 +946,7 @@ receivers: data_type: sum description: The current number of logons. metric_name: oracle.logon.current - monotonic: "false" + monotonic: false static_attributes: db.system: oracle unit: "{logons}" @@ -945,7 +959,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: memory @@ -959,7 +973,7 @@ receivers: data_type: sum description: The total number of sorts. metric_name: oracle.sort.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle type: disk @@ -973,7 +987,7 @@ receivers: data_type: sum description: The total number of rows sorted. metric_name: oracle.sort.row.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rows}" @@ -986,7 +1000,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1000,7 +1014,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: read @@ -1014,7 +1028,7 @@ receivers: data_type: sum description: The number of physical disk operations. metric_name: oracle.disk.operation.count - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1028,7 +1042,7 @@ receivers: data_type: sum description: The number of bytes affected by physical disk operations. metric_name: oracle.disk.operation.size - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: write @@ -1042,7 +1056,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1057,7 +1071,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1072,7 +1086,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: received @@ -1087,7 +1101,7 @@ receivers: data_type: sum description: The total number of bytes communicated on the network. metric_name: oracle.network.data - monotonic: "true" + monotonic: true static_attributes: db.system: oracle direction: sent @@ -1102,7 +1116,7 @@ receivers: data_type: sum description: The total number of user calls such as login, parse, fetch, or execute. metric_name: oracle.user.calls - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{calls}" @@ -1115,7 +1129,7 @@ receivers: data_type: sum description: The total number of user transaction commits. metric_name: oracle.user.commits - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{commits}" @@ -1128,7 +1142,7 @@ receivers: data_type: sum description: The total number of times users manually issue the ROLLBACK statement or an error occurs during a user's transactions metric_name: oracle.user.rollbacks - monotonic: "true" + monotonic: true static_attributes: db.system: oracle unit: "{rollbacks}" @@ -1257,7 +1271,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml index e1c4a3d6e7..30c2f9b89d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,9 +480,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -562,7 +576,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml index 17620ef455..28f0c9670f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,9 +451,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml index 15a4f74ba9..7931a67c40 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml index 15a4f74ba9..7931a67c40 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -651,7 +665,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml index 640ed6fd8e..f6d0246480 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,9 +480,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -564,7 +578,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml index 94e193b123..0fec8a111f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,9 +451,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -524,7 +538,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml index 7bcb6758f2..085b0647cf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -653,7 +667,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml index 7bcb6758f2..085b0647cf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -653,7 +667,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml index 2173733671..56b3c55b9d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,9 +480,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -565,7 +579,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml index 92ef047cb9..73b15d03cd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,9 +451,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -525,7 +539,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml index 181f7f1815..662355a298 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -654,7 +668,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml index 181f7f1815..662355a298 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -654,7 +668,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml index 83764957d4..8d0f700e8b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -472,9 +480,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -568,7 +582,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml index ec56480708..976308ff85 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -443,9 +451,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -528,7 +542,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml index 848b0164ab..0c55f6b200 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -657,7 +671,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml index 848b0164ab..0c55f6b200 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -515,9 +523,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/postgresql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["postgresql.database.name"]) - set(attributes["table"], resource.attributes["postgresql.table.name"]) @@ -657,7 +671,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml index 798b78e648..50b9ceb47c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -588,7 +602,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml index 956c8aa32a..0f4a0fc2e0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -548,7 +562,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml index f527815b1d..8376d0eaff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml index f527815b1d..8376d0eaff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml index 5fb8ffb634..69e6098ec8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -591,7 +605,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml index 0638da0043..bad989402a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -551,7 +565,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml index dadc54c09e..f4aca04c12 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -680,7 +694,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml index dadc54c09e..f4aca04c12 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -680,7 +694,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml index 8901df2e33..aeb0b3a294 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -647,7 +661,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml index 6eca795e6f..7ed91a0653 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -607,7 +621,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml index 980a3385e8..8b4b0549cb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -736,7 +750,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml index 980a3385e8..8b4b0549cb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -736,7 +750,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml index 7b36d8cee6..a5667ae6b4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -588,7 +602,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml index d74acb9560..db4d7c9c26 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -548,7 +562,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml index b806985812..cf029066a8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml index b806985812..cf029066a8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml index 6919dec68f..a2004fefc4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -588,7 +602,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml index 1902e8e0a3..6743475364 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -548,7 +562,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml index 5bf70afafa..5d419b3d5d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml index 5bf70afafa..5d419b3d5d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml index d005aaf568..6ded8af60e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -581,7 +595,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml index 89c9d45e1e..e9b44a8b51 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -541,7 +555,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml index 8f40b1c829..b4eb07fcdf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -670,7 +684,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml index 8f40b1c829..b4eb07fcdf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -670,7 +684,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml index b27b921a96..61b26eb102 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml index de4fdef23d..eea278eb49 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -602,7 +616,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml index f76c53a82d..abe5dc3f65 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -731,7 +745,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml index f76c53a82d..abe5dc3f65 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -731,7 +745,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml index 325a5258b9..c93d2840eb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -588,7 +602,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml index b7878cb8cd..ccd930aea7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -548,7 +562,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml index e1783f78ea..88297b280b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml index e1783f78ea..88297b280b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -677,7 +691,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml index a95604a0be..5160f9bd30 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -617,7 +631,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml index 826cf90fb9..01f174753e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -577,7 +591,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml index 076f442c85..f210d0ef20 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -706,7 +720,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml index 076f442c85..f210d0ef20 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -706,7 +720,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml index 49d1b982f3..f4659af7c3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml @@ -51,8 +51,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -405,7 +414,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -427,19 +436,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -454,9 +462,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -586,7 +600,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml index 8f2cb8fec1..d6b9e013ff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml @@ -46,8 +46,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -376,7 +385,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -398,19 +407,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -425,9 +433,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -546,7 +560,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml index 74affe0208..89573a11d6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -675,7 +689,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml index 74affe0208..89573a11d6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml @@ -61,8 +61,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -441,7 +450,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -463,19 +472,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -497,9 +505,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/prometheus_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(resource.attributes["location"], attributes["location"]) - set(resource.attributes["cluster"], attributes["cluster"]) @@ -675,7 +689,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml index 2226f1bb4c..387475b0ae 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,9 +476,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml index 7c36ef3f64..d6eb0c7d4b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,9 +447,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -512,7 +526,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml index b911bbe932..b17b81372b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml index b911bbe932..b17b81372b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml index 0aa2664577..c781f85c4a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,9 +476,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml index 5b233422b7..d4d1df0234 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,9 +447,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -512,7 +526,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml index 654127e72c..ad9f906517 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml index 654127e72c..ad9f906517 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml index b752f5da4f..502673d0f1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,9 +476,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -553,7 +567,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml index b90ecb8234..a7f36e5934 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,9 +447,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -513,7 +527,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml index 66f5900e19..a403ffe54d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml index 66f5900e19..a403ffe54d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml index 61304bd53c..a3a5ab1a1f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,9 +476,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -556,7 +570,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml index f7050ac7c6..674386cb46 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,9 +447,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -516,7 +530,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml index d6871bef72..68bade17c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -645,7 +659,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml index d6871bef72..68bade17c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,9 +519,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/rabbitmq_2: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["queue_name"], resource.attributes["rabbitmq.queue.name"]) - set(attributes["node_name"], resource.attributes["rabbitmq.node.name"]) @@ -645,7 +659,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml index 82465975ac..d9dadc6ef8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -416,7 +425,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -438,19 +447,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml index aed33c5ef2..f748e4b9ce 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -387,7 +396,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -409,19 +418,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -512,7 +526,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml index 512502c748..3f12ebfe22 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml index 512502c748..3f12ebfe22 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml index 2fdf6a300f..1db8a96bfc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -416,7 +425,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -438,19 +447,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -475,6 +483,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -552,7 +566,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml index 86b7d9bce1..aaa2e6f001 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -387,7 +396,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -409,19 +418,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -446,6 +454,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -512,7 +526,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml index ea8eff57da..4512a8379d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml index ea8eff57da..4512a8379d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/redis_0: metrics: exclude: @@ -452,7 +461,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -474,19 +483,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -518,6 +526,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -641,7 +655,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml index 7ba7123716..e2e40ebd21 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/saphana_0: metrics: exclude: @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -474,9 +482,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/saphana_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host"], resource.attributes["saphana.host"]) receivers: @@ -556,7 +570,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml index 70d05c55cd..b515b20f67 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/saphana_0: metrics: exclude: @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -445,9 +453,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/saphana_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host"], resource.attributes["saphana.host"]) receivers: @@ -516,7 +530,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml index 6e2a05bf93..7981156e87 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/saphana_0: metrics: exclude: @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -517,9 +525,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/saphana_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host"], resource.attributes["saphana.host"]) receivers: @@ -645,7 +659,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml index 6e2a05bf93..7981156e87 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/saphana_0: metrics: exclude: @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -517,9 +525,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/saphana_3: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["host"], resource.attributes["saphana.host"]) receivers: @@ -645,7 +659,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml index 8c7302e4fd..3d6aa295f8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -545,7 +559,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml index 433ec7041f..7c1351e27a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -505,7 +519,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml index e212f792dc..cff43da1c2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -634,7 +648,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml index e212f792dc..cff43da1c2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -634,7 +648,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml index d6c41750f9..125f8a93c1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -545,7 +559,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml index c44bf6b540..0c23cf1e0b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -505,7 +519,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml index 1778d3e4ab..d0838ee5be 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -634,7 +648,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml index 1778d3e4ab..d0838ee5be 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -634,7 +648,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml index d070241f43..e518a6838b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -545,7 +559,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml index 2185196c1a..563f961d63 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -505,7 +519,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml index 354fe2e31b..a2d993ffe9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -634,7 +648,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml index 354fe2e31b..a2d993ffe9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -634,7 +648,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml index 59a2e8a02e..bd808d8f39 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -542,7 +556,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml index bdb6d734d7..cfe7b97178 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -502,7 +516,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml index 95a74527a7..c7646dd320 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -631,7 +645,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml index 95a74527a7..c7646dd320 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -631,7 +645,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml index 6aa2d3f792..59e8a704a5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -431,7 +440,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -453,19 +462,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -512,9 +520,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1227,7 +1241,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml index 4f2b11848c..caa6440a6f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -402,7 +411,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -424,19 +433,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -483,9 +491,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1187,7 +1201,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml index 170b6b516a..928c0757c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -467,7 +476,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -489,19 +498,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -555,9 +563,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1316,7 +1330,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml index 170b6b516a..928c0757c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -467,7 +476,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -489,19 +498,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -555,9 +563,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1316,7 +1330,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml index 2938b548b3..9ff508aab2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -431,7 +440,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -453,19 +462,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -512,9 +520,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1227,7 +1241,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml index edf11e0539..dff4f34693 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -402,7 +411,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -424,19 +433,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -483,9 +491,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1187,7 +1201,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml index 617dabc955..0ee1f3ea2c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -467,7 +476,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -489,19 +498,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -555,9 +563,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1316,7 +1330,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml index 617dabc955..0ee1f3ea2c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -467,7 +476,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -489,19 +498,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -555,9 +563,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1316,7 +1330,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml index a97a96af58..92c4361a0b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -431,7 +440,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -453,19 +462,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -512,9 +520,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1231,7 +1245,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml index a8c7a04329..0223ecc633 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -402,7 +411,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -424,19 +433,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -483,9 +491,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1191,7 +1205,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml index 2475483fe2..a4741c500b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -467,7 +476,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -489,19 +498,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -555,9 +563,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1320,7 +1334,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml index 2475483fe2..a4741c500b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count filter/vault_1: metrics: include: @@ -467,7 +476,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -489,19 +498,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -555,9 +563,15 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" transform/vault_0: metric_statements: - context: datapoint + - context: datapoint statements: - convert_summary_count_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" - convert_summary_sum_val_to_sum("cumulative", true) where metric.name == "vault_azure_delete" @@ -1320,7 +1334,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml index 63611473f6..281a27b27f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -547,7 +561,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml index 447d66ba34..9dc2e6e0c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -507,7 +521,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml index 67d37cb59c..62a76ad509 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -636,7 +650,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml index 67d37cb59c..62a76ad509 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -636,7 +650,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml index 63611473f6..281a27b27f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -547,7 +561,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml index 447d66ba34..9dc2e6e0c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -507,7 +521,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml index 67d37cb59c..62a76ad509 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -636,7 +650,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml index 67d37cb59c..62a76ad509 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -636,7 +650,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml index adfac4713d..f822af83a5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -541,7 +555,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml index 7299ba327a..ae246c6b44 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -501,7 +515,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml index 2b6b0f7fa2..fd4841b727 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -630,7 +644,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml index 2b6b0f7fa2..fd4841b727 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -630,7 +644,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml index adfac4713d..f822af83a5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -409,7 +418,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -431,19 +440,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -541,7 +555,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml index 7299ba327a..ae246c6b44 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -380,7 +389,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -402,19 +411,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -501,7 +515,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml index 2b6b0f7fa2..fd4841b727 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -630,7 +644,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml index 2b6b0f7fa2..fd4841b727 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -445,7 +454,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -467,19 +476,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -630,7 +644,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml index 63dc786527..eca3deea1c 100644 --- a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -422,7 +431,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -444,19 +453,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -478,6 +486,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -591,7 +605,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml index 63dc786527..eca3deea1c 100644 --- a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -422,7 +431,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -444,19 +453,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -478,6 +486,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -591,7 +605,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml index a105f235a4..b063d037e1 100644 --- a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -619,7 +633,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml index a105f235a4..b063d037e1 100644 --- a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -619,7 +633,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml index 0f9eedb2c6..1b0b7434c2 100644 --- a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml @@ -57,8 +57,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -437,7 +446,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -459,19 +468,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -493,6 +501,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -609,7 +623,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml index 369a348dd8..b85cb32ba7 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -403,7 +412,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -425,19 +434,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -452,6 +460,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml index 3c26e0d0d6..320f85eed4 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml index bd778841eb..ca7daf9ebb 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml index bd778841eb..ca7daf9ebb 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml index 593b790394..888ad2f486 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml @@ -49,8 +49,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -403,7 +412,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -425,19 +434,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -452,6 +460,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -522,7 +536,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml index 9653b810cd..76ef752942 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml @@ -43,8 +43,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -373,7 +382,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -395,19 +404,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -422,6 +430,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -481,7 +495,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml index 23150a7638..d74be91eb1 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml index 23150a7638..d74be91eb1 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -440,7 +449,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -462,19 +471,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -496,6 +504,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -612,7 +626,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml index bbd7f62397..787899d439 100644 --- a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -422,7 +431,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -444,19 +453,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -478,6 +486,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -591,7 +605,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml index bbd7f62397..787899d439 100644 --- a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml @@ -42,8 +42,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -422,7 +431,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -444,19 +453,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -478,6 +486,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -591,7 +605,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml index f671d1c8ef..5bb05fdae3 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/active__directory__ds_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: active_directory_ds/active__directory__ds: collection_interval: 60s @@ -639,7 +653,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml index f671d1c8ef..5bb05fdae3 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/active__directory__ds_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: active_directory_ds/active__directory__ds: collection_interval: 60s @@ -639,7 +653,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml index 3c1f2fd31a..10318119fb 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/iis__v2_2: {} metricstransform/fluentbit_1: transforms: @@ -461,7 +470,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -483,19 +492,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -523,15 +531,21 @@ processors: - gcp transform/iis__v2_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["site"], resource.attributes["iis.site"]) - set(attributes["app_pool"], resource.attributes["iis.application_pool"]) transform/iis__v2_1: metric_statements: - context: datapoint + - context: datapoint statements: - keep_keys(resource.attributes, []) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -663,7 +677,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml index 3c1f2fd31a..10318119fb 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/iis__v2_2: {} metricstransform/fluentbit_1: transforms: @@ -461,7 +470,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -483,19 +492,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -523,15 +531,21 @@ processors: - gcp transform/iis__v2_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["site"], resource.attributes["iis.site"]) - set(attributes["app_pool"], resource.attributes["iis.application_pool"]) transform/iis__v2_1: metric_statements: - context: datapoint + - context: datapoint statements: - keep_keys(resource.attributes, []) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -663,7 +677,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml index bf2f3afaab..16b2180d8a 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/iis_2: {} metricstransform/fluentbit_1: transforms: @@ -428,7 +437,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -450,19 +459,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -486,15 +494,21 @@ processors: - gcp transform/iis_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["site"], resource.attributes["iis.site"]) - set(attributes["app_pool"], resource.attributes["iis.application_pool"]) transform/iis_1: metric_statements: - context: datapoint + - context: datapoint statements: - keep_keys(resource.attributes, []) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -610,7 +624,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml index bf2f3afaab..16b2180d8a 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml @@ -60,8 +60,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count groupbyattrs/iis_2: {} metricstransform/fluentbit_1: transforms: @@ -428,7 +437,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -450,19 +459,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -486,15 +494,21 @@ processors: - gcp transform/iis_0: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["site"], resource.attributes["iis.site"]) - set(attributes["app_pool"], resource.attributes["iis.application_pool"]) transform/iis_1: metric_statements: - context: datapoint + - context: datapoint statements: - keep_keys(resource.attributes, []) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -610,7 +624,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml index 50453e536e..8c5a0d47c2 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml @@ -55,8 +55,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -415,7 +424,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -437,19 +446,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -468,6 +476,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -553,7 +567,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml index b42f1817da..ad49ce8add 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml @@ -50,8 +50,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -386,7 +395,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -408,19 +417,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -439,6 +447,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -513,7 +527,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml index 0224ee5fbb..4713dd9cb1 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml index 0224ee5fbb..4713dd9cb1 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -451,7 +460,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -473,19 +482,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -511,6 +519,12 @@ processors: resourcedetection/_global_0: detectors: - gcp + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -642,7 +656,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml index f97c9528ee..01bc5ca101 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -516,9 +524,15 @@ processors: - gcp transform/mssql__v2_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["sqlserver.database.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml index f97c9528ee..01bc5ca101 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -454,7 +463,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -476,19 +485,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -516,9 +524,15 @@ processors: - gcp transform/mssql__v2_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["sqlserver.database.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -648,7 +662,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml index 9ef2f1a0e4..f563a53309 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -439,7 +448,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -461,19 +470,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -498,9 +506,15 @@ processors: - gcp transform/mssql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["sqlserver.database.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -618,7 +632,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml index 9ef2f1a0e4..f563a53309 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml @@ -65,8 +65,17 @@ processors: metric_names: - otelcol_process_uptime - otelcol_process_memory_rss - - otelcol_grpc_io_client_completed_rpcs - - otelcol_googlecloudmonitoring_point_count + - grpc_client_attempt_duration + - googlecloudmonitoring_point_count + filter/otel_2: + metrics: + include: + match_type: strict + metric_names: + - otelcol_process_uptime + - otelcol_process_memory_rss + - grpc_client_attempt_duration_count + - googlecloudmonitoring_point_count metricstransform/fluentbit_1: transforms: - action: update @@ -439,7 +448,7 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} - metricstransform/otel_1: + metricstransform/otel_3: transforms: - action: update include: otelcol_process_uptime @@ -461,19 +470,18 @@ processors: aggregation_type: sum label_set: [] - action: update - include: otelcol_grpc_io_client_completed_rpcs + include: grpc_client_attempt_duration_count new_name: agent/api_request_count operations: - - action: toggle_scalar_data_type - action: update_label - label: grpc_client_status + label: grpc_status new_label: state - action: aggregate_labels aggregation_type: sum label_set: - state - action: update - include: otelcol_googlecloudmonitoring_point_count + include: googlecloudmonitoring_point_count new_name: agent/monitoring/point_count operations: - action: toggle_scalar_data_type @@ -498,9 +506,15 @@ processors: - gcp transform/mssql_1: metric_statements: - context: datapoint + - context: datapoint statements: - set(attributes["database"], resource.attributes["sqlserver.database.name"]) + transform/otel_1: + error_mode: ignore + metric_statements: + - context: metric + statements: + - extract_count_metric(true) where name == "grpc_client_attempt_duration" receivers: hostmetrics/hostmetrics: collection_interval: 60s @@ -618,7 +632,9 @@ service: - googlecloud processors: - filter/otel_0 - - metricstransform/otel_1 + - transform/otel_1 + - filter/otel_2 + - metricstransform/otel_3 - resourcedetection/_global_0 receivers: - prometheus/otel diff --git a/go.mod b/go.mod index 90efe65fc5..b072082805 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,18 @@ module github.com/GoogleCloudPlatform/ops-agent -go 1.21.11 +go 1.22.2 require ( - cloud.google.com/go/compute/metadata v0.5.0 + cloud.google.com/go/compute/metadata v0.5.2 cloud.google.com/go/logging v1.11.0 cloud.google.com/go/monitoring v1.21.0 cloud.google.com/go/storage v1.43.0 cloud.google.com/go/trace v1.11.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.3 github.com/binxio/gcloudconfig v0.1.5 github.com/blang/semver v3.5.1+incompatible github.com/cenkalti/backoff/v4 v4.3.0 github.com/go-playground/validator/v10 v10.11.1 - github.com/go-sql-driver/mysql v1.7.0 github.com/goccy/go-yaml v1.11.2 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 @@ -25,15 +24,15 @@ require ( github.com/prometheus/prometheus v0.51.2-0.20240405174432-b4a973753c6e github.com/shirou/gopsutil v3.21.11+incompatible github.com/smallnest/weighted v0.0.0-20230419055410-36b780e40a7a - go.opentelemetry.io/contrib/detectors/gcp v1.29.0 - go.opentelemetry.io/otel v1.29.0 - go.opentelemetry.io/otel/metric v1.29.0 - go.opentelemetry.io/otel/sdk v1.29.0 - go.opentelemetry.io/otel/sdk/metric v1.29.0 + go.opentelemetry.io/contrib/detectors/gcp v1.31.0 + go.opentelemetry.io/otel v1.31.0 + go.opentelemetry.io/otel/metric v1.31.0 + go.opentelemetry.io/otel/sdk v1.31.0 + go.opentelemetry.io/otel/sdk/metric v1.31.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 golang.org/x/exp v0.0.0-20240119083558-1b970713d09a - golang.org/x/sys v0.24.0 + golang.org/x/sys v0.26.0 golang.org/x/text v0.17.0 google.golang.org/api v0.195.0 google.golang.org/genproto v0.0.0-20240827150818-7e3bb234dfed // indirect @@ -64,8 +63,8 @@ require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.3 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect github.com/armon/go-metrics v0.4.1 // indirect @@ -160,7 +159,7 @@ require ( go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel/trace v1.29.0 // indirect + go.opentelemetry.io/otel/trace v1.31.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/crypto v0.26.0 // indirect golang.org/x/mod v0.19.0 // indirect diff --git a/go.sum b/go.sum index 292b06c323..b759dbabd3 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= -cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/compute/metadata v0.5.2 h1:UxK4uu/Tn+I3p2dYWTfiX4wva7aYlKixAHn3fyqngqo= +cloud.google.com/go/compute/metadata v0.5.2/go.mod h1:C66sj2AluDcIqakBq/M8lw8/ybHgOZqin2obFxa/E5k= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/iam v1.2.0 h1:kZKMKVNk/IsSSc/udOb83K0hL/Yh/Gcqpz+oAkoIFN8= @@ -75,14 +75,14 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 h1:pB2F2JKCj1Znmp2rwxxt1J0Fg0wezTMgWYk5Mpbi1kg= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 h1:UQ0AhxogsIRZDkElkblfnwjc3IaltCm2HUMvezQaL7s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1/go.mod h1:jyqM3eLpJ3IbIFDTKVz2rF9T/xWGW0rIriGwnz8l9Tk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1/go.mod h1:0wEl7vrAD8mehJyohS9HZy+WyEOaQO2mJx86Cvh93kM= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.3 h1:cb3br57K508pQEFgBxn9GDhPS9HefpyMPK1RzmtMNzk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.3/go.mod h1:itPGVDKf9cC/ov4MdvJ2QZ0khw4bfoo9jzwTJlaxy2k= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.3 h1:xir5X8TS8UBVPWg2jHL+cSTf0jZgqYQSA54TscSt1/0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.3/go.mod h1:SsdWig2J5PMnfMvfJuEb1uZa8Y+kvNyvrULFo69gTFk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.3 h1:Nl7phYyHjnqofWDpD+6FYdiwtNIxebn0AHLry7Sxb0M= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.3/go.mod h1:pNP/L2wDlaQnQlFvkDKGSruDoYRpmAxB6drgsskfYwg= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3 h1:2vcVkrNdSMJpoOVAWi9ApsQR5iqNeFGt5Qx8Xlt3IoI= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.3/go.mod h1:wRbFgBQUVm1YXrvWKofAEmq9HNJTDphbAaJSSX01KUI= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -203,8 +203,6 @@ github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJ github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= github.com/go-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz03g= github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0= -github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= -github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= @@ -580,26 +578,26 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/detectors/gcp v1.29.0 h1:TiaiXB4DpGD3sdzNlYQxruQngn5Apwzi1X0DRhuGvDQ= -go.opentelemetry.io/contrib/detectors/gcp v1.29.0/go.mod h1:GW2aWZNwR2ZxDLdv8OyC2G8zkRoQBuURgV7RPQgcPoU= +go.opentelemetry.io/contrib/detectors/gcp v1.31.0 h1:G1JQOreVrfhRkner+l4mrGxmfqYCAuy76asTDAo0xsA= +go.opentelemetry.io/contrib/detectors/gcp v1.31.0/go.mod h1:tzQL6E1l+iV44YFTkcAeNQqzXUiekSYP9jjJjXwEd00= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= -go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 h1:Xw8U6u2f8DK2XAkGRFV7BBLENgnTGX9i4rQRxJf+/vs= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0/go.mod h1:6KW1Fm6R/s6Z3PGXwSJN2K4eT6wQB3vXX6CVnYX9NmM= -go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= -go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= -go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= -go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= -go.opentelemetry.io/otel/sdk/metric v1.29.0 h1:K2CfmJohnRgvZ9UAj2/FhIf/okdWcNdBwe1m8xFXiSY= -go.opentelemetry.io/otel/sdk/metric v1.29.0/go.mod h1:6zZLdCl2fkauYoZIOn/soQIDSWFmNSRcICarHfuhNJQ= -go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= -go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= +go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= +go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= +go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= +go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -788,8 +786,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= diff --git a/integration_test/ops_agent_test/main_test.go b/integration_test/ops_agent_test/main_test.go index 5b0e455c14..e8af164aa0 100644 --- a/integration_test/ops_agent_test/main_test.go +++ b/integration_test/ops_agent_test/main_test.go @@ -3050,7 +3050,7 @@ func TestPrometheusUntypedMetricsReset(t *testing.T) { {"prometheus.googleapis.com/untyped_metric/unknown", nil, metric.MetricDescriptor_GAUGE, metric.MetricDescriptor_DOUBLE, 10.0}, {"prometheus.googleapis.com/untyped_metric/unknown:counter", nil, - metric.MetricDescriptor_CUMULATIVE, metric.MetricDescriptor_DOUBLE, 10.0}, + metric.MetricDescriptor_CUMULATIVE, metric.MetricDescriptor_DOUBLE, 0.0}, } var multiErr error @@ -3073,7 +3073,7 @@ func TestPrometheusUntypedMetricsReset(t *testing.T) { {"prometheus.googleapis.com/untyped_metric/unknown", nil, metric.MetricDescriptor_GAUGE, metric.MetricDescriptor_DOUBLE, 1000.0}, {"prometheus.googleapis.com/untyped_metric/unknown:counter", nil, - metric.MetricDescriptor_CUMULATIVE, metric.MetricDescriptor_DOUBLE, 1000.0}, + metric.MetricDescriptor_CUMULATIVE, metric.MetricDescriptor_DOUBLE, 990.0}, } var multiErr error diff --git a/submodules/opentelemetry-operations-collector b/submodules/opentelemetry-operations-collector index efa0975076..632661265d 160000 --- a/submodules/opentelemetry-operations-collector +++ b/submodules/opentelemetry-operations-collector @@ -1 +1 @@ -Subproject commit efa0975076d0dedc0e290d7aa93ccd9e11d8c367 +Subproject commit 632661265d6d2856804c9097a232fd06aaffa0a2 diff --git a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml index 9d308b68e7..fdba6f2e8a 100644 --- a/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml +++ b/transformation_test/testdata/ops_agent_test-TestLogEntrySpecialFields/output_otel.yaml @@ -1,45 +1,47 @@ - collector_errors: - - caller: exporterhelper/common.go:296 + - caller: internal/base_exporter.go:130 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: error msg: Exporting failed. Rejecting data. Try enabling sending_queue to survive temporary failures. rejected_items: 1.0 stacktrace: |- - go.opentelemetry.io/collector/exporter/exporterhelper.(*baseExporter).send - go.opentelemetry.io/collector/exporter@v0.102.0/exporterhelper/common.go:296 - go.opentelemetry.io/collector/exporter/exporterhelper.NewLogsRequestExporter.func1 - go.opentelemetry.io/collector/exporter@v0.102.0/exporterhelper/logs.go:134 + go.opentelemetry.io/collector/exporter/exporterhelper/internal.(*BaseExporter).Send + go.opentelemetry.io/collector/exporter@v0.112.0/exporterhelper/internal/base_exporter.go:130 + go.opentelemetry.io/collector/exporter/exporterhelper.NewLogsRequest.func1 + go.opentelemetry.io/collector/exporter@v0.112.0/exporterhelper/logs.go:138 go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs - go.opentelemetry.io/collector/consumer@v0.102.1/logs.go:25 - go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1 - go.opentelemetry.io/collector/processor@v0.102.0/processorhelper/logs.go:56 + go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26 + go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs + go.opentelemetry.io/collector@v0.112.0/internal/fanoutconsumer/logs.go:62 + go.opentelemetry.io/collector/processor/processorhelper.NewLogs.func1 + go.opentelemetry.io/collector/processor@v0.112.0/processorhelper/logs.go:66 go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs - go.opentelemetry.io/collector/consumer@v0.102.1/logs.go:25 - go.opentelemetry.io/collector/processor/processorhelper.NewLogsProcessor.func1 - go.opentelemetry.io/collector/processor@v0.102.0/processorhelper/logs.go:56 + go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26 + go.opentelemetry.io/collector/processor/processorhelper.NewLogs.func1 + go.opentelemetry.io/collector/processor@v0.112.0/processorhelper/logs.go:66 go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs - go.opentelemetry.io/collector/consumer@v0.102.1/logs.go:25 + go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26 go.opentelemetry.io/collector/consumer.ConsumeLogsFunc.ConsumeLogs - go.opentelemetry.io/collector/consumer@v0.102.1/logs.go:25 + go.opentelemetry.io/collector/consumer@v0.112.0/logs.go:26 go.opentelemetry.io/collector/internal/fanoutconsumer.(*logsConsumer).ConsumeLogs - go.opentelemetry.io/collector@v0.102.1/internal/fanoutconsumer/logs.go:62 + go.opentelemetry.io/collector@v0.112.0/internal/fanoutconsumer/logs.go:62 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry.(*logsConsumer).ConsumeLogs - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.102.0/consumerretry/logs.go:37 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.112.0/consumerretry/logs.go:37 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.102.0/adapter/receiver.go:126 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.112.0/adapter/receiver.go:110 - caller: consumerretry/logs.go:39 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: error msg: ConsumeLogs() failed. Enable retry_on_failure to slow down reading logs and avoid dropping. stacktrace: |- github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/consumerretry.(*logsConsumer).ConsumeLogs - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.102.0/consumerretry/logs.go:39 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.112.0/consumerretry/logs.go:39 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.102.0/adapter/receiver.go:126 - - caller: adapter/receiver.go:128 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.112.0/adapter/receiver.go:110 + - caller: adapter/receiver.go:112 error: "could not process attribute gcp.source_location: json: cannot unmarshal string into Go struct field LogEntrySourceLocation.line of type int64" level: error msg: ConsumeLogs() failed stacktrace: |- github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/adapter.(*receiver).consumerLoop - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.102.0/adapter/receiver.go:128 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.112.0/adapter/receiver.go:112 diff --git a/transformation_test/testdata/test_timezone/output_otel.yaml b/transformation_test/testdata/test_timezone/output_otel.yaml index 83f5e7c9b9..98ad3f74a6 100644 --- a/transformation_test/testdata/test_timezone/output_otel.yaml +++ b/transformation_test/testdata/test_timezone/output_otel.yaml @@ -22,7 +22,7 @@ timestamp: now partialSuccess: true - collector_errors: - - caller: ottl@v0.102.0/parser.go:273 + - caller: ottl@v0.112.0/parser.go:292 error: "parsing time \"unparsable time\" as \"2006-01-02T15:04\": cannot parse \"unparsable time\" as \"2006\"" level: warn msg: failed to execute statement