Update dependencies #14594

alopezz · 2023-05-23T12:01:47Z

What does this PR do?

Bump some dependencies.

Motivation

Preparation for release.

Additional Notes

~~confluent-kafka requires an update on omnibus, DataDog/datadog-agent#17266.~~ We're postponing the confluent-kafka update as it requires some extra care.

Review checklist (to be filled by reviewers)

Feature or bugfix MUST have appropriate tests (unit, integration, e2e)
PR title must be written as a CHANGELOG entry (see why)
Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
PR must have changelog/ and integration/ labels attached
If the PR doesn't need to be tested during QA, please add a qa/skip-qa label.

github-actions · 2023-05-23T12:05:29Z

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

codecov · 2023-05-23T12:06:58Z

Codecov Report

Merging #14594 (086f2e8) into master (4df7a76) will increase coverage by 0.00%.
The diff coverage is n/a.

Flag	Coverage Δ
amazon_msk	`89.07% <ø> (ø)`
datadog_checks_dev	`82.75% <ø> (+0.07%)`	⬆️
datadog_checks_downloader	`81.65% <ø> (ø)`
gitlab	`92.82% <ø> (+1.22%)`	⬆️
gitlab_runner	`91.94% <ø> (ø)`
kube_dns	`95.97% <ø> (ø)`
kubernetes_state	`89.18% <ø> (ø)`
oracle	`89.59% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

github-actions · 2023-05-23T12:10:01Z

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

github-actions · 2023-05-23T13:11:02Z

Test Results

    48 files     48 suites 44m 19s ⏱️
1 668 tests 1 379 ✔️ 286 💤 3 ❌
3 722 runs 2 968 ✔️ 750 💤 4 ❌

For more details on these failures, see this check.

Results for commit 086f2e8.

♻️ This comment has been updated with latest results.

FlorentClarret · 2023-05-23T13:13:30Z

kafka_consumer/hatch.toml

@@ -8,7 +8,7 @@ e2e-env = false
 # If you bump the `confluent-kafka` version, also bump the `librdkafka` version in the `32_install_kerberos.sh` file
 post-install-commands = [
  "python -m pip uninstall -y confluent-kafka",
-  "python -m pip install --no-binary confluent-kafka confluent-kafka==2.0.2",
+  "python -m pip install --no-binary confluent-kafka confluent-kafka==2.1.1",


also bump this to v2.1.1 to (try to) fix the tests

github-actions · 2023-05-23T13:18:28Z

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

github-actions · 2023-05-24T11:28:57Z

The validations job has failed; please review the Files changed tab for possible suggestions to resolve.

alexandre-normand

LGTM

steveny91 · 2023-05-24T23:10:32Z

datadog_checks_base/datadog_checks/base/data/agent_requirements.in

 psutil==5.9.0
 psycopg2-binary==2.8.6; sys_platform != 'darwin' or platform_machine != 'arm64'
 pyasn1==0.4.6
 pycryptodomex==3.10.1
-pydantic==1.10.4; python_version > '3.0'
+pydantic==1.10.7; python_version > '3.0'


Can we bump this to 1.10.8? I was testing something today on ddev and realized that some checks were broken, with failed to load errors. Turns out it's because of this issue:
pydantic/pydantic#5824

The fix is shipped with 1.10.8. I tested it by doing a pip install and re-running the check and it loads properly. I think we have to pin it to above that version

steveny91 · 2023-05-25T14:20:04Z

datadog_checks_base/pyproject.toml

@@ -56,8 +56,8 @@ deps = [
    "prometheus-client==0.12.0; python_version < '3.0'",
    "prometheus-client==0.16.0; python_version > '3.0'",
    "protobuf==3.17.3; python_version < '3.0'",
-    "protobuf==3.20.2; python_version > '3.0'",
-    "pydantic==1.10.4; python_version > '3.0'",
+    "protobuf==4.23.1; python_version > '3.0'",


This one I think I had an issue with last time I tried bumping back in 7.42.x

Due to pydantic/pydantic#5824

FlorentClarret · 2023-05-25T15:48:29Z

datadog_checks_base/pyproject.toml

-    "protobuf==3.20.2; python_version > '3.0'",
-    "pydantic==1.10.4; python_version > '3.0'",
+    "protobuf==4.23.1; python_version > '3.0'",
+    "pydantic==1.10.8; python_version > '3.0'",


Could you also update the version here?

https://github.com/DataDog/integrations-core/blob/master/datadog_checks_dev/datadog_checks/dev/plugin/hatch/environment_collector.py#L122C1-L123

wow good catch

FlorentClarret

Nice!

alopezz requested review from a team as code owners May 23, 2023 12:01

ghost added base_package dependencies downloader integration/amazon_msk integration/gitlab integration/gitlab_runner integration/kafka_consumer integration/kube_dns integration/kubernetes_state integration/oracle labels May 23, 2023

alopezz added the changelog/Fixed label May 23, 2023

alopezz mentioned this pull request May 23, 2023

Bump confluent-kafka-python version on omnibus DataDog/datadog-agent#17266

Merged

10 tasks

FlorentClarret reviewed May 23, 2023

View reviewed changes

alopezz force-pushed the alopez/dep-updates branch from e94ca4b to 7bbf52e Compare May 24, 2023 11:25

alopezz removed the integration/kafka_consumer label May 24, 2023

alopezz force-pushed the alopez/dep-updates branch 2 times, most recently from f3def38 to add8baa Compare May 24, 2023 13:51

FlorentClarret previously approved these changes May 24, 2023

View reviewed changes

alexandre-normand previously approved these changes May 24, 2023

View reviewed changes

vboulineau previously approved these changes May 24, 2023

View reviewed changes

steveny91 reviewed May 24, 2023

View reviewed changes

alopezz force-pushed the alopez/dep-updates branch from add8baa to 38b9d4a Compare May 25, 2023 08:04

alopezz dismissed stale reviews from vboulineau, FlorentClarret, and alexandre-normand via f4ffcf6 May 25, 2023 08:06

steveny91 reviewed May 25, 2023

View reviewed changes

alopezz added 3 commits May 25, 2023 17:40

Update dependencies

673ec0d

Update 3rd party licenses

5612c3b

Update pydantic further

b78f29c

Due to pydantic/pydantic#5824

alopezz force-pushed the alopez/dep-updates branch from f4ffcf6 to b78f29c Compare May 25, 2023 15:40

FlorentClarret reviewed May 25, 2023

View reviewed changes

Update pydantic in hatch environment collector too

086f2e8

ghost added the dev_package label May 25, 2023

FlorentClarret approved these changes May 25, 2023

View reviewed changes

steveny91 approved these changes May 26, 2023

View reviewed changes

alopezz merged commit 210e95e into master May 26, 2023

alopezz deleted the alopez/dep-updates branch May 26, 2023 07:07

alopezz mentioned this pull request May 26, 2023

Revert protobuf dependency update #14618

Merged

5 tasks

This was referenced May 31, 2023

Keep pydantic version synced #14656

Merged

Backport pydantic 1.10.8 upgrade to 7.45 #14655

Merged

FlorentClarret mentioned this pull request Jun 1, 2023

Bump the confluent-kafka version #14665

Merged

5 tasks

FlorentClarret mentioned this pull request Jul 10, 2023

Bump the minimum datadog-checks-base version #15217

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update dependencies #14594

Update dependencies #14594

alopezz commented May 23, 2023 •

edited

Loading

github-actions bot commented May 23, 2023

codecov bot commented May 23, 2023 •

edited

Loading

github-actions bot commented May 23, 2023

github-actions bot commented May 23, 2023 •

edited

Loading

FlorentClarret May 23, 2023

github-actions bot commented May 23, 2023

github-actions bot commented May 24, 2023

alexandre-normand left a comment

steveny91 May 24, 2023 •

edited

Loading

steveny91 May 25, 2023

FlorentClarret May 25, 2023 •

edited

Loading

alopezz May 25, 2023

FlorentClarret left a comment

Update dependencies #14594

Update dependencies #14594

Conversation

alopezz commented May 23, 2023 • edited Loading

What does this PR do?

Motivation

Additional Notes

Review checklist (to be filled by reviewers)

github-actions bot commented May 23, 2023

codecov bot commented May 23, 2023 • edited Loading

Codecov Report

github-actions bot commented May 23, 2023

github-actions bot commented May 23, 2023 • edited Loading

Test Results

FlorentClarret May 23, 2023

Choose a reason for hiding this comment

github-actions bot commented May 23, 2023

github-actions bot commented May 24, 2023

alexandre-normand left a comment

Choose a reason for hiding this comment

steveny91 May 24, 2023 • edited Loading

Choose a reason for hiding this comment

steveny91 May 25, 2023

Choose a reason for hiding this comment

FlorentClarret May 25, 2023 • edited Loading

Choose a reason for hiding this comment

alopezz May 25, 2023

Choose a reason for hiding this comment

FlorentClarret left a comment

Choose a reason for hiding this comment

alopezz commented May 23, 2023 •

edited

Loading

codecov bot commented May 23, 2023 •

edited

Loading

github-actions bot commented May 23, 2023 •

edited

Loading

steveny91 May 24, 2023 •

edited

Loading

FlorentClarret May 25, 2023 •

edited

Loading