You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2020/03/06 03:26:36 UTC
[skywalking] branch rest_api updated (f155d06 -> adacfb6)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch rest_api
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from f155d06 update e2e.
add b6f7dce forward compatbility for DCS (#4442)
add 0df2d0a Provide profile exporter tool (#4416)
add adacfb6 Merge branch 'master' into rest_api
No new revisions were added by this update.
Summary of changes:
apm-dist-es7/src/main/assembly/binary-es7.xml | 6 +
apm-dist/src/main/assembly/binary.xml | 6 +
docs/en/FAQ/README.md | 1 +
docs/en/guides/README.md | 1 +
docs/en/guides/backend-profile-export.md | 24 +++
docs/en/guides/backend-profile.md | 3 +
oap-server/pom.xml | 1 +
.../grpc/GRPCConfigWatcherRegister.java | 2 +-
.../oap/server/core/CoreModuleConfig.java | 2 +-
oap-server/server-starter-es7/pom.xml | 7 +
oap-server/server-starter/pom.xml | 7 +
.../e2e-ttl => oap-server/server-tools}/pom.xml | 11 +-
.../server-tools/profile-exporter}/pom.xml | 20 ++-
.../tool-profile-snapshot-bootstrap}/pom.xml | 32 ++--
.../tool/profile/exporter/ExporterConfig.java | 68 ++++++++
.../profile/exporter/ProfileSnapshotDumper.java | 112 ++++++++++++
.../ProfileSnapshotExporterBootstrap.java} | 50 +++---
.../tool/profile/exporter/ProfiledBasicInfo.java | 154 +++++++++++++++++
.../exporter/ProfileAnalyzeSnapshotDAO.java | 76 +++++++++
.../profile/exporter/ProfileExportedAnalyze.java | 158 +++++++++++++++++
.../tool/profile/exporter/test/ExportedData.java | 36 ++--
.../exporter/test/ProfileExportSnapshotDAO.java | 92 ++++++++++
.../exporter/test/ProfileSnapshotExporterTest.java | 121 +++++++++++++
.../profile/exporter/test/ProfileTraceDAO.java | 71 ++++++++
.../src/test/resources/profile.yml | 24 ++-
.../tool-profile-snapshot-exporter-es7}/pom.xml | 16 +-
.../profile/exporter/ProfileSnapshotExporter.java} | 12 +-
.../tool-profile-snapshot-exporter}/pom.xml | 16 +-
.../profile/exporter/ProfileSnapshotExporter.java} | 12 +-
.../tool-profile-snapshot-server-mock}/pom.xml | 8 +-
.../tool/profile/core/MockCoreModuleConfig.java} | 4 +-
.../tool/profile/core/MockCoreModuleProvider.java | 190 +++++++++++++++++++++
.../mock/MockComponentLibraryCatalogService.java} | 41 ++---
.../core/mock/MockGRPCHandlerRegister.java} | 19 +--
.../core/mock/MockJettyHandlerRegister.java} | 13 +-
.../core/mock/MockRemoteClientManager.java} | 20 +--
.../tool/profile/core/mock/MockSourceReceiver.java | 22 +--
.../core/mock/MockStreamAnnotationListener.java} | 23 +--
.../core/mock/MockWorkerInstancesService.java} | 30 ++--
...alking.oap.server.library.module.ModuleProvider | 2 +-
.../e2e-profile/e2e-profile-test-runner/pom.xml | 64 ++++++-
.../src/docker/h2/h2-install.sh} | 18 +-
.../skywalking/e2e/ProfileVerificationITCase.java | 92 ++++++++++
tools/profile-exporter/application.yml | 109 ++++++++++++
tools/profile-exporter/profile_exporter.sh | 99 +++++++++++
.../profile-exporter/profile_exporter_log4j2.xml | 4 +-
46 files changed, 1683 insertions(+), 216 deletions(-)
create mode 100644 docs/en/guides/backend-profile-export.md
copy {test/e2e/e2e-ttl => oap-server/server-tools}/pom.xml (85%)
copy {test/e2e/e2e-cluster-with-gateway => oap-server/server-tools/profile-exporter}/pom.xml (73%)
copy oap-server/{server-receiver-plugin/zipkin-receiver-plugin => server-tools/profile-exporter/tool-profile-snapshot-bootstrap}/pom.xml (67%)
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ExporterConfig.java
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotDumper.java
copy oap-server/{server-bootstrap/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerBootstrap.java => server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporterBootstrap.java} (53%)
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfiledBasicInfo.java
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileAnalyzeSnapshotDAO.java
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileExportedAnalyze.java
copy test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/trace/Span.java => oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/java/org/apache/skywalking/oap/server/tool/profile/exporter/test/ExportedData.java (67%)
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/java/org/apache/skywalking/oap/server/tool/profile/exporter/test/ProfileExportSnapshotDAO.java
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/java/org/apache/skywalking/oap/server/tool/profile/exporter/test/ProfileSnapshotExporterTest.java
create mode 100644 oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/java/org/apache/skywalking/oap/server/tool/profile/exporter/test/ProfileTraceDAO.java
copy apm-sniffer/optional-plugins/customize-enhance-plugin/src/main/resources/META-INF/services/org.apache.skywalking.apm.agent.core.plugin.loader.InstrumentationLoader => oap-server/server-tools/profile-exporter/tool-profile-snapshot-bootstrap/src/test/resources/profile.yml (75%)
mode change 100755 => 100644
copy oap-server/{server-receiver-plugin/skywalking-register-receiver-plugin => server-tools/profile-exporter/tool-profile-snapshot-exporter-es7}/pom.xml (76%)
copy oap-server/{server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java => server-tools/profile-exporter/tool-profile-snapshot-exporter-es7/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporter.java} (81%)
copy oap-server/{server-storage-plugin/storage-jaeger-plugin => server-tools/profile-exporter/tool-profile-snapshot-exporter}/pom.xml (79%)
copy oap-server/{server-starter/src/main/java/org/apache/skywalking/oap/server/starter/OAPServerStartUp.java => server-tools/profile-exporter/tool-profile-snapshot-exporter/src/main/java/org/apache/skywalking/oap/server/tool/profile/exporter/ProfileSnapshotExporter.java} (81%)
copy oap-server/{server-receiver-plugin/skywalking-profile-receiver-plugin => server-tools/profile-exporter/tool-profile-snapshot-server-mock}/pom.xml (84%)
copy oap-server/{server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmSettings.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/MockCoreModuleConfig.java} (88%)
create mode 100755 oap-server/server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/MockCoreModuleProvider.java
copy oap-server/{server-library/library-module/src/test/java/org/apache/skywalking/oap/server/library/module/TestModuleProvider.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockComponentLibraryCatalogService.java} (59%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/server/GRPCHandlerRegisterImpl.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockGRPCHandlerRegister.java} (74%)
copy oap-server/{server-receiver-plugin/skywalking-sharing-server-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/sharing/server/ReceiverJettyHandlerRegister.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockJettyHandlerRegister.java} (78%)
copy oap-server/{server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/module/ProfileModule.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockRemoteClientManager.java} (67%)
copy test/e2e/e2e-base/src/main/java/org/apache/skywalking/e2e/GQLResponse.java => oap-server/server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockSourceReceiver.java (71%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/StreamAnnotationListener.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockStreamAnnotationListener.java} (72%)
copy oap-server/{server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/selector/RollingSelector.java => server-tools/profile-exporter/tool-profile-snapshot-server-mock/src/main/java/org/apache/skywalking/oap/server/tool/profile/core/mock/MockWorkerInstancesService.java} (52%)
copy oap-server/{server-alarm-plugin => server-tools/profile-exporter/tool-profile-snapshot-server-mock}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (91%)
mode change 100644 => 100755
copy test/e2e/{e2e-6.x-agent-7.x-oap-compatibility/src/docker/rc.d/rc0-prepare.sh => e2e-profile/e2e-profile-test-runner/src/docker/h2/h2-install.sh} (63%)
create mode 100644 tools/profile-exporter/application.yml
create mode 100755 tools/profile-exporter/profile_exporter.sh
copy oap-server/server-testing/src/test/resources/log4j2.xml => tools/profile-exporter/profile_exporter_log4j2.xml (95%)