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/08/13 06:34:22 UTC

[skywalking] 01/01: Merge branch 'master' of https://github.com/apache/skywalking into banyandb-client-api

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

wusheng pushed a commit to branch banyandb-client-api
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 976da1af526ce8462c406b19f4bf23ef09b67192
Merge: 364f1c7 dc05539
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Fri Aug 13 14:31:47 2021 +0800

    Merge branch 'master' of https://github.com/apache/skywalking into banyandb-client-api
    
    * 'master' of https://github.com/apache/skywalking:
      DataCarrier changes a `#consume` API to add properties as a parameter to initialize consumer (#7452)

 CHANGES.md                                         |  5 ++++-
 .../apm/commons/datacarrier/DataCarrier.java       | 11 ++++++++---
 .../datacarrier/consumer/ConsumeDriver.java        | 22 +++++++++++++++-------
 .../commons/datacarrier/consumer/IConsumer.java    |  3 ++-
 .../apm/commons/datacarrier/DataCarrierTest.java   |  3 ++-
 .../commons/datacarrier/consumer/ConsumerTest.java |  3 ++-
 .../datacarrier/consumer/SampleConsumer.java       |  3 ++-
 .../agent/core/remote/LogReportServiceClient.java  |  3 ++-
 .../core/remote/TraceSegmentServiceClient.java     |  3 ++-
 .../core/kafka/KafkaTraceSegmentServiceClient.java |  3 ++-
 .../exporter/provider/grpc/GRPCExporter.java       |  3 ++-
 .../exporter/provider/grpc/GRPCExporterTest.java   |  2 +-
 .../analysis/worker/MetricsAggregateWorker.java    |  3 ++-
 .../analysis/worker/MetricsPersistentWorker.java   |  3 ++-
 .../server/core/analysis/worker/TopNWorker.java    |  3 ++-
 .../core/remote/client/GRPCRemoteClient.java       |  3 ++-
 .../storage/plugin/jdbc/h2/dao/H2BatchDAO.java     |  3 ++-
 17 files changed, 54 insertions(+), 25 deletions(-)