You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2020/08/23 07:17:58 UTC
[GitHub] [skywalking-python] alonelaval opened a new pull request #69: Urllib3
alonelaval opened a new pull request #69:
URL: https://github.com/apache/skywalking-python/pull/69
- [x] Add a test case for the new plugin
- [x] Add a component id in [the main repo](https://github.com/apache/skywalking/blob/master/oap-server/server-bootstrap/src/main/resources/component-libraries.yml#L415)
- [X] Add a logo in [the UI repo](https://github.com/apache/skywalking-rocketbot-ui/tree/master/src/views/components/topology/assets)
- [x] Rebuild the `requirements.txt` by running `tools/env/build_requirements_(linux|windows).sh`
resolve apache/skywalking#5350
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-python] alonelaval commented on a change in pull request #69: [Plugin] Add plugin for urllib3 library
Posted by GitBox <gi...@apache.org>.
alonelaval commented on a change in pull request #69:
URL: https://github.com/apache/skywalking-python/pull/69#discussion_r475192477
##########
File path: tests/plugin/sw_urllib3/docker-compose.yml
##########
@@ -0,0 +1,60 @@
+#
+# 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:
+ - .:/app
+ command: ['bash', '-c', 'pip install flask && pip install -r /app/requirements.txt && python3 /app/services/provider.py']
Review comment:
ok
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-python] kezhenxu94 merged pull request #69: [Plugin] Add plugin for urllib3 library
Posted by GitBox <gi...@apache.org>.
kezhenxu94 merged pull request #69:
URL: https://github.com/apache/skywalking-python/pull/69
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-python] kezhenxu94 commented on a change in pull request #69: Urllib3
Posted by GitBox <gi...@apache.org>.
kezhenxu94 commented on a change in pull request #69:
URL: https://github.com/apache/skywalking-python/pull/69#discussion_r475188230
##########
File path: requirements.txt
##########
@@ -12,9 +14,11 @@ docker==4.2.2
elasticsearch==7.8.0
Flask==1.1.2
gevent==20.6.2
+google-auth==1.20.1
Review comment:
Are the newly-added modules in this file required by urllib3? Maybe not?
##########
File path: tests/plugin/sw_urllib3/docker-compose.yml
##########
@@ -0,0 +1,60 @@
+#
+# 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:
+ - .:/app
+ command: ['bash', '-c', 'pip install flask && pip install -r /app/requirements.txt && python3 /app/services/provider.py']
Review comment:
`provider` doesn't involves with various versions of `urllib3`, therefore ` pip install -r /app/requirements.txt` is not needed, on the contrast, `consumer` needs this
##########
File path: setup.py
##########
@@ -44,6 +44,17 @@
"test": [
"testcontainers",
"pyyaml",
+ "django",
+ "flask",
+ "Werkzeug",
+ "pymysql",
+ "redis",
+ "kafka-python",
+ "tornado",
+ "pika",
+ "pymongo",
+ "elasticsearch",
+ "urllib3",
Review comment:
We don't need these any more
##########
File path: requirements.txt
##########
@@ -1,6 +1,8 @@
+apache-skywalking==0.2.0
Review comment:
Should remove this
##########
File path: docs/Plugins.md
##########
@@ -1,5 +1,22 @@
# Supported Libraries
+<<<<<<< HEAD
+Library | Plugin Name
+| :--- | :--- |
+| [http.server](https://docs.python.org/3/library/http.server.html) | `sw_http_server` |
+| [urllib.request](https://docs.python.org/3/library/urllib.request.html) | `sw_urllib_request` |
+| [requests](https://requests.readthedocs.io/en/master/) | `sw_requests` |
+| [Flask](https://flask.palletsprojects.com/en/1.1.x/) | `sw_flask` |
+| [PyMySQL](https://pymysql.readthedocs.io/en/latest/) | `sw_pymysql` |
+| [Django](https://www.djangoproject.com/) | `sw_django` |
+| [redis-py](https://github.com/andymccurdy/redis-py/) | `sw_redis` |
+| [kafka-python](https://kafka-python.readthedocs.io/en/master/) | `sw_kafka` |
+| [tornado](https://www.tornadoweb.org/en/stable/) | `sw_tornado` |
+| [pika](https://pika.readthedocs.io/en/stable/) | `sw_rabbitmq` |
+| [pymongo](https://pymongo.readthedocs.io/en/stable/) | `sw_pymongo` |
+| [elasticsearch](https://github.com/elastic/elasticsearch-py) | `sw_elasticsearch` |
+| [kubernetes](https://github.com/kubernetes-client/python) | `sw_kubernetes` |
+=======
Review comment:
Conflicts are not correctly resolved
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [skywalking-python] alonelaval commented on pull request #69: [Plugin] Add plugin for urllib3 library
Posted by GitBox <gi...@apache.org>.
alonelaval commented on pull request #69:
URL: https://github.com/apache/skywalking-python/pull/69#issuecomment-678748900
thanks
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org