Fix configuration names (#282)

* Refactor configs

* fix httpx

---------

Co-authored-by: kezhenxu94 <[email protected]>

Author: SheltonZSL

CHANGELOG.md

@@ -4,8 +4,8 @@
 
 - **Important Note and Breaking Changes:**
   - Python 3.6 is no longer supported and may not function properly.
-  - A number of configuration options (mostly environment variables) are renamed to follow the convention of
-  'SW_AGENT' prefixes, please check with the latest official documentation before upgrading. (#273)
+  - A number of common configuration options (environment variables) are renamed to follow the convention of Java agent,
+  please check with the latest official documentation before upgrading. (#273, #282)
 
   https://skywalking.apache.org/docs/skywalking-python/v1.0.0/en/setup/configuration/
   - All agent core capabilities are now covered by test cases and enabled by default (Trace, Log, PVM runtime metrics, Profiler)

Makefile

@@ -67,6 +67,7 @@ install: gen-basic
 # flake8 configurations should go to the file setup.cfg
 lint: clean
 	poetry run flake8 .
+	poetry run pylint --disable=all --enable=E0602,E0603,E1101 skywalking tests
 
 .PHONY: fix
 # fix problems described in CodingStyle.md - verify outcome with extra care

docs/en/setup/Configuration.md

@@ -7,56 +7,56 @@ which is by importing SkyWalking into your project and starting the agent.
 By default, SkyWalking Python agent uses gRPC protocol to report data to SkyWalking backend,
 in SkyWalking backend, the port of gRPC protocol is `11800`, and the port of HTTP protocol is `12800`,
 
-You could configure `collector_address` (or environment variable `SW_AGENT_COLLECTOR_ADDRESS`)
+You could configure `collector_address` (or environment variable `SW_AGENT_COLLECTOR_BACKEND_SERVICES`)
 and set `protocol` (or environment variable `SW_AGENT_PROTOCOL` to one of
 `gprc`, `http` or `kafka` according to the protocol you would like to use.
 
 ### Report data via gRPC protocol (Default)
 
 For example, if you want to use gRPC protocol to report data, configure `collector_address`
-(or environment variable `SW_AGENT_COLLECTOR_ADDRESS`) to `<oap-ip-or-host>:11800`,
+(or environment variable `SW_AGENT_COLLECTOR_BACKEND_SERVICES`) to `<oap-ip-or-host>:11800`,
 such as `127.0.0.1:11800`:
 
 ```python
 from skywalking import agent, config
 
-config.init(collector_address='127.0.0.1:11800', service_name='your awesome service')
+config.init(collector_address='127.0.0.1:11800', agent_name='your awesome service')
 
 agent.start()
 ```
 
 ### Report data via HTTP protocol
 
 However, if you want to use HTTP protocol to report data, configure `collector_address`
-(or environment variable `SW_AGENT_COLLECTOR_ADDRESS`) to `<oap-ip-or-host>:12800`,
+(or environment variable `SW_AGENT_COLLECTOR_BACKEND_SERVICES`) to `<oap-ip-or-host>:12800`,
 such as `127.0.0.1:12800`, further set `protocol` (or environment variable `SW_AGENT_PROTOCOL` to `http`):
 
 > Remember you should install `skywalking-python` with extra requires `http`, `pip install "apache-skywalking[http]`.
 
 ```python
 from skywalking import agent, config
 
-config.init(collector_address='127.0.0.1:12800', service_name='your awesome service', protocol='http')
+config.init(collector_address='127.0.0.1:12800', agent_name='your awesome service', protocol='http')
 
 agent.start()
 ```
 
 ### Report data via Kafka protocol
 
 Finally, if you want to use Kafka protocol to report data, configure `kafka_bootstrap_servers`
-(or environment variable `SW_AGENT_KAFKA_BOOTSTRAP_SERVERS`) to `kafka-brokers`,
+(or environment variable `SW_KAFKA_BOOTSTRAP_SERVERS`) to `kafka-brokers`,
 such as `127.0.0.1:9200`, further set `protocol` (or environment variable `SW_AGENT_PROTOCOL` to `kafka`):
 
 > Remember you should install `skywalking-python` with extra requires `kafka`, `pip install "apache-skywalking[kafka]"`.
 
 ```python
 from skywalking import agent, config
 
-config.init(kafka_bootstrap_servers='127.0.0.1:9200', service_name='your awesome service', protocol='kafka')
+config.init(kafka_bootstrap_servers='127.0.0.1:9200', agent_name='your awesome service', protocol='kafka')
 
 agent.start()
 ```
 
-Alternatively, you can also pass the configurations via environment variables (such as `SW_AGENT_SERVICE_NAME`, `SW_AGENT_COLLECTOR_ADDRESS`, etc.) so that you don't need to call `config.init`.
+Alternatively, you can also pass the configurations via environment variables (such as `SW_AGENT_NAME`, `SW_AGENT_COLLECTOR_BACKEND_SERVICES`, etc.) so that you don't need to call `config.init`.
 
 All supported environment variables can be found in the [Environment Variables List](Configuration.md).

docs/en/setup/Intrusive.md

@@ -8,7 +8,7 @@ To utilize this feature, you will need to add some new configurations to the age
 ```Python 
 from skywalking import agent, config
 
-config.init(collector_address='127.0.0.1:11800', service_name='your awesome service',
+config.init(collector_address='127.0.0.1:11800', agent_name='your awesome service',
                 log_reporter_active=True)  # defaults to grpc protocol
 agent.start()
 ``` 

docs/en/setup/advanced/LogReporter.md

@@ -6,7 +6,8 @@ and disable one or more plugins by following methods.**
 ```python
 from skywalking import config
 
-config.disable_plugins = ['sw_http_server', 'sw_urllib_request']  # can be also CSV format, i.e. 'sw_http_server,sw_urllib_request'
+config.agent_disable_plugins = ['sw_http_server',
+                                'sw_urllib_request']  # can be also CSV format, i.e. 'sw_http_server,sw_urllib_request'
 ```
 
 You can also disable the plugins via environment variables `SW_AGENT_DISABLE_PLUGINS`, 

docs/en/setup/faq/How-to-disable-plugin.md

@@ -17,7 +17,7 @@ from skywalking import agent, config
 
 @postfork
 def init_tracing():
-    config.init(collector_address='127.0.0.1:11800', service_name='your awesome service')
+    config.init(collector_address='127.0.0.1:11800', agent_name='your awesome service')
 
     agent.start()