Merge 26ec2674b0 into a4619f3676

.github/workflows/codeql.yml

@@ -67,7 +67,7 @@ jobs:
         name: Update Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.7
+          go-version: '1.21'
       -
         name: Initialize CodeQL
         uses: github/codeql-action/init@v3

cli/command/telemetry_docker.go

@@ -180,7 +180,7 @@ func toWslPath(s string) string {
 	if !ok {
 		return ""
 	}
-	return fmt.Sprintf("mnt/%s%s", strings.ToLower(drive), p)
+	return fmt.Sprintf("mnt/%s%s", drive, p)
 }
 
 func parseUNCPath(s string) (drive, p string, ok bool) {

cli/command/telemetry_docker_test.go

@@ -1,7 +1,6 @@
 package command
 
 import (
-	"io/fs"
 	"net/url"
 	"testing"
 	"testing/fstest"
@@ -10,48 +9,21 @@ import (
 )
 
 func TestWslSocketPath(t *testing.T) {
-	testCases := []struct {
+	u, err := url.Parse("unix:////./c:/my/file/path")
-		doc      string
-		fs       fs.FS
-		url      string
-		expected string
-	}{
-		{
-			doc: "filesystem where WSL path does not exist",
-			fs: fstest.MapFS{
-				"my/file/path": {},
-			},
-			url:      "unix:////./c:/my/file/path",
-			expected: "",
-		},
-		{
-			doc: "filesystem where WSL path exists",
-			fs: fstest.MapFS{
-				"mnt/c/my/file/path": {},
-			},
-			url:      "unix:////./c:/my/file/path",
-			expected: "/mnt/c/my/file/path",
-		},
-		{
-			doc: "filesystem where WSL path exists uppercase URL",
-			fs: fstest.MapFS{
-				"mnt/c/my/file/path": {},
-			},
-			url:      "unix:////./C:/my/file/path",
-			expected: "/mnt/c/my/file/path",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.doc, func(t *testing.T) {
-			u, err := url.Parse(tc.url)
 	assert.NilError(t, err)
+
 	// Ensure host is empty.
 	assert.Equal(t, u.Host, "")
 
-			result := wslSocketPath(u.Path, tc.fs)
+	// Use a filesystem where the WSL path exists.
-
+	fs := fstest.MapFS{
-			assert.Equal(t, result, tc.expected)
+		"mnt/c/my/file/path": {},
-		})
 	}
+	assert.Equal(t, wslSocketPath(u.Path, fs), "/mnt/c/my/file/path")
+
+	// Use a filesystem where the WSL path doesn't exist.
+	fs = fstest.MapFS{
+		"my/file/path": {},
+	}
+	assert.Equal(t, wslSocketPath(u.Path, fs), "")
 }

cli/command/telemetry_utils.go

@@ -9,7 +9,6 @@ import (
 	"github.com/docker/cli/cli/version"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 )
@@ -95,9 +94,7 @@ func startCobraCommandTimer(mp metric.MeterProvider, attrs []attribute.KeyValue)
 			metric.WithAttributes(cmdStatusAttrs...),
 		)
 		if mp, ok := mp.(MeterProvider); ok {
-			if err := mp.ForceFlush(ctx); err != nil {
+			mp.ForceFlush(ctx)
-				otel.Handle(err)
-			}
 		}
 	}
 }

cmd/docker/docker.go

@@ -358,9 +358,7 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {
 
 	mp := dockerCli.MeterProvider()
 	if mp, ok := mp.(command.MeterProvider); ok {
-		if err := mp.Shutdown(ctx); err != nil {
+		defer mp.Shutdown(ctx)
-			otel.Handle(err)
-		}
 	} else {
 		fmt.Fprint(dockerCli.Err(), "Warning: Unexpected OTEL error, metrics may not be flushed")
 	}