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/02/12 08:20:31 UTC

[skywalking] branch master updated (e5366c0 -> 7ff9a0c)

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

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


    from e5366c0  Tag annotation supports returned expression (#4327)
     add 7ff9a0c  supprt gRPC alarm hook. (#4344)

No new revisions were added by this update.

Summary of changes:
 docs/en/setup/backend/backend-alarm.md             |  19 +++
 .../exporter/provider/grpc/GRPCExporter.java       |  88 +++++------
 .../exporter/provider/grpc/GRPCExporterTest.java   |  13 +-
 oap-server/server-alarm-plugin/pom.xml             |  34 +++++
 .../core/alarm/provider/AlarmRulesWatcher.java     |  21 +--
 .../server/core/alarm/provider/NotifyHandler.java  |   2 +
 .../oap/server/core/alarm/provider/Rules.java      |   2 +
 .../server/core/alarm/provider/RulesReader.java    |  17 +++
 .../alarm/provider/grpc/GRPCAlarmSetting.java}     |  14 +-
 .../core/alarm/provider/grpc/GRPCCallback.java     | 163 +++++++++++++++++++++
 .../src/main/proto/alarm-hook.proto                |  26 ++--
 .../core/alarm/provider/AlarmRulesWatcherTest.java |   4 +
 .../alarm/provider/grpc/AlarmMockReceiver.java}    |  49 +++----
 .../alarm/provider/grpc/GRPChookCallbackTest.java  |  79 ++++++++++
 .../src/test/resources/alarm-settings.yml          |   4 +
 .../src/main/resources/alarm-settings.yml          |   4 +
 .../{ExporterModule.java => ExportData.java}       |  22 +--
 .../util/{Address.java => GRPCStreamStatus.java}   |  14 +-
 18 files changed, 450 insertions(+), 125 deletions(-)
 copy oap-server/{exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporterSetting.java => server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCAlarmSetting.java} (77%)
 create mode 100644 oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
 copy test/plugin/mock-collector/src/main/proto/language-agent-v2/JVMMetric.proto => oap-server/server-alarm-plugin/src/main/proto/alarm-hook.proto (69%)
 copy oap-server/{exporter/src/test/java/org/apache/skywalking/oap/server/exporter/provider/grpc/ExporterMockReceiver.java => server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/AlarmMockReceiver.java} (52%)
 create mode 100644 oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPChookCallbackTest.java
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/exporter/{ExporterModule.java => ExportData.java} (69%)
 copy oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/{Address.java => GRPCStreamStatus.java} (87%)