Build and package the runsc metric-server binary in the gVisor release.

PiperOrigin-RevId: 683844740

Makefile

@@ -663,6 +663,7 @@ $(RELEASE_KEY):
 $(RELEASE_ARTIFACTS)/%:
 	@mkdir -p $@
 	@$(call copy,//runsc:runsc,$@)
+	@$(call copy,//runsc/cmd/metricserver:runsc-metric-server,$@)
 	@$(call copy,//shim:containerd-shim-runsc-v1,$@)
 	@$(call copy,//debian:debian,$@)
 

debian/BUILD

@@ -10,6 +10,7 @@ pkg_tar(
     name = "debian-bin",
     srcs = [
         "//runsc",
+        "//runsc/cmd/metricserver:runsc-metric-server",
         "//shim:containerd-shim-runsc-v1",
     ],
     mode = "0755",

runsc/cmd/metricserver/BUILD

@@ -7,12 +7,12 @@ package(
 )
 
 go_binary(
-    name = "metricserver_bin",
+    name = "runsc-metric-server",
     srcs = [
         "metricserver_main.go",
     ],
     visibility = [
-        "//test/metricclient:__subpackages__",
+        "//:sandbox",
     ],
     deps = [
         "//pkg/log",
@@ -27,7 +27,7 @@ go_binary(
 
 embedded_binary_go_library(
     name = "metricserver",
-    binary = ":metricserver_bin",
+    binary = ":runsc-metric-server",
     visibility = [
         "//runsc:__subpackages__",
     ],

test/metricclient/BUILD

@@ -12,7 +12,7 @@ go_library(
         "metricclient.go",
     ],
     data = [
-        "//runsc/cmd/metricserver:metricserver_bin",
+        "//runsc/cmd/metricserver:runsc-metric-server",
     ],
     visibility = [
         "//runsc:__subpackages__",

test/metricclient/metricclient.go

@@ -179,9 +179,9 @@ func (c *MetricClient) HealthCheck(ctx context.Context) error {
 // A running server must be stopped before a new one can be successfully started.
 // baseConf is used for passing other flags to the server, e.g. debug log directory.
 func (c *MetricClient) SpawnServer(ctx context.Context, baseConf *config.Config, extraArgs ...string) error {
-	metricServerBinPath, err := testutil.FindFile("runsc/cmd/metricserver/metricserver_bin")
+	metricServerBinPath, err := testutil.FindFile("runsc/cmd/metricserver/runsc-metric-server")
 	if err != nil {
-		return fmt.Errorf("cannot find metricserver_bin: %w", err)
+		return fmt.Errorf("cannot find runsc-metric-server: %w", err)
 	}
 	c.mu.Lock()
 	defer c.mu.Unlock()