You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by li...@apache.org on 2022/07/28 06:55:47 UTC
[skywalking-satellite] branch fix-batch-metrics created (now ac31757)
This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a change to branch fix-batch-metrics
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
at ac31757 Fix the missing return data when receive metrics in batch mode.
This branch includes the following new commits:
new ac31757 Fix the missing return data when receive metrics in batch mode.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking-satellite] 01/01: Fix the missing return data when receive metrics in batch mode.
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch fix-batch-metrics
in repository https://gitbox.apache.org/repos/asf/skywalking-satellite.git
commit ac3175735fa89845804ad3b83c35b9cf601d7c5a
Author: Mrproliu <74...@qq.com>
AuthorDate: Thu Jul 28 14:55:38 2022 +0800
Fix the missing return data when receive metrics in batch mode.
---
CHANGES.md | 4 ++--
CHANGES.md => changes/changes-1.0.1.md | 4 ++--
plugins/receiver/grpc/nativemeter/meter_service.go | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 78472b1..bf0268f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -7,8 +7,8 @@ Release Notes.
#### 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 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.1.0+is%3Aclosed)
\ No newline at end of file
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