[RFC] Upgrade containerd/cgroups

Protobuild-stats.toml

@@ -0,0 +1,10 @@
+# Currently cmd/containerd-shim-runhcs-v1/stats package is generated by
+# Google's protoc-gen-go since it includes the fields from containerd/cgroups.
+#
+# The rest is generated by gogo/protobuf since containerd's gogo -> google migration
+# was only happening in 1.7.x and onwards.
+version = "2"
+generators = ["go"]
+
+[packages]
+  "github/containerd/cgroups/stats/v1/metrics.proto" = "github.com/containerd/cgroups/stats/v1"

cmd/containerd-shim-runhcs-v1/marshal.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/gogo/protobuf/types"
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/reflect/protoregistry"
+)
+
+// marshalAny marshals Google's proto.Message to Gogo's Any.
+func marshalAny(in proto.Message) (*types.Any, error) {
+	data, err := proto.Marshal(in)
+	if err != nil {
+		return nil, err
+	}
+	url := string(in.ProtoReflect().Descriptor().FullName())
+	if err != nil {
+		return nil, err
+	}
+	return &types.Any{Value: data, TypeUrl: url}, nil
+}
+
+// unmarshalAny unmarshals Gogo's Any to Google's proto.Message
+func unmarshalAny(in *types.Any) (proto.Message, error) {
+	mt, err := protoregistry.GlobalTypes.FindMessageByURL(in.TypeUrl)
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal %+v: %w", in, err)
+	}
+
+	out := mt.New().Interface()
+	err = proto.Unmarshal(in.Value, out)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}

cmd/containerd-shim-runhcs-v1/service_internal.go

@@ -508,7 +508,7 @@ func (s *service) statsInternal(ctx context.Context, req *task.StatsRequest) (*t
 	if err != nil {
 		return nil, err
 	}
-	any, err := typeurl.MarshalAny(stats)
+	any, err := marshalAny(stats)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to marshal Statistics for task: %s", req.ID)
 	}

cmd/containerd-shim-runhcs-v1/service_internal_podshim_test.go

@@ -705,7 +705,7 @@ func Test_PodShim_statsInternal_InitTaskID_Success(t *testing.T) {
 			if resp == nil || resp.Stats == nil {
 				t.Fatal("should have returned valid stats response")
 			}
-			statsI, err := typeurl.UnmarshalAny(resp.Stats)
+			statsI, err := unmarshalAny(resp.Stats)
 			if err != nil {
 				t.Fatalf("should not have failed to unmarshal StatsResponse got: %v", err)
 			}
@@ -730,7 +730,7 @@ func Test_PodShim_statsInternal_2ndTaskID_Success(t *testing.T) {
 			if resp == nil || resp.Stats == nil {
 				t.Fatal("should have returned valid stats response")
 			}
-			statsI, err := typeurl.UnmarshalAny(resp.Stats)
+			statsI, err := unmarshalAny(resp.Stats)
 			if err != nil {
 				t.Fatalf("should not have failed to unmarshal StatsResponse got: %v", err)
 			}

cmd/containerd-shim-runhcs-v1/service_internal_taskshim_test.go

@@ -627,7 +627,7 @@ func Test_TaskShim_statsInternal_InitTaskID_Success(t *testing.T) {
 			if resp == nil || resp.Stats == nil {
 				t.Fatal("should have returned valid stats response")
 			}
-			statsI, err := typeurl.UnmarshalAny(resp.Stats)
+			statsI, err := unmarshalAny(resp.Stats)
 			if err != nil {
 				t.Fatalf("should not have failed to unmarshal StatsResponse got: %v", err)
 			}

cmd/containerd-shim-runhcs-v1/service_internal_test.go

@@ -103,7 +103,7 @@ func verifyExpectedCgroupMetrics(t *testing.T, v *v1.Metrics) {
 		t.Fatal("expected non-nil Metrics.CPU")
 	}
 	if v.CPU.Usage.Total != 100 {
-		t.Fatalf("Expected Metrics.CPU.Usage == 100, got: %d", v.CPU.Usage)
+		t.Fatalf("Expected Metrics.CPU.Usage == 100, got: %+v", v.CPU.Usage)
 	}
 	if v.Memory == nil {
 		t.Fatal("expected non-nil Metrics.Memory")