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

[HOLD] Fix wrapt import #5582

Closed
wants to merge 2 commits into from
Closed

[HOLD] Fix wrapt import #5582

wants to merge 2 commits into from

Conversation

AlexandreYang
Copy link
Member

@AlexandreYang AlexandreYang commented Jan 29, 2020

SUPERSEDED BY #5586

What does this PR do?

Fix wrapt import.

The issue appeared on CI https://dev.azure.com/datadoghq/integrations-core/_build/results?buildId=7793&view=logs&j=12f53639-7e0c-506b-2b53-a7405df1086b&t=72d0428d-576e-5e1b-640d-0ea2f62b0022

when we upgraded dd-trace: #5491

Alternative fix: #5583


Not 100% sure this is the right way to fix the issue.

Hi @brettlangdon, need your expertise on this 🙂 Do you know the differences between ddtrace.vendor.wrapt and the original wrapt ?

Shall we 1. add original wrapt as dep 2. use ddtrace.vendor.wrapt (this PR) ?

Motivation

Additional Notes

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

@codecov
Copy link

codecov bot commented Jan 29, 2020

Codecov Report

Merging #5582 into master will increase coverage by 4.74%.
The diff coverage is 100%.

Impacted Files Coverage Δ
...oller/datadog_checks/openstack_controller/utils.py 56.25% <100%> (ø)
activemq_xml/tests/conftest.py 95% <0%> (ø) ⬆️
istio/tests/conftest.py 56.52% <0%> (ø) ⬆️
ambari/tests/conftest.py 85.71% <0%> (ø) ⬆️
istio/tests/common.py 100% <0%> (ø) ⬆️
hdfs_datanode/tests/test_e2e.py 40% <0%> (ø) ⬆️
...heduler/datadog_checks/kube_scheduler/__about__.py 100% <0%> (ø) ⬆️
...ivemq_xml/datadog_checks/activemq_xml/__about__.py 100% <0%> (ø) ⬆️
gearmand/datadog_checks/gearmand/__about__.py 100% <0%> (ø) ⬆️
druid/datadog_checks/druid/__about__.py 100% <0%> (ø) ⬆️
... and 851 more

@AlexandreYang AlexandreYang changed the title Fix wrapt import [WIP] Fix wrapt import Jan 29, 2020
@AlexandreYang AlexandreYang changed the title [WIP] Fix wrapt import Fix wrapt import Jan 29, 2020
@AlexandreYang AlexandreYang mentioned this pull request Jan 29, 2020
4 tasks
@AlexandreYang AlexandreYang changed the title Fix wrapt import [WIP] Fix wrapt import Jan 29, 2020
@AlexandreYang AlexandreYang changed the title [WIP] Fix wrapt import [HOLD] Fix wrapt import Jan 29, 2020
@AlexandreYang
Copy link
Member Author

Closing this PR.

Preferred implementation: #5583

@ofek ofek deleted the alex/openstack_fix branch January 29, 2020 14:15
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.

1 participant