fix: Ingester always update prometheus labels even if labels version …

…has not changed
deepflowio · Jun 27, 2024 · ebb1564 · ebb1564
1 parent fb201be
commit ebb1564
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/docs/CHANGELOG-6-5.md b/docs/CHANGELOG-6-5.md
@@ -2,12 +2,14 @@
 
 ### DeepFlow release v6.5
 
-- feat: Add Changelog [#7095](/~https://github.com/deepflowio/deepflow/pull/7095)
-- feat: CK’s username and password support the use of special characters [#7229](/~https://github.com/deepflowio/deepflow/pull/7119)
-
-**[Changelog for v6.5](https://www.deepflow.io/docs/release-notes/release-6.5-ce)**<br/>
+#### New Feature
+* feat: Add Changelog [#7095](/~https://github.com/deepflowio/deepflow/pull/7095)
+* feat: CK’s username and password support the use of special characters [#7229](/~https://github.com/deepflowio/deepflow/pull/7119)
 
 #### Bug Fix
-* Fix prometheus data cannot be labeled with universal tags，if slow-decoder is used. [#7100](/~https://github.com/deepflowio/deepflow/pull/7100)
+* fix: prometheus data cannot be labeled with universal tags, if slow-decoder is used. [#7100](/~https://github.com/deepflowio/deepflow/pull/7100)
 * fix: agent - eBPF strengthening protocol inference for SOFARPC and MySQL [#7110](/~https://github.com/deepflowio/deepflow/pull/7110)
-* Fix server controller changes prometheus label version when data does not change actually. [#7115](/~https://github.com/deepflowio/deepflow/pull/7115)
+* fix: server controller changes prometheus label version when data does not change actually. [#7115](/~https://github.com/deepflowio/deepflow/pull/7115)
+* fix: Ingester always update prometheus labels even if labels version has not changed.  [#7128](/~https://github.com/deepflowio/deepflow/pull/7128)
+
+**[Changelog for v6.5](https://www.deepflow.io/docs/release-notes/release-6.5-ce)**<br/>
diff --git a/server/ingester/prometheus/decoder/grpc_label_ids.go b/server/ingester/prometheus/decoder/grpc_label_ids.go
@@ -203,7 +203,11 @@ func (t *PrometheusLabelTable) RequestLabelIDs(request *trident.PrometheusLabelR
 	isAll := false
 	if len(request.RequestLabels) == 0 && len(request.RequestTargets) == 0 {
 		isAll = true
-		t.labelVersion = response.GetVersion()
+		responseVersion := response.GetVersion()
+		if t.labelVersion == responseVersion {
+			return response, nil
+		}
+		t.labelVersion = responseVersion
 	}
 	t.updatePrometheusLabels(response, isAll)