Merge pull request containerd#10814 from Iceber/release-1.7/unmarshal…

…-metrics-to-type [release/1.7] metrics: Use UnmarshalTo instead of UnmarshalAny
Mirantis · Oct 16, 2024 · 7d2d0c6 · 7d2d0c6
2 parents 57f17b0 + d6f5778
commit 7d2d0c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/metrics/cgroups/v1/metrics.go b/metrics/cgroups/v1/metrics.go
@@ -148,16 +148,12 @@ func (c *Collector) collect(entry entry, ch chan<- prometheus.Metric, block bool
 		return
 	}
 
-	data, err := typeurl.UnmarshalAny(stats)
-	if err != nil {
+	s := &v1.Metrics{}
+	if err := typeurl.UnmarshalTo(stats, s); err != nil {
 		log.L.WithError(err).Errorf("unmarshal stats for %s", t.ID())
 		return
 	}
-	s, ok := data.(*v1.Metrics)
-	if !ok {
-		log.L.WithError(err).Errorf("invalid metric type for %s", t.ID())
-		return
-	}
+
 	ns := entry.ns
 	if ns == nil {
 		ns = c.ns

diff --git a/metrics/cgroups/v2/metrics.go b/metrics/cgroups/v2/metrics.go
@@ -141,16 +141,12 @@ func (c *Collector) collect(entry entry, ch chan<- prometheus.Metric, block bool
 		return
 	}
 
-	data, err := typeurl.UnmarshalAny(stats)
-	if err != nil {
+	s := &v2.Metrics{}
+	if err := typeurl.UnmarshalTo(stats, s); err != nil {
 		log.L.WithError(err).Errorf("unmarshal stats for %s", t.ID())
 		return
 	}
-	s, ok := data.(*v2.Metrics)
-	if !ok {
-		log.L.WithError(err).Errorf("invalid metric type for %s", t.ID())
-		return
-	}
+
 	ns := entry.ns
 	if ns == nil {
 		ns = c.ns