Skip to content

[pull] master from DataDog:master#180

Merged
pull[bot] merged 8 commits into
ConnectionMaster:masterfrom
DataDog:master
Oct 10, 2025
Merged

[pull] master from DataDog:master#180
pull[bot] merged 8 commits into
ConnectionMaster:masterfrom
DataDog:master

Conversation

@pull

@pull pull Bot commented Oct 10, 2025

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

dkirov-dd and others added 8 commits October 10, 2025 09:06
* Add histogram metrics

* Add changelog

* Format

* Remove dashboards

* Add unit test for histogram submission

* Remove unnecessary histogram test

* Rename metrics to .bucket and add lower_bound tag

* Sort metadata by name
* Add debugging comments

* changelog

* Add error to artifact functions

* Move 'sending metrics to DD' closer to where the metrics are sent

* Simplify capturing stderr

* Rephrase logs with cursor

* Remove [:7] from commits

* Update ddev/src/ddev/cli/size/status.py

Co-authored-by: NouemanKHAL <noueman.khalikine@datadoghq.com>

* Rephrase changelog

* Fix lint from code committed directly through a suggestion

* Update ddev/changelog.d/21587.added

Co-authored-by: NouemanKHAL <noueman.khalikine@datadoghq.com>

* Apply suggestion from @NouemanKHAL

Co-authored-by: NouemanKHAL <noueman.khalikine@datadoghq.com>

---------

Co-authored-by: NouemanKHAL <noueman.khalikine@datadoghq.com>
* Add timeouts at the GitHub Actions step level for ddev tests.

* Make the timeout a parameter
* Update CA certificate loading logic

* Remove certifi changes

* Rename changelog
### What does this PR do?
<!-- A brief description of the change being made with this pull request. -->
Adds a fallback to `certifi` when the no CA certificates have been found during SSL context creation.

The fallback is tested only on Linux as on Windows the [system certificate stores](https://learn.microsoft.com/en-us/windows/win32/seccrypto/system-store-locations?redirectedfrom=MSDN) are loaded by default. ([source](https://docs.python.org/3/library/ssl.html#ssl.SSLContext.load_default_certs))

### Motivation
<!-- What inspired you to submit this pull request? -->
On MacOS, some hosts were experiencing the following SSL Error:
```
SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1010)'))
```
This could have multiple root causes, originating at OpenSSL build time or from environment variables.
`certifi.where()` is [used by the `requests` library](https://github.com/psf/requests/blob/420d16bc7ef326f7b65f90e4644adc0f6a0e1d44/src/requests/utils.py#L64) and fixes this issue, therefore we can use it as a fallback.

### Review checklist (to be filled by reviewers)

- [ ] Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
- [ ] Add the `qa/skip-qa` label if the PR doesn't need to be tested during QA.
- [ ] If you need to backport this PR to another branch, you can add the `backport/<branch-name>` label to the PR and it will automatically open a backport PR once this one is merged
* Add admission_webhooks.image_resolution_attempts telemetry to cluster agent

* Add missing count in fixture

* Add changelog

* Add missing type in metadata

* Correctly sort metadata

* Remove commas and update description in metadata

* Add missing metadata

* Update datadog_cluster_agent/changelog.d/21599.added
@pull pull Bot locked and limited conversation to collaborators Oct 10, 2025
@pull pull Bot added the ⤵️ pull label Oct 10, 2025
@pull pull Bot merged commit 574d63b into ConnectionMaster:master Oct 10, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants