Skip to content

fix(byoo): retain collector and cAdvisor metrics - #693

Merged
kristinapathak merged 4 commits into
mainfrom
kpathak/byoo-self-scrape-counter-metrics
Aug 6, 2026
Merged

fix(byoo): retain collector and cAdvisor metrics#693
kristinapathak merged 4 commits into
mainfrom
kpathak/byoo-self-scrape-counter-metrics

Conversation

@kristinapathak

@kristinapathak kristinapathak commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Why

The collector self-scrape emitted valid internal metrics whose names did not
match the generated exact allowlist. The Kubernetes cAdvisor selector also
excluded pod-sandbox series, which provide pod network metrics and additional
CPU and memory variants.

Issues

Closes #692

What changed

  • Keep the collector self-observability namespace with otelcol_.*.
  • Include and retain cAdvisor container="POD" sandbox series for Kubernetes
    container workloads.
  • Update metric goldens for POD labels and collector queue gauges. Treat the
    conditional kube_configmap_created metric as optional.
  • Regenerate templates, examples, and the metrics reference.

Customer Release Notes

Restores collector self-observability and cAdvisor pod-network metrics for
BYOO telemetry.

Plan Summary

Not applicable.

Usage

Not applicable.

Testing

  • make update-config-template
  • make update-examples
  • go test ./internal/otelconfig
  • go test . from tools/byoo/otelconfig-validate

Notes

The upstream cAdvisor POD label is preserved for downstream consumers.

References

None.

Related Pull Requests

None.

Dependencies

None.

@kristinapathak
kristinapathak requested a review from a team as a code owner August 5, 2026 21:27
@coderabbitai

coderabbitai Bot commented Aug 5, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

The BYOO OTEL Collector now retains all otelcol_ self-scrape metrics. Kubernetes cAdvisor configurations include POD and empty-container series. Generator tests, documentation, templates, examples, validation fixtures, and the collector version were updated.

Changes

Collector metric retention

Layer / File(s) Summary
Generator contract and validation
src/compute-plane-services/byoo-otel-collector/generator/*, tools/byoo/otelconfig-validate/*
The generator uses otelcol_.* for self-scrape metrics. Tests validate generated filters, cAdvisor selectors, Markdown heading levels, and conditional metric normalization.
Generated templates and configuration outputs
src/compute-plane-services/byoo-otel-collector/internal/otelconfig/*, src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/*, src/compute-plane-services/byoo-otel-collector/VERSION
Templates and examples retain all otelcol_ metrics. Kubernetes cAdvisor selectors match POD and empty-container series. The collector version changed to 0.157.11.
Validation fixtures
src/libraries/go/lib/validator/otelconfig/golden/*
Golden fixtures add POD cAdvisor labels and collector exporter queue metrics.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Possibly related PRs

  • NVIDIA/nvcf#532: Both changes update BYOO OTEL Collector self-metric allowlists and templates.
  • NVIDIA/nvcf#648: Both changes update BYOO OTEL Collector version and self-metric configuration.

Suggested reviewers: famousdirector

🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Out of Scope Changes check ⚠️ Warning The PR also changes cAdvisor selectors, documentation headings, the version, and configmap metric normalization, which are not required by issue #692. Split the unrelated changes into separate pull requests or link issues that explicitly require the cAdvisor, documentation, version, and configmap updates.
Docstring Coverage ⚠️ Warning Docstring coverage is 14.29% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (3 passed)
Check name Status Explanation
Linked Issues check ✅ Passed The generated configurations now retain raw otelcol_ counter names and existing suffixed aliases, with tests covering the updated matcher.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title follows Conventional Commits and accurately describes the fix to retain collector and cAdvisor metrics.
✨ Finishing Touches 💡 1
📝 Generate docstrings 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch kpathak/byoo-self-scrape-counter-metrics

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@src/compute-plane-services/byoo-otel-collector/generator/doc/README.md`:
- Around line 186-198: Update both raw-counter-inputs headings in the README to
use the valid #### level under their existing ### parent headings, preserving
the surrounding counter input lists and text.

In `@src/compute-plane-services/byoo-otel-collector/generator/source-config.yaml`:
- Around line 459-472: Retain raw exporter failure counters by adding all six
raw counter names to both raw-counter-inputs lists in
src/compute-plane-services/byoo-otel-collector/generator/source-config.yaml
(459-472 and 689-702), update RAW_SELF_SCRAPE_COUNTER_METRICS in
src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py
(37-49), and regenerate the committed outputs for
src/compute-plane-services/byoo-otel-collector/generator/doc/README.md (186-198,
318-330) plus the Kubernetes and VM templates at the specified ranges; use
collector version v0.157.0.

In
`@src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py`:
- Around line 107-112: Update the assertions in the rendered-template test to
verify each RAW_SELF_SCRAPE_COUNTER_METRICS entry as a complete metric token
rather than a substring, so a metric suffixed with “_total” cannot satisfy the
check. Use complete regex alternatives or parse the generated keep regex while
preserving validation across every template in template_names.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 550a0c96-d640-4663-b547-26f801ee34dc

📥 Commits

Reviewing files that changed from the base of the PR and between 61b78e7 and 3f967c7.

⛔ Files ignored due to path filters (4)
  • src/compute-plane-services/byoo-otel-collector/generator/gen/generated_src-config-k8s-container.yaml.tmpl is excluded by !**/gen/**
  • src/compute-plane-services/byoo-otel-collector/generator/gen/generated_src-config-k8s-helm.yaml.tmpl is excluded by !**/gen/**
  • src/compute-plane-services/byoo-otel-collector/generator/gen/generated_src-config-vm-container.yaml.tmpl is excluded by !**/gen/**
  • src/compute-plane-services/byoo-otel-collector/generator/gen/generated_src-config-vm-helm.yaml.tmpl is excluded by !**/gen/**
📒 Files selected for processing (89)
  • src/compute-plane-services/byoo-otel-collector/VERSION
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_metric_subset.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_helm_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_helm_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_function_helm_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/vm/config_task_helm_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/generator/doc/README.md
  • src/compute-plane-services/byoo-otel-collector/generator/source-config.yaml
  • src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/templates/config-k8s-container.yaml.tmpl
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/templates/config-k8s-helm.yaml.tmpl
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/templates/config-vm-container.yaml.tmpl
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/templates/config-vm-helm.yaml.tmpl

Comment thread src/compute-plane-services/byoo-otel-collector/generator/doc/README.md Outdated
Comment thread src/compute-plane-services/byoo-otel-collector/generator/source-config.yaml Outdated
@kristinapathak kristinapathak changed the title fix(byoo): retain collector self-scrape counters fix(byoo): retain collector and cAdvisor metrics Aug 5, 2026
@kristinapathak
kristinapathak requested review from a team as code owners August 5, 2026 22:38

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py (1)

53-69: 🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win

Assert the cAdvisor label-clearing order.

The PR contract requires the container label to be cleared before the existing label allowlist. This test only checks that CADVISOR_POD_SELECTOR appears in the cAdvisor block. It can pass while the label remains or while clearing occurs after the allowlist. Assert the rendered label-clearing rule and its position relative to the allowlist.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py`
around lines 53 - 69, Update
test_k8s_container_cadvisor_keeps_pod_sandbox_metrics to assert the rendered
cAdvisor configuration clears the container label and that this rule appears
before the existing label allowlist, using the relevant rendered rule text or
symbols already defined in the test. Keep the existing CADVISOR_POD_SELECTOR
assertion.
🧹 Nitpick comments (1)
src/compute-plane-services/byoo-otel-collector/generator/test_markdown_helper.py (1)

10-31: 🎯 Functional Correctness | 🔵 Trivial | ⚡ Quick win

Cover the generic-category branch.

The implementation intentionally omits a category heading for catagory: generic, but this test covers only CPU. Add a generic category and assert that its metrics render without a #### heading.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@src/compute-plane-services/byoo-otel-collector/generator/test_markdown_helper.py`
around lines 10 - 31, Add coverage to
test_category_heading_is_one_level_below_job_heading for a metric_allow_list
entry with catagory set to generic, and assert that the generic category’s
metrics are rendered without a #### category heading while preserving the
existing CPU heading assertions.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Outside diff comments:
In
`@src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py`:
- Around line 53-69: Update
test_k8s_container_cadvisor_keeps_pod_sandbox_metrics to assert the rendered
cAdvisor configuration clears the container label and that this rule appears
before the existing label allowlist, using the relevant rendered rule text or
symbols already defined in the test. Keep the existing CADVISOR_POD_SELECTOR
assertion.

---

Nitpick comments:
In
`@src/compute-plane-services/byoo-otel-collector/generator/test_markdown_helper.py`:
- Around line 10-31: Add coverage to
test_category_heading_is_one_level_below_job_heading for a metric_allow_list
entry with catagory set to generic, and assert that the generic category’s
metrics are rendered without a #### category heading while preserving the
existing CPU heading assertions.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 2a29dec9-e89a-4282-bed3-f39900695d41

📥 Commits

Reviewing files that changed from the base of the PR and between 90fa49a and 1bf3827.

⛔ Files ignored due to path filters (1)
  • src/compute-plane-services/byoo-otel-collector/generator/gen/generated_src-config-k8s-container.yaml.tmpl is excluded by !**/gen/**
📒 Files selected for processing (34)
  • src/compute-plane-services/byoo-otel-collector/VERSION
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_metric_subset.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/generator/doc/README.md
  • src/compute-plane-services/byoo-otel-collector/generator/markdown_helper.py
  • src/compute-plane-services/byoo-otel-collector/generator/test_markdown_helper.py
  • src/compute-plane-services/byoo-otel-collector/generator/test_prometheus_config_generator.py
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/source_templates/src-config-k8s-container.yaml.tmpl
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/templates/config-k8s-container.yaml.tmpl
  • src/libraries/go/lib/validator/otelconfig/golden/metrics_gfn_function_container.json
  • src/libraries/go/lib/validator/otelconfig/golden/metrics_gfn_function_helm.json
  • src/libraries/go/lib/validator/otelconfig/golden/metrics_non-gfn_function_container.json
  • src/libraries/go/lib/validator/otelconfig/golden/metrics_non-gfn_function_helm.json
  • tools/byoo/otelconfig-validate/golden.go
  • tools/byoo/otelconfig-validate/golden_test.go
💤 Files with no reviewable changes (23)
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/templates/config-k8s-container.yaml.tmpl
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_telemetry_endpoint_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_otelcollector_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/internal/otelconfig/source_templates/src-config-k8s-container.yaml.tmpl
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input1.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_thanos_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_metric_subset.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input4.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_azure_monitor.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input3.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_input2.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_task_container_kratos_thanos_prd.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_kratos_logs_stg.yaml
  • src/compute-plane-services/byoo-otel-collector/examples/otelconfigs/k8s/config_function_container_azure_monitor.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • src/compute-plane-services/byoo-otel-collector/VERSION

@apartha-nv

Copy link
Copy Markdown
Contributor

Quick note on the description — it says the container value is cleared before labelkeep, but looking at the code I think the intent is actually to keep it. The existing labelkeep in the cAdvisor block already includes container in its regex, and the golden file updates confirm "container": "POD" shows up in the exported metrics as expected, should we update the decsription to match ?

@kristinapathak

Copy link
Copy Markdown
Contributor Author

thanks for pointing that out - I'll update the description. Originally the "container": "POD" was being removed, but I decided that wasn't the direction we wanted to take.

@apartha-nv apartha-nv left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left couple of minor comments.

@kristinapathak
kristinapathak added this pull request to the merge queue Aug 6, 2026
Merged via the queue into main with commit 46a4e02 Aug 6, 2026
22 checks passed
@kristinapathak
kristinapathak deleted the kpathak/byoo-self-scrape-counter-metrics branch August 6, 2026 05:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

fix(byoo): retain collector self-scrape counters

2 participants