Skip to content

[Backport 7.67.x] [ksm] Import time/tzdata to allow support for legacy timezones in cronjobs #37525

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

Merged
merged 1 commit into from
Jun 2, 2025

Conversation

agent-platform-auto-pr[bot]
Copy link
Contributor

Backport 90c0f3e from #37489.


<!--

  • Contributors are encouraged to read our CONTRIBUTING documentation.
  • Both Contributor and Reviewer Checklists are available at https://datadoghq.dev/datadog-agent/guidelines/contributing/#pull-requests.
  • The pull request:
    • Should only fix one issue or add one feature at a time.
    • Must update the test suite for the relevant functionality.
    • Should pass all status checks before being reviewed or merged.
  • Commit titles should be prefixed with general area of pull request's change.
  • Please fill the below sections if possible with relevant information or links.
    -->

What does this PR do?

Installs tzdata-legacy in the agent image

Motivation

The kubernetes state core check started failing when run in the cluster check runner (using the agent image) in 7.61.0 when a cronjob has a schedule: CRON_TZ=US/Central ... with the error provided bad location US/Central: unknown time zone US/Central.

It seems that US/Central is a legacy timezone, and is no longer included in the tzdata package by default (instead it has been split off into the tzdata-legacy package).

The error originates from the call to time.LoadLocation in the cronjob logic; it looks for the timezones in the following order:

  1. the directory or uncompressed zip file named by the ZONEINFO environment variable
  2. on a Unix system, the system standard installation location
  3. $GOROOT/lib/time/zoneinfo.zip
  4. the time/tzdata package, if it was imported

By adding an time/tzdata import, this allows the legacy US/Central timezone to be used without installing tzdata-legacy.

Describe how you validated your changes

<!--
Validate your changes before merge, ensuring that:

  • Your PR is tested by static / unit / integrations / e2e tests
  • Your PR description details which e2e tests cover your changes, if any
  • The PR description contains details of how you validated your changes. If you validated changes manually and not through automated tests, add context on why automated tests did not fit your changes validation.

If you want additional validation by a second person, you can ask reviewers to do it. Describe how to set up an environment for manual tests in the PR description. Manual validation is expected to happen on every commit before merge.

Any manual validation step should then map to an automated test. Manual validation should not substitute automation, minus exceptions not supported by test tooling yet.
-->

  1. Deploy a cronjob with the format
# Scheduled once per minute
apiVersion: batch/v1
kind: CronJob
metadata:
  name: hello
spec:
  schedule: &quot;CRON_TZ=US/Central 57 13 * * *&quot;
  jobTemplate:
    spec:
      template:
        spec:
          containers:
          - name: hello
            image: busybox
            imagePullPolicy: IfNotPresent
            command:
            - /bin/sh
            - -c
            - date; echo Hello from the Kubernetes cluster; sleep 5
          restartPolicy: OnFailure
  1. Run the kube state metrics core check on the cluster check runners, and verify that they are in CLB due to the panic with the error above
...
  kubeStateMetricsCore:
    enabled: true
    useClusterCheckRunners: true
  1. Pull in these changes and verify that the cluster check runner no longer panics, and reports the metric kubernetes_state.cronjob.duration_since_last_schedule for the cronjob created above

Possible Drawbacks / Trade-offs

Additional Notes

<!--

  • Anything else we should know when reviewing?
  • Include benchmarking information here whenever possible.
  • Include info about alternatives that were considered and why the proposed
    version was chosen.
    -->

Note: this can be avoided by the user using the equivalent timezone America/Chicago.

@agent-platform-auto-pr agent-platform-auto-pr bot requested a review from a team as a code owner May 30, 2025 21:04
@agent-platform-auto-pr agent-platform-auto-pr bot added qa/done QA done before merge and regressions are covered by tests backport bot short review PR is simple enough to be reviewed quickly labels May 30, 2025
Copy link

Go Package Import Differences

Baseline: d1f450e
Comparison: 1a84a37

binaryosarchchange
agentlinuxamd64
+1, -0
+time/tzdata
agentlinuxarm64
+1, -0
+time/tzdata
agentwindowsamd64
+1, -0
+time/tzdata
agentdarwinamd64
+1, -0
+time/tzdata
agentdarwinarm64
+1, -0
+time/tzdata

@agent-platform-auto-pr
Copy link
Contributor Author

Uncompressed package size comparison

Comparison with ancestor 72b16c13c417cb262f767cf14beb0d9c338f8e9d

Diff per package
package diff status size ancestor threshold
datadog-agent-x86_64-rpm 0.43MB ⚠️ 784.46MB 784.03MB 0.50MB
datadog-agent-x86_64-suse 0.43MB ⚠️ 784.46MB 784.03MB 0.50MB
datadog-agent-amd64-deb 0.43MB ⚠️ 775.51MB 775.08MB 0.50MB
datadog-agent-arm64-deb 0.42MB ⚠️ 764.81MB 764.39MB 0.50MB
datadog-agent-aarch64-rpm 0.42MB ⚠️ 773.74MB 773.33MB 0.50MB
datadog-heroku-agent-amd64-deb 0.02MB ⚠️ 378.73MB 378.71MB 0.50MB
datadog-dogstatsd-amd64-deb 0.01MB ⚠️ 31.22MB 31.21MB 0.50MB
datadog-dogstatsd-x86_64-rpm 0.01MB ⚠️ 31.30MB 31.30MB 0.50MB
datadog-dogstatsd-x86_64-suse 0.01MB ⚠️ 31.30MB 31.30MB 0.50MB
datadog-dogstatsd-arm64-deb 0.00MB 30.04MB 30.04MB 0.50MB
datadog-iot-agent-amd64-deb 0.00MB 61.06MB 61.06MB 0.50MB
datadog-iot-agent-arm64-deb 0.00MB 58.31MB 58.31MB 0.50MB
datadog-iot-agent-x86_64-rpm 0.00MB 61.14MB 61.14MB 0.50MB
datadog-iot-agent-x86_64-suse 0.00MB 61.14MB 61.14MB 0.50MB
datadog-iot-agent-aarch64-rpm 0.00MB 58.40MB 58.39MB 0.50MB

Decision

⚠️ Warning

Copy link

Regression Detector

Regression Detector Results

Metrics dashboard
Target profiles
Run ID: 77064901-f71c-4d64-ac86-bcb3b02608f9

Baseline: d1f450e
Comparison: 1a84a37
Diff

Optimization Goals: ✅ No significant changes detected

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
uds_dogstatsd_to_api_cpu % cpu utilization +2.16 [+1.32, +3.01] 1 Logs
docker_containers_memory memory utilization +2.14 [+1.99, +2.28] 1 Logs
quality_gate_idle memory utilization +0.28 [+0.23, +0.34] 1 Logs bounds checks dashboard
otlp_ingest_logs memory utilization +0.23 [+0.11, +0.35] 1 Logs
quality_gate_idle_all_features memory utilization +0.19 [+0.12, +0.26] 1 Logs bounds checks dashboard
ddot_logs memory utilization +0.18 [+0.07, +0.30] 1 Logs
file_to_blackhole_0ms_latency_http1 egress throughput +0.02 [-0.58, +0.62] 1 Logs
file_to_blackhole_1000ms_latency egress throughput +0.02 [-0.63, +0.66] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput +0.00 [-0.01, +0.01] 1 Logs
file_to_blackhole_300ms_latency egress throughput -0.00 [-0.61, +0.60] 1 Logs
file_to_blackhole_0ms_latency_http2 egress throughput -0.01 [-0.65, +0.64] 1 Logs
file_to_blackhole_500ms_latency egress throughput -0.01 [-0.64, +0.62] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.01 [-0.31, +0.28] 1 Logs
file_to_blackhole_100ms_latency egress throughput -0.02 [-0.60, +0.57] 1 Logs
quality_gate_logs % cpu utilization -0.03 [-2.85, +2.79] 1 Logs bounds checks dashboard
file_to_blackhole_1000ms_latency_linear_load egress throughput -0.04 [-0.26, +0.19] 1 Logs
file_to_blackhole_0ms_latency egress throughput -0.04 [-0.68, +0.60] 1 Logs
uds_dogstatsd_20mb_12k_contexts_20_senders memory utilization -0.15 [-0.18, -0.12] 1 Logs
tcp_syslog_to_blackhole ingress throughput -0.25 [-0.31, -0.19] 1 Logs
file_tree memory utilization -0.35 [-0.49, -0.21] 1 Logs
ddot_metrics memory utilization -0.37 [-0.47, -0.28] 1 Logs
otlp_ingest_metrics memory utilization -0.93 [-1.09, -0.77] 1 Logs
docker_containers_cpu % cpu utilization -2.28 [-5.23, +0.67] 1 Logs

Bounds Checks: ❌ Failed

perf experiment bounds_check_name replicates_passed links
docker_containers_memory memory_usage 0/10
docker_containers_cpu simple_check_run 10/10
docker_containers_memory simple_check_run 10/10
file_to_blackhole_0ms_latency lost_bytes 10/10
file_to_blackhole_0ms_latency memory_usage 10/10
file_to_blackhole_0ms_latency_http1 lost_bytes 10/10
file_to_blackhole_0ms_latency_http1 memory_usage 10/10
file_to_blackhole_0ms_latency_http2 lost_bytes 10/10
file_to_blackhole_0ms_latency_http2 memory_usage 10/10
file_to_blackhole_1000ms_latency memory_usage 10/10
file_to_blackhole_1000ms_latency_linear_load memory_usage 10/10
file_to_blackhole_100ms_latency lost_bytes 10/10
file_to_blackhole_100ms_latency memory_usage 10/10
file_to_blackhole_300ms_latency lost_bytes 10/10
file_to_blackhole_300ms_latency memory_usage 10/10
file_to_blackhole_500ms_latency lost_bytes 10/10
file_to_blackhole_500ms_latency memory_usage 10/10
quality_gate_idle intake_connections 10/10 bounds checks dashboard
quality_gate_idle memory_usage 10/10 bounds checks dashboard
quality_gate_idle_all_features intake_connections 10/10 bounds checks dashboard
quality_gate_idle_all_features memory_usage 10/10 bounds checks dashboard
quality_gate_logs intake_connections 10/10 bounds checks dashboard
quality_gate_logs lost_bytes 10/10 bounds checks dashboard
quality_gate_logs memory_usage 10/10 bounds checks dashboard

Explanation

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

CI Pass/Fail Decision

Passed. All Quality Gates passed.

  • quality_gate_idle_all_features, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle_all_features, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check lost_bytes: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_logs, bounds check intake_connections: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check memory_usage: 10/10 replicas passed. Gate passed.
  • quality_gate_idle, bounds check intake_connections: 10/10 replicas passed. Gate passed.

@agent-platform-auto-pr
Copy link
Contributor Author

Static quality checks

✅ Please find below the results from static quality gates

Successful checks

Info

Result Quality gate On disk size On disk size limit On wire size On wire size limit
static_quality_gate_agent_deb_amd64 748.13 MiB 778.06 MiB 185.76 MiB 191.06 MiB
static_quality_gate_agent_deb_amd64_fips 745.97 MiB 776.09 MiB 184.96 MiB 190.72 MiB
static_quality_gate_agent_heroku_amd64 367.17 MiB 434.99 MiB 98.39 MiB 114.34 MiB
static_quality_gate_agent_msi 964.73 MiB 978.45 MiB 147.11 MiB 151.65 MiB
static_quality_gate_agent_rpm_amd64 748.12 MiB 778.06 MiB 187.34 MiB 193.42 MiB
static_quality_gate_agent_rpm_amd64_fips 745.96 MiB 776.06 MiB 186.87 MiB 192.61 MiB
static_quality_gate_agent_rpm_arm64 737.9 MiB 768.33 MiB 169.91 MiB 174.71 MiB
static_quality_gate_agent_rpm_arm64_fips 735.95 MiB 766.55 MiB 168.78 MiB 173.92 MiB
static_quality_gate_agent_suse_amd64 748.12 MiB 778.08 MiB 187.34 MiB 193.42 MiB
static_quality_gate_agent_suse_amd64_fips 745.96 MiB 776.11 MiB 186.87 MiB 192.78 MiB
static_quality_gate_agent_suse_arm64 737.9 MiB 768.31 MiB 169.91 MiB 174.71 MiB
static_quality_gate_agent_suse_arm64_fips 735.95 MiB 766.5 MiB 168.78 MiB 173.92 MiB
static_quality_gate_docker_agent_amd64 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_arm64 857.46 MiB 876.0 MiB 272.73 MiB 278.3 MiB
static_quality_gate_docker_agent_jmx_amd64 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_jmx_arm64 857.46 MiB 876.63 MiB 272.73 MiB 278.4 MiB
static_quality_gate_docker_agent_windows1809 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_core 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_core_jmx 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows1809_jmx 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_core 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_core_jmx 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_agent_windows2022_jmx 844.54 MiB 862.5 MiB 286.31 MiB 292.0 MiB
static_quality_gate_docker_cluster_agent_amd64 256.97 MiB 263.4 MiB 101.98 MiB 104.07 MiB
static_quality_gate_docker_cluster_agent_arm64 273.0 MiB 279.38 MiB 96.95 MiB 98.95 MiB
static_quality_gate_docker_cws_instrumentation_amd64 6.66 MiB 7.12 MiB 2.82 MiB 3.29 MiB
static_quality_gate_docker_cws_instrumentation_arm64 6.44 MiB 6.92 MiB 2.6 MiB 3.07 MiB
static_quality_gate_docker_dogstatsd_amd64 37.9 MiB 46.39 MiB 14.61 MiB 17.78 MiB
static_quality_gate_docker_dogstatsd_arm64 36.85 MiB 45.05 MiB 13.74 MiB 16.65 MiB
static_quality_gate_dogstatsd_deb_amd64 29.85 MiB 38.4 MiB 7.9 MiB 10.26 MiB
static_quality_gate_dogstatsd_deb_arm64 28.73 MiB 36.98 MiB 6.88 MiB 8.96 MiB
static_quality_gate_dogstatsd_rpm_amd64 29.85 MiB 38.4 MiB 7.91 MiB 10.27 MiB
static_quality_gate_dogstatsd_suse_amd64 29.85 MiB 38.4 MiB 7.91 MiB 10.27 MiB
static_quality_gate_iot_agent_deb_amd64 58.31 MiB 58.51 MiB 14.69 MiB 15.02 MiB
static_quality_gate_iot_agent_deb_arm64 55.69 MiB 55.94 MiB 12.68 MiB 13.05 MiB
static_quality_gate_iot_agent_deb_armhf 54.46 MiB 54.65 MiB 12.69 MiB 13.05 MiB
static_quality_gate_iot_agent_rpm_amd64 58.31 MiB 58.51 MiB 14.71 MiB 15.04 MiB
static_quality_gate_iot_agent_rpm_arm64 55.69 MiB 55.94 MiB 12.7 MiB 13.07 MiB
static_quality_gate_iot_agent_suse_amd64 58.31 MiB 58.51 MiB 14.71 MiB 15.04 MiB

@FlorentClarret
Copy link
Member

/merge

@dd-devflow
Copy link

dd-devflow bot commented Jun 2, 2025

View all feedbacks in Devflow UI.

2025-06-02 09:35:49 UTC ℹ️ Start processing command /merge


2025-06-02 09:35:54 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in 7.67.x is approximately 48m (p90).


2025-06-02 10:38:51 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit 09ae7ed into 7.67.x Jun 2, 2025
309 of 310 checks passed
@dd-mergequeue dd-mergequeue bot deleted the backport-37489-to-7.67.x branch June 2, 2025 10:38
@github-actions github-actions bot added this to the 7.67.0 milestone Jun 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bot changelog/no-changelog qa/done QA done before merge and regressions are covered by tests short review PR is simple enough to be reviewed quickly team/containers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants