[skywalking] branch query-labeled updated (cda6e25 -> d44116a)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a change to branch query-labeled
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from cda6e25  Polish codes
     add 68ab389  fix an error when no statement with slowStatement  (#5243) (#5245)
     add 24eeb5d  Add swctl to docker image for health check (#5139)
     add dd6f439  support collecting feign params (#5235)
     add 6910ff3  Add Customization Config section for plugin development. (#5249)
     add d44116a  Merge branch 'master' into query-labeled

No new revisions were added by this update.

Summary of changes:
 apm-protocol/apm-network/src/main/proto            |  2 +-
 .../apm/agent/core/context/tag/Tags.java           |  2 +
 .../http/v9/DefaultHttpClientInterceptor.java      | 32 +++++++++++++++
 .../plugin/feign/http/v9/FeignPluginConfig.java}   | 27 ++++++------
 docker/docker-compose.yml                          | 10 ++++-
 docker/oap/Dockerfile.oap                          |  5 +++
 docs/en/guides/Java-Plugin-Development-Guide.md    | 48 ++++++++++++++++++++++
 docs/en/setup/service-agent/java-agent/README.md   |  3 ++
 .../listener/MultiScopesAnalysisListener.java      |  2 +-
 .../plugin/scenarios/feign-scenario/bin/startup.sh |  4 +-
 .../feign-scenario/config/expectedData.yaml        | 43 ++++++++++++++++++-
 .../testcase/feign/controller/CaseController.java  |  1 +
 .../testcase/feign/controller/RestController.java  |  8 ++++
 .../apm/testcase/feign/controller/RestRequest.java |  5 +++
 14 files changed, 173 insertions(+), 19 deletions(-)
 copy apm-sniffer/apm-sdk-plugin/{mongodb-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/mongodb/v3/MongoPluginConfig.java => feign-default-http-9.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/feign/http/v9/FeignPluginConfig.java} (51%)