-
Notifications
You must be signed in to change notification settings - Fork 621
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
Fix exception in Urllib3 when dealing with filelike body. #1399
Conversation
5432fbb
to
0054033
Compare
instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py
Outdated
Show resolved
Hide resolved
75a29c2
to
d83e23e
Compare
instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_integration.py
Outdated
Show resolved
Hide resolved
.../opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/__init__.py
Show resolved
Hide resolved
Please resolve conflicts |
instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_metrics.py
Show resolved
Hide resolved
Done |
6ac4a43
to
3655586
Compare
Please fix the conflicts |
Done again. |
Head branch was pushed to by a user without write access
Seems like the test broke since the first commit. Pushed a fixed version. |
@shalevr @srikanthccv any chance this could be merged? it is preventing us from migrating from opentracing to opentelemetry. |
It can't be merged unless all the requirements are met. The author didn't let maintainers make edits, which prevents me from updating (out-of-date with base) and merging it. |
I can't give edit access to the PR since the fork is being owned by an org and not a personnal account. Let me rebase again and fix conflict. If there's conflict again in the future I would suggest you just cherry-pick my commit and open your own pull request. I understand maintaining open-source software is thankless work (And I thank you for otel!), but this PR have many times the amount of work it actually required due to at least 5 rebase with conflict that appears each time right before merging. |
eb8ef9b
to
cad55c3
Compare
My rebase conflicted with a7bd563 which did a similar thing than my PR (moved all the test to |
instrumentation/opentelemetry-instrumentation-urllib3/tests/test_urllib3_metrics.py
Outdated
Show resolved
Hide resolved
614addb
to
aefab5b
Compare
Ok, finally fixed the test with the new base utils |
I wouldn't mind somebody else creating the PR for the same fix, getting that merged, and then closing this. You may have n number of reasons not to give edit access, even if it wasn't an org account. I mentioned that because the last time I wanted to merge this two weeks ago, this was not up to date with the base branch. Many PRs in this repo let the maintainer make edits (for such cases) and merge quickly. I also enabled the auto-merge, but that didn't help either. I can't hold other PRs ready to merge because this needs rebasing etc... |
LGTM, thank you |
Thank you very much all of yall! we really appreciate it. |
Description
Only use
len
onbody
if it's not a filelike object.Fixex #1235
How Has This Been Tested?
tox -e test-instrumentation-urllib3