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

feat(aiohttp): add client integration (backport #3362) #3407

Merged
merged 2 commits into from
Mar 9, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 9, 2022

This is an automatic backport of pull request #3362 done by Mergify.
Cherry-pick of 2ac1fc9 has failed:

On branch mergify/bp/0.x/pr-3362
Your branch is up to date with 'origin/0.x'.

You are currently cherry-picking commit 2ac1fc95.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .circleci/config.yml
	modified:   ddtrace/contrib/aiohttp/__init__.py
	new file:   ddtrace/contrib/trace_utils_async.py
	modified:   docs/index.rst
	new file:   releasenotes/notes/aiohttp-98ae9ce70dda1dbc.yaml
	modified:   riotfile.py
	modified:   tests/contrib/aiohttp/conftest.py
	new file:   tests/contrib/aiohttp/test_aiohttp_client.py
	modified:   tests/contrib/config.py
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_200_request_post.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_500_request.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_configure_global_service_name_env.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_configure_service_name_pin.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_multiple.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_parenting.json
	new file:   tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_query_string.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ddtrace/contrib/aiohttp/patch.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team as a code owner March 9, 2022 21:44
@mergify mergify bot added the conflicts label Mar 9, 2022
@brettlangdon brettlangdon added this to the v0.60.0 milestone Mar 9, 2022
@mergify mergify bot mentioned this pull request Mar 9, 2022
28 tasks
@mergify
Copy link
Contributor Author

mergify bot commented Mar 9, 2022

@mergify[bot] this pull request is now in conflict 😩

@mergify mergify bot added the conflict label Mar 9, 2022
This PR adds support for aiohttp client.

Work was long ago started on this in (#294 (thank you @thehesiod!!!). There were a number of issues in the library that led to not being able to merge in the work such as async context management, service naming, integration configuration and more which have all since been addressed.

Co-authored-by: Alexander Mohr <[email protected]>
(cherry picked from commit 2ac1fc9)
brettlangdon
brettlangdon previously approved these changes Mar 9, 2022
@brettlangdon brettlangdon merged commit 7796f2b into 0.x Mar 9, 2022
@brettlangdon brettlangdon deleted the mergify/bp/0.x/pr-3362 branch March 9, 2022 23:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants