You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by to...@apache.org on 2022/07/25 14:18:43 UTC
[skywalking-python] branch master updated: Fix tornado socket == None (#227)
This is an automated email from the ASF dual-hosted git repository.
tompytel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-python.git
The following commit(s) were added to refs/heads/master by this push:
new 1b5542f Fix tornado socket == None (#227)
1b5542f is described below
commit 1b5542f88ea9f1b949c4859ef25be75251f1f072
Author: Tomasz Pytel <to...@gmail.com>
AuthorDate: Mon Jul 25 11:18:39 2022 -0300
Fix tornado socket == None (#227)
* improved ignore path regex
* update test
* fix sw_psycopg2 register_type()
* fix complexity level
* fix psycopg2 register_type() second arg default
* fix rabbitmq BlockingChannel consume cb span link
* add BlockingChannel.consume() instrumentation
* fix rabbit basic_get(), Makefile missing packages
* fix again for BlockingChannel.basic_get()
* fix tornado socket == None
---
skywalking/plugins/sw_tornado.py | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/skywalking/plugins/sw_tornado.py b/skywalking/plugins/sw_tornado.py
index 6509fdb..ca54b74 100644
--- a/skywalking/plugins/sw_tornado.py
+++ b/skywalking/plugins/sw_tornado.py
@@ -75,8 +75,14 @@ def _gen_sw_get_response_func(old_execute):
with span:
span.layer = Layer.Http
span.component = Component.Tornado
- peer = request.connection.stream.socket.getpeername()
- span.peer = f'{peer[0]}:{peer[1]}'
+
+ socket = request.connection.stream.socket
+ if socket:
+ peer = socket.getpeername()
+ span.peer = f'{peer[0]}:{peer[1]}'
+ else:
+ peer = '<unavailable>'
+
span.tag(TagHttpMethod(method))
span.tag(TagHttpURL(f'{request.protocol}://{request.host}{request.path}'))
result = old_execute(self, *args, **kwargs)
@@ -103,8 +109,14 @@ def _gen_sw_get_response_func(old_execute):
with span:
span.layer = Layer.Http
span.component = Component.Tornado
- peer = request.connection.stream.socket.getpeername()
- span.peer = f'{peer[0]}:{peer[1]}'
+
+ socket = request.connection.stream.socket
+ if socket:
+ peer = socket.getpeername()
+ span.peer = f'{peer[0]}:{peer[1]}'
+ else:
+ peer = '<unavailable>'
+
span.tag(TagHttpMethod(method))
span.tag(TagHttpURL(f'{request.protocol}://{request.host}{request.path}'))
result = yield from old_execute(self, *args, **kwargs)