Skip to content

Add component ID for requests plugin #33

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

Merged
kezhenxu94 merged 4 commits into from
Jul 5, 2020
Merged

Add component ID for requests plugin #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60de658
add Component Id
Jul 5, 2020
510c7bb
remove skywalking_python.egg-info in .gitignore
Jul 5, 2020
6b5cd52
update requests component id
Jul 5, 2020
11ec9c1
Merge branch 'master' into master
kezhenxu94 Jul 5, 2020
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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
__pycache__
build/
dist/
skywalking_python.egg-info/
*.pyc
*.pyc
/apache_skywalking.egg-info/
1 change: 1 addition & 0 deletions skywalking/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class Component(Enum):
Unknown = 0
General = 7000 # built-in modules that may not have a logo to display
Flask = 7001
Requests = 7002


class Layer(Enum):
Expand Down
2 changes: 1 addition & 1 deletion skywalking/plugins/sw_requests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def _sw_request(this: Session, method, url,
carrier = Carrier()
with context.new_exit_span(op=url_param.path or "/", peer=url_param.netloc, carrier=carrier) as span:
span.layer = Layer.Http
span.component = Component.General
span.component = Component.Requests

if headers is None:
headers = {}
Expand Down
2 changes: 1 addition & 1 deletion tests/plugin/sw_flask/expected.data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ segmentItems:
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7000
componentId: 7002
spanType: Exit
peer: provider:9091
skipAnalysis: false
Expand Down
2 changes: 1 addition & 1 deletion tests/plugin/sw_requests/expected.data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ segmentItems:
value: '200'
startTime: gt 0
endTime: gt 0
componentId: 7000
componentId: 7002
spanType: Exit
peer: provider:9091
skipAnalysis: false
Expand Down