You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/09/23 02:55:33 UTC
[skywalking-java] branch bytebuddy-bumpup updated (c5b1f29 ->
991d751)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch bytebuddy-bumpup
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git.
from c5b1f29 Upgrade byte-buddy to 1.11.16
add 941350b Remove link to aliyun ONS doc (#32)
add 43839e0 Fix a tracing context leak in SpringMVC plugin (#34)
add 7b5e0fb Update support-version.list for Pulsar test scenario (#33)
add 7d36faa Add Kafka LogReporter and make grpc log reporter sharing grpc channel with reporters (#20)
add 5143f0e Merge branch 'main' of https://github.com/apache/skywalking-java into bytebuddy-bumpup
add 991d751 Bump up to 1.11.18
No new revisions were added by this update.
Summary of changes:
.github/workflows/e2e.yaml | 48 ++++++
CHANGES.md | 6 +-
.../skywalking/apm/agent/core/conf/Config.java | 7 +
.../agent/core/remote/LogReportServiceClient.java | 102 ++++++++++--
.../apm/agent/core/boot/ServiceManagerTest.java | 8 +-
.../interceptor/AbstractMethodInterceptor.java | 82 +++++-----
.../common/log/GRPCLogReportServiceClient.java | 181 ---------------------
.../toolkit/logging/common/log/ToolkitConfig.java | 25 ---
apm-sniffer/config/agent.config | 18 +-
...der.java => KafkaLogReporterServiceClient.java} | 47 ++----
.../core/kafka/KafkaReporterPluginConfig.java | 2 +
...ache.skywalking.apm.agent.core.boot.BootService | 3 +-
.../java-agent/Application-toolkit-log4j-1.x.md | 5 +-
.../java-agent/Application-toolkit-log4j-2.x.md | 5 +-
.../java-agent/Application-toolkit-logback-1.x.md | 5 +-
.../service-agent/java-agent/Supported-list.md | 2 +-
.../service-agent/java-agent/configurations.md | 6 +-
pom.xml | 2 +-
test/e2e/base/base-compose.yml | 74 +++++++++
.../scenario.sh => e2e/base/consumer/Dockerfile} | 11 +-
.../base/consumer}/pom.xml | 50 ++++--
.../apache/skywalking/e2e/E2EConfiguration.java} | 14 +-
.../skywalking/e2e/Service1Application.java} | 7 +-
.../main/java/org/apache/skywalking/e2e/User.java | 11 +-
.../e2e/controller/HealthController.java} | 20 ++-
.../skywalking/e2e/controller/UserController.java | 87 ++++++++++
.../consumer/src/main/resources/application.yml} | 14 +-
.../gateway-2.1.x-scenario => e2e/base}/pom.xml | 55 ++++---
.../scenario.sh => e2e/base/provider/Dockerfile} | 11 +-
test/e2e/base/provider/pom.xml | 154 ++++++++++++++++++
.../java/org/apache/skywalking/e2e/KeyValue.java} | 13 +-
.../skywalking/e2e/Service0Application.java} | 29 ++--
.../main/java/org/apache/skywalking/e2e/User.java} | 30 ++--
.../java/org/apache/skywalking/e2e/UserRepo.java | 6 +-
.../e2e/controller/HealthController.java} | 13 +-
.../skywalking/e2e/controller/UserController.java | 69 ++++++++
.../apache/skywalking/e2e/profile/CreateUser.java} | 16 +-
.../skywalking/e2e/profile/ProfileController.java} | 36 ++--
.../provider/src/main/resources/application.yml} | 36 +++-
.../provider/src/main/resources/log4j.properties | 26 +++
.../base/provider}/src/main/resources/log4j2.xml | 24 ++-
.../base/provider/src/main/resources/logback.xml | 52 ++++++
.../case/base/docker-compose.yml} | 49 ++++--
test/e2e/case/base/e2e.yaml | 100 ++++++++++++
.../e2e/case/base/expected/event-list.yml | 25 ++-
test/e2e/case/base/expected/logs-list.yml | 45 +++++
.../e2e/case/base/expected/metrics-has-value.yml | 10 +-
.../e2e/case/base/expected/service-endpoint.yml | 10 +-
test/e2e/case/base/expected/service-instance.yml | 54 ++++++
.../e2e/case/base/expected/service.yml | 10 +-
test/e2e/case/base/expected/trace-info-detail.yml | 67 ++++++++
.../e2e/case/base/expected/trace-users-detail.yml | 57 ++++---
test/e2e/case/base/expected/traces-list.yml | 47 ++++++
.../scenarios/pulsar-scenario/support-version.list | 2 +-
54 files changed, 1340 insertions(+), 548 deletions(-)
create mode 100644 .github/workflows/e2e.yaml
delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/java/org/apache/skywalking/apm/toolkit/logging/common/log/GRPCLogReportServiceClient.java
copy apm-sniffer/optional-reporter-plugins/kafka-reporter-plugin/src/main/java/org/apache/skywalking/apm/agent/core/kafka/{KafkaMeterSender.java => KafkaLogReporterServiceClient.java} (52%)
create mode 100644 test/e2e/base/base-compose.yml
copy test/{plugin/runner-helper/src/test/resources/scenario.sh => e2e/base/consumer/Dockerfile} (79%)
mode change 100755 => 100644
copy test/{plugin/scenarios/webflux-scenario/webflux-projectA-scenario => e2e/base/consumer}/pom.xml (61%)
copy test/{plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/RequestHeader.java => e2e/base/consumer/src/main/java/org/apache/skywalking/e2e/E2EConfiguration.java} (74%)
copy test/{plugin/scenarios/kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka/Application.java => e2e/base/consumer/src/main/java/org/apache/skywalking/e2e/Service1Application.java} (88%)
copy apm-sniffer/apm-sdk-plugin/neo4j-4.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/neo4j/v4x/MockMethod.java => test/e2e/base/consumer/src/main/java/org/apache/skywalking/e2e/User.java (86%)
copy test/{plugin/scenarios/httpasyncclient-scenario/src/main/java/org/apache/skywalking/testcase/httpasyncclient/BackController.java => e2e/base/consumer/src/main/java/org/apache/skywalking/e2e/controller/HealthController.java} (67%)
create mode 100644 test/e2e/base/consumer/src/main/java/org/apache/skywalking/e2e/controller/UserController.java
copy test/{plugin/scenarios/customize-scenario/src/main/resources/application.yaml => e2e/base/consumer/src/main/resources/application.yml} (87%)
copy test/{plugin/scenarios/gateway-2.1.x-scenario => e2e/base}/pom.xml (56%)
copy test/{plugin/runner-helper/src/test/resources/scenario.sh => e2e/base/provider/Dockerfile} (79%)
mode change 100755 => 100644
create mode 100644 test/e2e/base/provider/pom.xml
copy test/{plugin/runner-helper/src/main/java/org/apache/skywalking/plugin/test/helper/vo/RequestHeader.java => e2e/base/provider/src/main/java/org/apache/skywalking/e2e/KeyValue.java} (80%)
copy test/{plugin/scenarios/neo4j-4.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/neo4j/Application.java => e2e/base/provider/src/main/java/org/apache/skywalking/e2e/Service0Application.java} (66%)
copy test/{plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/models/Person.java => e2e/base/provider/src/main/java/org/apache/skywalking/e2e/User.java} (65%)
copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/TracingThreadListener.java => test/e2e/base/provider/src/main/java/org/apache/skywalking/e2e/UserRepo.java (83%)
copy test/{plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java => e2e/base/provider/src/main/java/org/apache/skywalking/e2e/controller/HealthController.java} (77%)
create mode 100644 test/e2e/base/provider/src/main/java/org/apache/skywalking/e2e/controller/UserController.java
copy test/{plugin/scenarios/servicecomb-0.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/servicecomb/schema/models/Person.java => e2e/base/provider/src/main/java/test/apache/skywalking/e2e/profile/CreateUser.java} (77%)
copy test/{plugin/scenarios/quartz-scheduler-2.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/quartzscheduler/controller/CaseController.java => e2e/base/provider/src/main/java/test/apache/skywalking/e2e/profile/ProfileController.java} (54%)
copy test/{plugin/scenarios/spring-cloud-feign-1.1.x-scenario/src/main/resources/application.yaml => e2e/base/provider/src/main/resources/application.yml} (61%)
create mode 100644 test/e2e/base/provider/src/main/resources/log4j.properties
copy test/{plugin/scenarios/jetty-scenario/jettyclient-scenario => e2e/base/provider}/src/main/resources/log4j2.xml (53%)
create mode 100644 test/e2e/base/provider/src/main/resources/logback.xml
copy test/{plugin/runner-helper/src/test/resources/docker-compose-test.yml => e2e/case/base/docker-compose.yml} (58%)
create mode 100644 test/e2e/case/base/e2e.yaml
copy apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService => test/e2e/case/base/expected/event-list.yml (63%)
create mode 100644 test/e2e/case/base/expected/logs-list.yml
copy apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService => test/e2e/case/base/expected/metrics-has-value.yml (85%)
copy apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService => test/e2e/case/base/expected/service-endpoint.yml (84%)
create mode 100644 test/e2e/case/base/expected/service-instance.yml
rename apm-sniffer/apm-toolkit-activation/apm-toolkit-logging-common/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.boot.BootService => test/e2e/case/base/expected/service.yml (82%)
create mode 100644 test/e2e/case/base/expected/trace-info-detail.yml
copy .asf.yaml => test/e2e/case/base/expected/trace-users-detail.yml (52%)
create mode 100644 test/e2e/case/base/expected/traces-list.yml