Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ASCII-145] Extract collector to a subpackage of status #20718

Merged
merged 6 commits into from
Nov 20, 2023

Conversation

GustavoCaso
Copy link
Member

@GustavoCaso GustavoCaso commented Nov 8, 2023

What does this PR do?

Motivation

Trying to decompose the status package into sub-packages.

This PR extracts fetching the collector information into a separate sub-package status/collector

That sub-package allows consumers of the status package who only care about collector information to use status/collector rather than the entire status package.

Also, I removed the indirection for rendering the collector information. I think the main reason for that indirection is that the agent cluster process does not want to show the collector information for certain keys. I simply nil does keys:

stats["pyLoaderStats"] = nil
stats["pythonInit"] = nil
stats["inventories"] = nil

I made sure that the keys match the status map and templates.

I also removed the OnlyCheck key as it is not mentioned on any template.

I'm planning to continue working on splitting the status package in other PRs. I want to focus on small PRs easier to review rather than creating a big PR 😄

Additional Notes

Possible Drawbacks / Trade-offs

Describe how to test/QA your changes

  • Running agent status should produce the correct output.
  • Launching the GUI agent launch-gui and validate that validate the collector tab shows the correct information

Reviewer's Checklist

  • If known, an appropriate milestone has been selected; otherwise the Triage milestone is set.
  • Use the major_change label if your change either has a major impact on the code base, is impacting multiple teams or is changing important well-established internals of the Agent. This label will be use during QA to make sure each team pay extra attention to the changed behavior. For any customer facing change use a releasenote.
  • A release note has been added or the changelog/no-changelog label has been applied.
  • Changed code has automated tests for its functionality.
  • Adequate QA/testing plan information is provided if the qa/skip-qa label is not applied.
  • At least one team/.. label has been applied, indicating the team(s) that should QA this change.
  • If applicable, docs team has been notified or an issue has been opened on the documentation repo.
  • If applicable, the need-change/operator and need-change/helm labels have been applied.
  • If applicable, the k8s/<min-version> label, indicating the lowest Kubernetes version compatible with this feature.
  • If applicable, the config template has been updated.

@GustavoCaso GustavoCaso force-pushed the extract-collector-to-a-subpackage-of-status branch from 08e3459 to ed769f2 Compare November 8, 2023 14:34
Copy link

cit-pr-commenter bot commented Nov 8, 2023

Go Package Import Differences

Baseline: 6359a37
Comparison: 52e7931

binaryosarchchange
agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
agentlinuxarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
agentwindowsamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
agentwindows386
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
agentdarwinamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
agentdarwinarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
iot-agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
iot-agentlinuxarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
heroku-agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
cluster-agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
cluster-agentlinuxarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
cluster-agent-cloudfoundrylinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
cluster-agent-cloudfoundrylinuxarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
process-agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
process-agentlinuxarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
process-agentwindowsamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
process-agentdarwinamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
process-agentdarwinarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
heroku-process-agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
security-agentlinuxamd64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector
security-agentlinuxarm64
+1, -0
+github.com/DataDog/datadog-agent/pkg/status/collector

@GustavoCaso GustavoCaso force-pushed the extract-collector-to-a-subpackage-of-status branch 3 times, most recently from 90c8916 to 4f10dde Compare November 8, 2023 15:45
@GustavoCaso GustavoCaso force-pushed the extract-collector-to-a-subpackage-of-status branch from 4f10dde to ae7fddb Compare November 8, 2023 16:05
@GustavoCaso GustavoCaso marked this pull request as ready for review November 8, 2023 16:55
@GustavoCaso GustavoCaso requested a review from a team as a code owner November 8, 2023 16:55
@pr-commenter
Copy link

pr-commenter bot commented Nov 8, 2023

Bloop Bleep... Dogbot Here

Regression Detector Results

Run ID: 3bd0a482-6ac7-4467-9f55-f4f48b4b614c
Baseline: 6359a37
Comparison: 52e7931
Total datadog-agent CPUs: 7

Explanation

A regression test is an integrated performance test for datadog-agent in a repeatable rig, with varying configuration for datadog-agent. What follows is a statistical summary of a brief datadog-agent run for each configuration across SHAs given above. The goal of these tests are to determine quickly if datadog-agent performance is changed and to what degree by a pull request.

Because a target's optimization goal performance in each experiment will vary somewhat each time it is run, we can only estimate mean differences in optimization goal relative to the baseline target. We express these differences as a percentage change relative to the baseline target, denoted "Δ mean %". These estimates are made to a precision that balances accuracy and cost control. We represent this precision as a 90.00% confidence interval denoted "Δ mean % CI": there is a 90.00% chance that the true value of "Δ mean %" is in that interval.

We decide whether a change in performance is a "regression" -- a change worth investigating further -- if both of the following two criteria are true:

  1. The estimated |Δ mean %| ≥ 5.00%. This criterion intends to answer the question "Does the estimated change in mean optimization goal performance have a meaningful impact on your customers?". We assume that when |Δ mean %| < 5.00%, the impact on your customers is not meaningful. We also assume that a performance change in optimization goal is worth investigating whether it is an increase or decrease, so long as the magnitude of the change is sufficiently large.

  2. Zero is not in the 90.00% confidence interval "Δ mean % CI" about "Δ mean %". This statement is equivalent to saying that there is at least a 90.00% chance that the mean difference in optimization goal is not zero. This criterion intends to answer the question, "Is there a statistically significant difference in mean optimization goal performance?". It also means there is no more than a 10.00% chance this criterion reports a statistically significant difference when the true difference in mean optimization goal is zero -- a "false positive". We assume you are willing to accept a 10.00% chance of inaccurately detecting a change in performance when no true difference exists.

The table below, if present, lists those experiments that have experienced a statistically significant change in mean optimization goal performance between baseline and comparison SHAs with 90.00% confidence OR have been detected as newly erratic. Negative values of "Δ mean %" mean that baseline is faster, whereas positive values of "Δ mean %" mean that comparison is faster. Results that do not exhibit more than a ±5.00% change in their mean optimization goal are discarded. An experiment is erratic if its coefficient of variation is greater than 0.1. The abbreviated table will be omitted if no interesting change is observed.

No interesting changes in experiment optimization goals with confidence ≥ 90.00% and |Δ mean %| ≥ 5.00%.

Fine details of change detection per experiment.
experiment goal Δ mean % Δ mean % CI confidence
otel_to_otel_logs ingress throughput +1.06 [-0.53, +2.65] 72.82%
idle egress throughput +0.44 [-2.09, +2.97] 22.41%
process_agent_standard_check egress throughput +0.42 [-3.13, +3.97] 15.43%
file_tree egress throughput +0.28 [-1.64, +2.20] 18.79%
process_agent_standard_check_with_stats egress throughput +0.19 [-1.84, +2.22] 11.99%
process_agent_real_time_mode egress throughput +0.08 [-2.43, +2.60] 4.24%
dogstatsd_string_interner_8MiB_50k ingress throughput +0.01 [-0.03, +0.04] 29.44%
dogstatsd_string_interner_8MiB_100 ingress throughput +0.00 [-0.13, +0.13] 3.11%
dogstatsd_string_interner_8MiB_10k ingress throughput +0.00 [-0.00, +0.00] 45.44%
dogstatsd_string_interner_128MiB_100 ingress throughput +0.00 [-0.14, +0.14] 0.50%
dogstatsd_string_interner_64MiB_100 ingress throughput +0.00 [-0.14, +0.14] 0.20%
dogstatsd_string_interner_64MiB_1k ingress throughput +0.00 [-0.13, +0.13] 0.10%
trace_agent_json ingress throughput +0.00 [-0.12, +0.12] 0.09%
uds_dogstatsd_to_api ingress throughput -0.00 [-0.19, +0.19] 0.46%
dogstatsd_string_interner_128MiB_1k ingress throughput -0.00 [-0.14, +0.14] 1.07%
tcp_dd_logs_filter_exclude ingress throughput -0.01 [-0.16, +0.15] 5.98%
dogstatsd_string_interner_8MiB_100k ingress throughput -0.01 [-0.06, +0.05] 19.18%
dogstatsd_string_interner_8MiB_1k ingress throughput -0.01 [-0.11, +0.09] 13.68%
trace_agent_msgpack ingress throughput -0.01 [-0.13, +0.11] 13.38%
file_to_blackhole egress throughput -0.08 [-1.10, +0.94] 9.70%
tcp_syslog_to_blackhole ingress throughput -0.26 [-0.39, -0.13] 99.89%

Copy link
Contributor

@dustmop dustmop left a comment

Choose a reason for hiding this comment

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

LGTM, with a few suggestions

cmd/agent/gui/agent.go Outdated Show resolved Hide resolved
checkSchedulerStats := make(map[string]interface{})
json.Unmarshal(checkSchedulerStatsJSON, &checkSchedulerStats) //nolint:errcheck
stats["checkSchedulerStats"] = checkSchedulerStats
collector.UpdateStatus(stats)
Copy link
Contributor

Choose a reason for hiding this comment

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

I find the name of this method a bit confusing. The other method is GetStatus, which is clearly a reader that returns data. Since UpdateStatus is ambiguous, at first read I keep thinking that this is taking an argument and writing it somewhere, rather than modifying its argument. One thought would be to change this to InsertStatus or PopulateStatus, but I'm open to other names that clarify how this method is adding more key-values into the map that gets passed to it.

Copy link
Member Author

Choose a reason for hiding this comment

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

I like PopulateStatus

cmd/agent/gui/agent.go Outdated Show resolved Hide resolved
func GetStatus() map[string]interface{} {
stats := make(map[string]interface{})

runnerStatsJSON := []byte(expvar.Get("runner").String())
Copy link
Contributor

Choose a reason for hiding this comment

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

For each of these vars, runner, autoconfig, CheckScheduler, pyLoader, and pythonInit, how about extracting out a helper function that handles the json unmarshaling. So instead these variables can be handled like this:

stats["runnerStats"] = unmarshalStatsVar("runner") // returns nil if var doesn't exist, or can't unmarshal

Copy link
Member Author

Choose a reason for hiding this comment

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

I agree that we could extract the functionality of collecting the expvar. I would suggest delaying it until we have extracted all status sub packages, as we might find better helper functions or even sub packages to deal with expvars parsing.

pkg/status/collector/collector.go Outdated Show resolved Hide resolved
pkg/status/collector/collector.go Outdated Show resolved Hide resolved
pkg/status/collector/collector.go Outdated Show resolved Hide resolved
pkg/status/render.go Show resolved Hide resolved
@GustavoCaso GustavoCaso added this to the 7.51.0 milestone Nov 15, 2023
@GustavoCaso GustavoCaso force-pushed the extract-collector-to-a-subpackage-of-status branch from 176f2de to d8c61b3 Compare November 17, 2023 12:05
@GustavoCaso GustavoCaso merged commit a2ef092 into main Nov 20, 2023
140 checks passed
@GustavoCaso GustavoCaso deleted the extract-collector-to-a-subpackage-of-status branch November 20, 2023 11:35
@GustavoCaso GustavoCaso changed the title Extract collector to a subpackage of status [ASCII-145] Extract collector to a subpackage of status Nov 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants