Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
skywalking-python
提交
d4e663a8
S
skywalking-python
项目概览
apache
/
skywalking-python
通知
60
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
skywalking-python
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
d4e663a8
编写于
7月 02, 2020
作者:
H
huawei
提交者:
GitHub
7月 02, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Flask plugin (#31)
Co-authored-by:
N
kezhenxu94
<
kezhenxu94@163.com
>
上级
1736c249
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
383 addition
and
3 deletion
+383
-3
skywalking/plugins/sw_flask/__init__.py
skywalking/plugins/sw_flask/__init__.py
+72
-0
skywalking/trace/context/__init__.py
skywalking/trace/context/__init__.py
+9
-0
tests/plugin/sw_flask/__init__.py
tests/plugin/sw_flask/__init__.py
+16
-0
tests/plugin/sw_flask/docker-compose.yml
tests/plugin/sw_flask/docker-compose.yml
+60
-0
tests/plugin/sw_flask/expected.data.yml
tests/plugin/sw_flask/expected.data.yml
+91
-0
tests/plugin/sw_flask/services/__init__.py
tests/plugin/sw_flask/services/__init__.py
+16
-0
tests/plugin/sw_flask/services/consumer.py
tests/plugin/sw_flask/services/consumer.py
+37
-0
tests/plugin/sw_flask/services/provider.py
tests/plugin/sw_flask/services/provider.py
+37
-0
tests/plugin/sw_flask/test_flask.py
tests/plugin/sw_flask/test_flask.py
+43
-0
tests/plugin/sw_requests/docker-compose.yml
tests/plugin/sw_requests/docker-compose.yml
+1
-1
tests/plugin/sw_requests/expected.data.yml
tests/plugin/sw_requests/expected.data.yml
+1
-2
未找到文件。
skywalking/plugins/sw_flask/__init__.py
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import
logging
from
skywalking
import
Layer
,
Component
from
skywalking.trace
import
tags
from
skywalking.trace.carrier
import
Carrier
from
skywalking.trace.context
import
get_context
from
skywalking.trace.span
import
NoopSpan
from
skywalking.trace.tags
import
Tag
logger
=
logging
.
getLogger
(
__name__
)
def
install
():
# noinspection PyBroadException
try
:
from
flask
import
Flask
_full_dispatch_request
=
Flask
.
full_dispatch_request
_handle_user_exception
=
Flask
.
handle_user_exception
def
_sw_full_dispatch_request
(
this
:
Flask
):
import
flask
req
=
flask
.
request
context
=
get_context
()
carrier
=
Carrier
()
for
item
in
carrier
:
if
item
.
key
.
capitalize
()
in
req
.
headers
:
item
.
val
=
req
.
headers
[
item
.
key
.
capitalize
()]
with
context
.
new_entry_span
(
op
=
req
.
path
,
carrier
=
carrier
)
as
span
:
span
.
layer
=
Layer
.
Http
span
.
component
=
Component
.
Flask
span
.
peer
=
'%s:%s'
%
(
req
.
environ
[
"REMOTE_ADDR"
],
req
.
environ
[
"REMOTE_PORT"
])
span
.
tag
(
Tag
(
key
=
tags
.
HttpMethod
,
val
=
req
.
method
))
span
.
tag
(
Tag
(
key
=
tags
.
HttpUrl
,
val
=
req
.
url
))
resp
=
_full_dispatch_request
(
this
)
if
resp
.
status_code
>=
400
:
span
.
error_occurred
=
True
span
.
tag
(
Tag
(
key
=
tags
.
HttpStatus
,
val
=
resp
.
status_code
))
return
resp
def
_sw_handle_user_exception
(
this
:
Flask
,
e
):
if
e
is
not
None
:
entry_span
=
get_context
().
active_span
()
if
entry_span
is
not
None
and
type
(
entry_span
)
is
not
NoopSpan
:
entry_span
.
raised
()
return
_handle_user_exception
(
this
,
e
)
Flask
.
full_dispatch_request
=
_sw_full_dispatch_request
Flask
.
handle_user_exception
=
_sw_handle_user_exception
except
Exception
:
logger
.
warning
(
'failed to install plugin %s'
,
__name__
)
skywalking/trace/context/__init__.py
浏览文件 @
d4e663a8
...
...
@@ -91,6 +91,12 @@ class SpanContext(object):
return
len
(
self
.
spans
)
==
0
def
active_span
(
self
):
if
self
.
spans
:
return
self
.
spans
[
len
(
self
.
spans
)
-
1
]
return
None
class
NoopContext
(
SpanContext
):
def
__init__
(
self
):
...
...
@@ -114,6 +120,9 @@ class NoopContext(SpanContext):
self
.
_depth
-=
1
return
self
.
_depth
==
0
def
active_span
(
self
):
return
self
.
_noop_span
_thread_local
=
threading
.
local
()
_thread_local
.
context
=
None
...
...
tests/plugin/sw_flask/__init__.py
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
tests/plugin/sw_flask/docker-compose.yml
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
version
:
'
2.1'
services
:
collector
:
extends
:
service
:
collector
file
:
../docker/docker-compose.base.yml
provider
:
extends
:
service
:
agent
file
:
../docker/docker-compose.base.yml
ports
:
-
9091:9091
volumes
:
-
./services/provider.py:/app/provider.py
command
:
[
'
bash'
,
'
-c'
,
'
pip
install
flask
&&
python3
/app/provider.py'
]
depends_on
:
collector
:
condition
:
service_healthy
healthcheck
:
test
:
[
"
CMD"
,
"
bash"
,
"
-c"
,
"
cat
<
/dev/null
>
/dev/tcp/127.0.0.1/9091"
]
interval
:
5s
timeout
:
60s
retries
:
120
consumer
:
extends
:
service
:
agent
file
:
../docker/docker-compose.base.yml
ports
:
-
9090:9090
volumes
:
-
./services/consumer.py:/app/consumer.py
command
:
[
'
bash'
,
'
-c'
,
'
pip
install
flask
&&
python3
/app/consumer.py'
]
depends_on
:
collector
:
condition
:
service_healthy
provider
:
condition
:
service_healthy
networks
:
beyond
:
tests/plugin/sw_flask/expected.data.yml
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
segmentItems
:
-
serviceName
:
provider
segmentSize
:
1
segments
:
-
segmentId
:
not
null
spans
:
-
operationName
:
/users
operationId
:
0
parentSpanId
:
-1
spanId
:
0
spanLayer
:
Http
tags
:
-
key
:
http.method
value
:
POST
-
key
:
url
value
:
http://provider:9091/users
-
key
:
status.code
value
:
'
200'
refs
:
-
parentEndpoint
:
/users
networkAddress
:
provider:9091
refType
:
CrossProcess
parentSpanId
:
1
parentTraceSegmentId
:
not
null
parentServiceInstance
:
not
null
parentService
:
consumer
traceId
:
not
null
startTime
:
gt
0
endTime
:
gt
0
componentId
:
7001
spanType
:
Entry
peer
:
not
null
skipAnalysis
:
false
-
serviceName
:
consumer
segmentSize
:
1
segments
:
-
segmentId
:
not
null
spans
:
-
operationName
:
/users
operationId
:
0
parentSpanId
:
0
spanId
:
1
spanLayer
:
Http
tags
:
-
key
:
http.method
value
:
POST
-
key
:
url
value
:
http://provider:9091/users
-
key
:
status.code
value
:
'
200'
startTime
:
gt
0
endTime
:
gt
0
componentId
:
7000
spanType
:
Exit
peer
:
provider:9091
skipAnalysis
:
false
-
operationName
:
/users
operationId
:
0
parentSpanId
:
-1
spanId
:
0
spanLayer
:
Http
tags
:
-
key
:
http.method
value
:
GET
-
key
:
url
value
:
http://0.0.0.0:9090/users
-
key
:
status.code
value
:
'
200'
startTime
:
gt
0
endTime
:
gt
0
componentId
:
7001
spanType
:
Entry
peer
:
not
null
skipAnalysis
:
false
\ No newline at end of file
tests/plugin/sw_flask/services/__init__.py
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
tests/plugin/sw_flask/services/consumer.py
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import
requests
from
skywalking
import
agent
,
config
if
__name__
==
'__main__'
:
config
.
service_name
=
'consumer'
config
.
logging_level
=
'DEBUG'
agent
.
start
()
from
flask
import
Flask
,
jsonify
app
=
Flask
(
__name__
)
@
app
.
route
(
"/users"
,
methods
=
[
"POST"
,
"GET"
])
def
application
():
res
=
requests
.
post
(
"http://provider:9091/users"
)
return
jsonify
(
res
.
json
())
PORT
=
9090
app
.
run
(
host
=
'0.0.0.0'
,
port
=
PORT
,
debug
=
True
)
tests/plugin/sw_flask/services/provider.py
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import
time
from
skywalking
import
agent
,
config
if
__name__
==
'__main__'
:
config
.
service_name
=
'provider'
config
.
logging_level
=
'DEBUG'
agent
.
start
()
from
flask
import
Flask
,
jsonify
app
=
Flask
(
__name__
)
@
app
.
route
(
"/users"
,
methods
=
[
"POST"
,
"GET"
])
def
application
():
time
.
sleep
(
0.5
)
return
jsonify
({
"song"
:
"Despacito"
,
"artist"
:
"Luis Fonsi"
})
PORT
=
9091
app
.
run
(
host
=
'0.0.0.0'
,
port
=
PORT
,
debug
=
True
)
tests/plugin/sw_flask/test_flask.py
0 → 100644
浏览文件 @
d4e663a8
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
import
os
import
time
import
unittest
from
os.path
import
abspath
,
dirname
from
testcontainers.compose
import
DockerCompose
from
tests.plugin
import
BasePluginTest
class
TestPlugin
(
BasePluginTest
):
@
classmethod
def
setUpClass
(
cls
):
cls
.
compose
=
DockerCompose
(
filepath
=
dirname
(
abspath
(
__file__
)))
cls
.
compose
.
start
()
cls
.
compose
.
wait_for
(
cls
.
url
((
'consumer'
,
'9090'
),
'users'
))
def
test_request_plugin
(
self
):
time
.
sleep
(
3
)
self
.
validate
(
expected_file_name
=
os
.
path
.
join
(
dirname
(
abspath
(
__file__
)),
'expected.data.yml'
))
if
__name__
==
'__main__'
:
unittest
.
main
()
tests/plugin/sw_requests/docker-compose.yml
浏览文件 @
d4e663a8
...
...
@@ -55,4 +55,4 @@ services:
condition
:
service_healthy
networks
:
beyond
:
beyond
:
\ No newline at end of file
tests/plugin/sw_requests/expected.data.yml
浏览文件 @
d4e663a8
...
...
@@ -80,5 +80,4 @@ segmentItems:
componentId
:
7000
spanType
:
Entry
peer
:
not
null
skipAnalysis
:
false
skipAnalysis
:
false
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录