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.

Sign up for GitHub

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

Jump to bottom

fix again for BlockingChannel.basic_get() #226

Merged
merged 15 commits into from
Jul 20, 2022
Merged

fix again for BlockingChannel.basic_get() #226

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ff61fd0
improved ignore path regex
tom-pytel May 30, 2022
1a6fd62
update test
tom-pytel May 30, 2022
92b773a
Merge branch 'master' of github.com:apache/skywalking-python
tom-pytel May 31, 2022
bd9ed36
fix sw_psycopg2 register_type()
tom-pytel Jun 3, 2022
ef5f610
fix complexity level
tom-pytel Jun 3, 2022
a46abe4
Merge branch 'master' of github.com:apache/skywalking-python
tom-pytel Jun 3, 2022
26ceb62
fix psycopg2 register_type() second arg default
tom-pytel Jun 8, 2022
b6f3e50
Merge branch 'master' of github.com:apache/skywalking-python
tom-pytel Jun 8, 2022
0cae938
Merge branch 'master' of github.com:apache/skywalking-python
tom-pytel Jul 18, 2022
ded6fda
fix rabbitmq BlockingChannel consume cb span link
tom-pytel Jul 18, 2022
2d99ced
add BlockingChannel.consume() instrumentation
tom-pytel Jul 18, 2022
62289c7
Merge branch 'master' of github.com:apache/skywalking-python
tom-pytel Jul 18, 2022
1348b41
fix rabbit basic_get(), Makefile missing packages
tom-pytel Jul 19, 2022
5fe6991
Merge branch 'master' of github.com:apache/skywalking-python
tom-pytel Jul 19, 2022
c66e1a4
fix again for BlockingChannel.basic_get()
tom-pytel Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions skywalking/plugins/sw_rabbitmq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,9 @@ def _sw_callback_func(callback):
def _sw_callback(this, method, properties, body):
peer = getattr(method, '_sw_peer', None)

if peer is None: # this is not a callback caused by _on_deliver(), some other object like GetOk
return callback(this, method, properties, body)
if peer is None:
params = getattr(getattr(this.connection, '_impl', None), 'params', None)
peer = '<unavailable>' if params is None else f'{params.host}:{params.port}'

context = get_context()
exchange = method.exchange
Expand Down