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 2022/07/28 07:32:01 UTC
[skywalking-satellite] branch main updated: Fix the missing return data when receive metrics in batch mode. (#116)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
The following commit(s) were added to refs/heads/main by this push:
new 33bd652 Fix the missing return data when receive metrics in batch mode. (#116)
33bd652 is described below
commit 33bd6520e95c9024989aa388f4523c4641f874ad
Author: mrproliu <74...@qq.com>
AuthorDate: Thu Jul 28 15:31:57 2022 +0800
Fix the missing return data when receive metrics in batch mode. (#116)
---
CHANGES.md | 8 ++++----
CHANGES.md => changes/changes-1.0.1.md | 4 ++--
plugins/receiver/grpc/nativemeter/meter_service.go | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 78472b1..d972e70 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,13 +2,13 @@ Changes by Version
==================
Release Notes.
-1.1.0
+1.0.2
------------------
#### Features
#### Bug Fixes
-* Fix metadata messed up when transferring Log data.
+* Fix the missing return data when receive metrics in batch mode.
#### Issues and PR
-- All issues are [here](https://github.com/apache/skywalking/milestone/137?closed=1)
-- All and pull requests are [here](https://github.com/apache/skywalking-satellite/pulls?q=is%3Apr+milestone%3A1.1.0+is%3Aclosed)
\ No newline at end of file
+- All issues are [here](https://github.com/apache/skywalking/milestone/143?closed=1)
+- All and pull requests are [here](https://github.com/apache/skywalking-satellite/pulls?q=is%3Apr+milestone%3A1.0.2+is%3Aclosed)
diff --git a/CHANGES.md b/changes/changes-1.0.1.md
similarity index 82%
copy from CHANGES.md
copy to changes/changes-1.0.1.md
index 78472b1..6884e3d 100644
--- a/CHANGES.md
+++ b/changes/changes-1.0.1.md
@@ -2,7 +2,7 @@ Changes by Version
==================
Release Notes.
-1.1.0
+1.0.1
------------------
#### Features
@@ -11,4 +11,4 @@ Release Notes.
#### Issues and PR
- All issues are [here](https://github.com/apache/skywalking/milestone/137?closed=1)
-- All and pull requests are [here](https://github.com/apache/skywalking-satellite/pulls?q=is%3Apr+milestone%3A1.1.0+is%3Aclosed)
\ No newline at end of file
+- All and pull requests are [here](https://github.com/apache/skywalking-satellite/pulls?q=is%3Apr+milestone%3A1.0.1+is%3Aclosed)
\ No newline at end of file
diff --git a/plugins/receiver/grpc/nativemeter/meter_service.go b/plugins/receiver/grpc/nativemeter/meter_service.go
index 8d70c6d..bf8ba56 100644
--- a/plugins/receiver/grpc/nativemeter/meter_service.go
+++ b/plugins/receiver/grpc/nativemeter/meter_service.go
@@ -70,7 +70,7 @@ func (m *MeterService) CollectBatch(batch meter.MeterReportService_CollectBatchS
for {
item, err := batch.Recv()
if err == io.EOF {
- return nil
+ return batch.SendAndClose(&common.Commands{})
}
if err != nil {
return err