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/01/09 08:28:30 UTC

[skywalking] branch agent_auth updated (83e1c23 -> 23aa235)

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

tanjian pushed a change to branch agent_auth
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from 83e1c23  fix ci and add e2e test case.
     add 4cf0600  Provide profile task downstream to sniffer (#4172)
     add 23aa235  Merge branch 'master' into agent_auth

No new revisions were added by this update.

Summary of changes:
 .../apm/network/constants/ProfileConstants.java    |  36 ++--
 .../component/command/CommandDeserializer.java     |   2 +
 .../component/command/ProfileTaskCommand.java      | 128 +++++++++++++
 apm-protocol/apm-network/src/main/proto            |   2 +-
 .../core/commands/CommandExecutorService.java      |   5 +
 .../executor/ProfileTaskCommandExecutor.java       |  54 ++++++
 .../skywalking/apm/agent/core/conf/Config.java     |  11 ++
 .../apm/agent/core/profile/ProfileTask.java        | 125 +++++++++++++
 .../core/profile/ProfileTaskExecutionContext.java} |  57 +++---
 .../core/profile/ProfileTaskExecutionService.java  | 201 +++++++++++++++++++++
 .../core/profile/ProfileTaskQueryService.java      | 117 ++++++++++++
 ...ache.skywalking.apm.agent.core.boot.BootService |   2 +
 .../apm/agent/core/boot/ServiceManagerTest.java    |  16 +-
 apm-sniffer/config/agent.config                    |   3 +
 dist-material/application.yml                      |   2 +
 docker/oap/docker-entrypoint.sh                    |   2 +
 docs/en/setup/backend/backend-receivers.md         |   3 +
 docs/en/setup/service-agent/java-agent/README.md   |   2 +
 oap-server/server-bootstrap/pom.xml                |   5 +
 .../src/test/resources/application.yml             |   2 +
 .../skywalking/oap/server/core/CoreModule.java     |   7 +-
 .../oap/server/core/CoreModuleConfig.java          |   5 +
 .../oap/server/core/CoreModuleProvider.java        |   1 +
 .../oap/server/core/cache/CacheUpdateTimer.java    |  27 +++
 .../oap/server/core/cache/ProfileTaskCache.java    |  99 ++++++++++
 .../oap/server/core/command/CommandService.java    |   7 +
 .../server/core/profile/ProfileTaskLogRecord.java  |  86 +++++++++
 .../core/profile/ProfileTaskMutationService.java   |  31 ++--
 .../server/core/profile/ProfileTaskNoneStream.java |   4 +
 .../server/core/query/ProfileTaskQueryService.java |  42 ++++-
 .../oap/server/core/query/entity/ProfileTask.java  |   6 +
 .../{ProfileTask.java => ProfileTaskLog.java}      |  21 ++-
 .../query/entity/ProfileTaskLogOperationType.java  |  55 +++---
 .../oap/server/core/source/DefaultScopeDefine.java |   1 +
 .../oap/server/core/storage/StorageModule.java     |   3 +-
 .../IProfileTaskLogQueryDAO.java}                  |  23 ++-
 .../src/test/resources/application.yml             |   2 +
 .../query/graphql/resolver/ProfileMutation.java    |   3 +-
 .../graphql/type/ProfileTaskCreationRequest.java   |   1 +
 .../src/main/resources/query-protocol              |   2 +-
 oap-server/server-receiver-plugin/pom.xml          |   1 +
 .../pom.xml                                        |   8 +-
 .../receiver/profile/module/ProfileModule.java}    |  13 +-
 .../profile/provider/ProfileModuleProvider.java}   |  40 ++--
 .../handler/ProfileTaskServiceHandler.java         |  96 ++++++++++
 ...ywalking.oap.server.library.module.ModuleDefine |   2 +-
 ...alking.oap.server.library.module.ModuleProvider |   2 +-
 .../StorageModuleElasticsearchProvider.java        |   2 +
 .../elasticsearch/query/ProfileTaskLogEsDAO.java   |  82 +++++++++
 .../elasticsearch/query/ProfileTaskQueryEsDAO.java |   4 +-
 .../StorageModuleElasticsearch7Provider.java       |   3 +
 .../storage/plugin/jdbc/h2/H2StorageProvider.java  |   2 +
 .../jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java      |  79 ++++++++
 .../plugin/jdbc/h2/dao/H2ProfileTaskQueryDAO.java  |   4 +-
 .../plugin/jdbc/mysql/MySQLStorageProvider.java    |   2 +
 test/e2e/e2e-mysql/src/docker/application.yml      |   2 +
 .../e2e-profile/e2e-profile-es-test-runner/pom.xml |   1 +
 .../skywalking/e2e/ProfileVerificationITCase.java  |  42 +++--
 .../e2e-profile/e2e-profile-h2-test-runner/pom.xml |   1 +
 .../skywalking/e2e/ProfileVerificationITCase.java  |  40 ++--
 .../e2e-profile-mysql-test-runner/pom.xml          |   1 +
 .../src/docker/application.yml                     |   2 +
 .../skywalking/e2e/ProfileVerificationITCase.java  |  42 +++--
 .../skywalking/e2e/profile/ProfileClient.java      |   3 +-
 .../creation/ProfileTaskCreationRequest.java       |   1 +
 .../skywalking/e2e/profile/query/ProfileTask.java  |   5 +
 .../{ProfileTasks.java => ProfileTaskLog.java}     |  10 +-
 ...asksMatcher.java => ProfileTaskLogMatcher.java} |  25 +--
 .../e2e/profile/query/ProfileTaskMatcher.java      |  13 ++
 ....e2e.ProfileVerificationITCase.profileTasks.yml |   6 +
 .../src/main/resources/getProfileTaskList.gql      |   7 +
 .../src/main/resources/profileTaskCreation.gql     |   3 +-
 72 files changed, 1536 insertions(+), 209 deletions(-)
 copy oap-server/server-telemetry/telemetry-api/src/main/java/org/apache/skywalking/oap/server/telemetry/api/GaugeMetrics.java => apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/constants/ProfileConstants.java (59%)
 create mode 100644 apm-protocol/apm-network/src/main/java/org/apache/skywalking/apm/network/trace/component/command/ProfileTaskCommand.java
 create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/commands/executor/ProfileTaskCommandExecutor.java
 create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTask.java
 copy apm-sniffer/{apm-sdk-plugin/kafka-plugin/src/main/java/org/apache/skywalking/apm/plugin/kafka/ConsumerEnhanceRequiredInfo.java => apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionContext.java} (50%)
 create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskExecutionService.java
 create mode 100644 apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/profile/ProfileTaskQueryService.java
 create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/cache/ProfileTaskCache.java
 create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profile/ProfileTaskLogRecord.java
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/{ProfileTask.java => ProfileTaskLog.java} (78%)
 copy apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/context/trace/SpanLayer.java => oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/ProfileTaskLogOperationType.java (51%)
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/{query/IAlarmQueryDAO.java => profile/IProfileTaskLogQueryDAO.java} (64%)
 copy oap-server/server-receiver-plugin/{skywalking-jvm-receiver-plugin => skywalking-profile-receiver-plugin}/pom.xml (81%)
 copy oap-server/{server-configuration/configuration-nacos/src/test/java/org/apache/skywalking/oap/server/configuration/nacos/NacosConfigurationTestModule.java => server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/module/ProfileModule.java} (80%)
 copy oap-server/server-receiver-plugin/{skywalking-jvm-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/jvm/provider/JVMModuleProvider.java => skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/ProfileModuleProvider.java} (57%)
 create mode 100644 oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java
 copy oap-server/{server-configuration/configuration-api => server-receiver-plugin/skywalking-profile-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleDefine (91%)
 copy oap-server/{exporter => server-receiver-plugin/skywalking-profile-receiver-plugin}/src/main/resources/META-INF/services/org.apache.skywalking.oap.server.library.module.ModuleProvider (90%)
 create mode 100644 oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/ProfileTaskLogEsDAO.java
 create mode 100644 oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ProfileTaskLogQueryDAO.java
 copy test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/{ProfileTasks.java => ProfileTaskLog.java} (86%)
 copy test/e2e/e2e-profile/e2e-profile-test-runner/src/main/java/org/apache/skywalking/e2e/profile/query/{ProfilesTasksMatcher.java => ProfileTaskLogMatcher.java} (65%)