fix

alibaba · Sep 19, 2024 · 8c774f1 · 8c774f1
1 parent aa63bf8
commit 8c774f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/input/kubernetesmetav2/meta_collector.go b/plugins/input/kubernetesmetav2/meta_collector.go
@@ -259,7 +259,6 @@ func (m *metaCollector) processEntityCommonPart(logContents models.LogContents,
  logContents.Add(entityKindFieldName, kind)
  logContents.Add(entityNameFieldName, name)
  logContents.Add(entityCreationTimeFieldName, creationTime.Format(time.RFC3339))
- m.serviceK8sMeta.entityCount.Add(1)
 }
 
 func (m *metaCollector) processEntityLinkCommonPart(logContents models.LogContents, srcKind, srcNamespace, srcName, destKind, destNamespace, destName, method string, firstObservedTime, lastObservedTime int64) {
@@ -277,7 +276,6 @@ func (m *metaCollector) processEntityLinkCommonPart(logContents models.LogConten
  logContents.Add(entityLastObservedTimeFieldName, strconv.FormatInt(lastObservedTime, 10))
  logContents.Add(entityKeepAliveSecondsFieldName, strconv.FormatInt(int64(m.serviceK8sMeta.Interval*2), 10))
  logContents.Add(entityCategoryFieldName, defaultEntityLinkCategory)
- m.serviceK8sMeta.linkCount.Add(1)
 }
 
 func (m *metaCollector) processEntityJSONObject(obj map[string]string) string {
@@ -332,18 +330,22 @@ func (m *metaCollector) sendInBackground() {
  entityGroup.Events = append(entityGroup.Events, e)
  if len(entityGroup.Events) >= 100 {
  sendFunc(entityGroup)
+ m.serviceK8sMeta.entityCount.Add(int64(len(entityGroup.Events)))
  }
  case e := <-m.entityLinkBuffer:
  entityLinkGroup.Events = append(entityLinkGroup.Events, e)
  if len(entityLinkGroup.Events) >= 100 {
  sendFunc(entityLinkGroup)
+ m.serviceK8sMeta.linkCount.Add(int64(len(entityLinkGroup.Events)))
  }
  case <-time.After(3 * time.Second):
  if len(entityGroup.Events) > 0 {
  sendFunc(entityGroup)
+ m.serviceK8sMeta.entityCount.Add(int64(len(entityGroup.Events)))
  }
  if len(entityLinkGroup.Events) > 0 {
  sendFunc(entityLinkGroup)
+ m.serviceK8sMeta.linkCount.Add(int64(len(entityLinkGroup.Events)))
  }
  case <-m.stopCh:
  return

diff --git a/plugins/input/kubernetesmetav2/meta_collector_core.go b/plugins/input/kubernetesmetav2/meta_collector_core.go
@@ -84,7 +84,6 @@ func (m *metaCollector) processPodEntity(data *k8smeta.ObjectWrapper, method str
  volumes = append(volumes, volumeInfo)
  }
  containerLog.Contents.Add("volumes", m.processEntityJSONArray(volumes))
- m.serviceK8sMeta.entityCount.Add(1)
  result = append(result, containerLog)
  }
  }