@@ -28,6 +28,7 @@ import (

 	buildkit "github.com/docker/docker/daemon/internal/builder-next"

 	"github.com/docker/docker/daemon/internal/builder-next/exporter"

 	"github.com/docker/docker/daemon/internal/libcontainerd/supervisor"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/listeners"

 	dopts "github.com/docker/docker/daemon/pkg/opts"

 	"github.com/docker/docker/daemon/pkg/plugin"

@@ -48,7 +49,6 @@ import (

 	systemrouter "github.com/docker/docker/daemon/server/router/system"

 	"github.com/docker/docker/daemon/server/router/volume"

 	"github.com/docker/docker/dockerversion"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/pkg/authorization"

 	"github.com/docker/docker/pkg/homedir"

 	"github.com/docker/docker/pkg/pidfile"

@@ -20,8 +20,8 @@ import (

 	"github.com/docker/docker/daemon/internal/image"

 	"github.com/docker/docker/daemon/internal/metrics"

 	"github.com/docker/docker/daemon/internal/multierror"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/runconfig"

 	"github.com/moby/moby/api/types/backend"

 	containertypes "github.com/moby/moby/api/types/container"

@@ -27,6 +27,7 @@ import (

 	"github.com/docker/docker/daemon/container"

 	"github.com/docker/docker/daemon/initlayer"

 	"github.com/docker/docker/daemon/internal/libcontainerd/remote"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/internal/usergroup"

 	"github.com/docker/docker/daemon/libnetwork"

 	nwconfig "github.com/docker/docker/daemon/libnetwork/config"

@@ -38,7 +39,6 @@ import (

 	"github.com/docker/docker/daemon/pkg/opts"

 	volumemounts "github.com/docker/docker/daemon/volume/mounts"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/pkg/sysinfo"

 	"github.com/docker/docker/runconfig"

 	"github.com/moby/moby/api/types/blkiodev"

new file mode 100644

@@ -0,0 +1,43 @@

+package otelutil

+

+import (

+	"context"

+

+	"github.com/containerd/log"

+	"go.opentelemetry.io/otel/baggage"

+)

+

+// TriggerKey is the key used for the 'trigger' member in the baggage. It is

+// used to know what triggered a code path (e.g. API call, libnet init, etc...)

+const TriggerKey = "trigger"

+

+// MustNewBaggage creates an OTel Baggage containing the provided members. It

+// panics if the baggage cannot be created.

+//

+// DO NOT USE this function with dynamic values.

+func MustNewBaggage(members ...baggage.Member) baggage.Baggage {

+	b, err := baggage.New(members...)

+	if err != nil {

+		log.G(context.Background()).WithFields(log.Fields{

+			"error":   err,

+			"members": members,

+		}).Fatal("OTel baggage creation failure")

+	}

+	return b

+}

+

+// MustNewMemberRaw creates an OTel Baggage member with the provided key and

+// value. It panics if the key or value aren't valid UTF-8 strings.

+//

+// DO NOT USE this function with dynamic key/value.

+func MustNewMemberRaw(key, value string) baggage.Member {

+	m, err := baggage.NewMemberRaw(key, value)

+	if err != nil {

+		log.G(context.Background()).WithFields(log.Fields{

+			"error": err,

+			"key":   key,

+			"value": value,

+		}).Fatal("OTel baggage member creation failure")

+	}

+	return m

+}

new file mode 100644

@@ -0,0 +1,71 @@

+package otelutil

+

+import (

+	"os"

+)

+

+const (

+	traceParentKey = "traceparent"

+	traceStateKey  = "tracestate"

+

+	// See https://github.com/open-telemetry/opentelemetry-specification/issues/740

+	// and https://github.com/open-telemetry/oteps/pull/258.

+	traceParentEnvVar = "TRACEPARENT"

+	traceStateEnvVar  = "TRACESTATE"

+)

+

+type EnvironCarrier struct {

+	TraceParent, TraceState string

+}

+

+// Get returns the value associated with the passed key.

+func (c *EnvironCarrier) Get(key string) string {

+	switch key {

+	case traceParentKey:

+		return c.TraceParent

+	case traceStateKey:

+		return c.TraceState

+	}

+	return ""

+}

+

+// Set stores the key-value pair.

+func (c *EnvironCarrier) Set(key, value string) {

+	switch key {

+	case traceParentKey:

+		c.TraceParent = value

+	case traceStateKey:

+		c.TraceState = value

+	}

+	// Other keys are not supported at this time.

+}

+

+// Keys lists the keys stored in this carrier.

+func (c *EnvironCarrier) Keys() []string {

+	var k []string

+	if c.TraceParent != "" {

+		k = append(k, traceParentKey)

+	}

+	if c.TraceState != "" {

+		k = append(k, traceStateKey)

+	}

+	return k

+}

+

+func (c *EnvironCarrier) Environ() []string {

+	var env []string

+	if c.TraceParent != "" {

+		env = append(env, traceParentEnvVar+"="+c.TraceParent)

+	}

+	if c.TraceState != "" {

+		env = append(env, traceStateEnvVar+"="+c.TraceState)

+	}

+	return env

+}

+

+func PropagateFromEnvironment() *EnvironCarrier {

+	return &EnvironCarrier{

+		TraceParent: os.Getenv(traceParentEnvVar),

+		TraceState:  os.Getenv(traceStateEnvVar),

+	}

+}

new file mode 100644

@@ -0,0 +1,39 @@

+package otelutil

+

+import (

+	"context"

+

+	"github.com/containerd/log"

+	"github.com/moby/buildkit/util/tracing/detect"

+	"go.opentelemetry.io/contrib/processors/baggagecopy"

+	"go.opentelemetry.io/otel/baggage"

+	"go.opentelemetry.io/otel/sdk/resource"

+	sdktrace "go.opentelemetry.io/otel/sdk/trace"

+	"go.opentelemetry.io/otel/trace"

+	"go.opentelemetry.io/otel/trace/noop"

+)

+

+func NewTracerProvider(ctx context.Context, allowNoop bool) (trace.TracerProvider, func(context.Context) error) {

+	noopShutdown := func(ctx context.Context) error { return nil }

+

+	exp, err := detect.NewSpanExporter(ctx)

+	if err != nil {

+		log.G(ctx).WithError(err).Warn("Failed to initialize tracing, skipping")

+		if allowNoop {

+			return noop.NewTracerProvider(), noopShutdown

+		}

+	}

+

+	if allowNoop && detect.IsNoneSpanExporter(exp) {

+		log.G(ctx).Info("OTEL tracing is not configured, using no-op tracer provider")

+		return noop.NewTracerProvider(), noopShutdown

+	}

+

+	tp := sdktrace.NewTracerProvider(

+		sdktrace.WithResource(resource.Default()),

+		sdktrace.WithSyncer(detect.Recorder),

+		sdktrace.WithBatcher(exp),

+		sdktrace.WithSpanProcessor(baggagecopy.NewSpanProcessor(func(member baggage.Member) bool { return true })),

+	)

+	return tp, tp.Shutdown

+}

new file mode 100644

@@ -0,0 +1,17 @@

+package otelutil

+

+import (

+	"go.opentelemetry.io/otel/codes"

+	"go.opentelemetry.io/otel/trace"

+)

+

+// RecordStatus records the status of a span based on the error provided.

+//

+// If err is nil, the span status is unmodified. If err is not nil, the span

+// takes status Error, and the error message is recorded.

+func RecordStatus(span trace.Span, err error) {

+	if err != nil {

+		span.RecordError(err)

+		span.SetStatus(codes.Error, err.Error())

+	}

+}

@@ -54,6 +54,7 @@ import (

 	"time"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/libnetwork/cluster"

 	"github.com/docker/docker/daemon/libnetwork/config"

 	"github.com/docker/docker/daemon/libnetwork/datastore"

@@ -68,7 +69,6 @@ import (

 	"github.com/docker/docker/daemon/libnetwork/osl"

 	"github.com/docker/docker/daemon/libnetwork/scope"

 	"github.com/docker/docker/daemon/libnetwork/types"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/pkg/plugingetter"

 	"github.com/docker/docker/pkg/plugins"

 	"github.com/docker/docker/pkg/stringid"

@@ -5,8 +5,8 @@ import (

 	"fmt"

 	"strconv"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"

-	"github.com/docker/docker/internal/otelutil"

 	"go.opentelemetry.io/otel/baggage"

 )

@@ -16,6 +16,7 @@ import (

 	"syscall"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/libnetwork/datastore"

 	"github.com/docker/docker/daemon/libnetwork/driverapi"

 	"github.com/docker/docker/daemon/libnetwork/drivers/bridge/internal/firewaller"

@@ -34,7 +35,6 @@ import (

 	"github.com/docker/docker/daemon/libnetwork/scope"

 	"github.com/docker/docker/daemon/libnetwork/types"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/internal/sliceutil"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/pkg/errors"

@@ -11,11 +11,11 @@ import (

 	"strings"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/libnetwork/datastore"

 	"github.com/docker/docker/daemon/libnetwork/drivers/bridge/internal/firewaller"

 	"github.com/docker/docker/daemon/libnetwork/portmapperapi"

 	"github.com/docker/docker/daemon/libnetwork/types"

-	"github.com/docker/docker/internal/otelutil"

 	"go.opentelemetry.io/otel"

 	"go.opentelemetry.io/otel/attribute"

 	"go.opentelemetry.io/otel/baggage"

@@ -5,7 +5,7 @@ package bridge

 import (

 	"context"

-	"github.com/docker/docker/internal/otelutil"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"go.opentelemetry.io/otel"

 )

@@ -13,8 +13,8 @@ import (

 	"path/filepath"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/libnetwork/types"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/moby/sys/reexec"

 	"github.com/opencontainers/runtime-spec/specs-go"

@@ -14,6 +14,7 @@ import (

 	clustertypes "github.com/docker/docker/daemon/cluster/provider"

 	"github.com/docker/docker/daemon/config"

 	"github.com/docker/docker/daemon/container"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/libnetwork"

 	lncluster "github.com/docker/docker/daemon/libnetwork/cluster"

 	"github.com/docker/docker/daemon/libnetwork/driverapi"

@@ -25,7 +26,6 @@ import (

 	"github.com/docker/docker/daemon/network"

 	"github.com/docker/docker/daemon/pkg/opts"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/docker/docker/pkg/plugingetter"

 	"github.com/docker/go-connections/nat"

 	"github.com/moby/moby/api/types/backend"

@@ -11,8 +11,8 @@ import (

 	"github.com/containerd/containerd/v2/defaults"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/server/router"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/moby/buildkit/util/grpcerrors"

 	"github.com/moby/buildkit/util/stack"

 	"github.com/moby/buildkit/util/tracing"

@@ -5,12 +5,12 @@ import (

 	"net/http"

 	"github.com/containerd/log"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/daemon/server/httpstatus"

 	"github.com/docker/docker/daemon/server/httputils"

 	"github.com/docker/docker/daemon/server/middleware"

 	"github.com/docker/docker/daemon/server/router"

 	"github.com/docker/docker/dockerversion"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/gorilla/mux"

 	"github.com/moby/moby/api/types"

 	"github.com/moby/moby/api/types/versions"

@@ -11,8 +11,8 @@ import (

 	mobyc8dstore "github.com/docker/docker/daemon/containerd"

 	"github.com/docker/docker/daemon/internal/libcontainerd"

 	"github.com/docker/docker/daemon/internal/metrics"

+	"github.com/docker/docker/daemon/internal/otelutil"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/internal/otelutil"

 	"github.com/moby/moby/api/types/backend"

 	"github.com/moby/moby/api/types/events"

 	"github.com/pkg/errors"

deleted file mode 100644

@@ -1,43 +0,0 @@

-package otelutil

-

-import (

-	"context"

-

-	"github.com/containerd/log"

-	"go.opentelemetry.io/otel/baggage"

-)

-

-// TriggerKey is the key used for the 'trigger' member in the baggage. It is

-// used to know what triggered a code path (e.g. API call, libnet init, etc...)

-const TriggerKey = "trigger"

-

-// MustNewBaggage creates an OTel Baggage containing the provided members. It

-// panics if the baggage cannot be created.

-//

-// DO NOT USE this function with dynamic values.

-func MustNewBaggage(members ...baggage.Member) baggage.Baggage {

-	b, err := baggage.New(members...)

-	if err != nil {

-		log.G(context.Background()).WithFields(log.Fields{

-			"error":   err,

-			"members": members,

-		}).Fatal("OTel baggage creation failure")

-	}

-	return b

-}

-

-// MustNewMemberRaw creates an OTel Baggage member with the provided key and

-// value. It panics if the key or value aren't valid UTF-8 strings.

-//

-// DO NOT USE this function with dynamic key/value.

-func MustNewMemberRaw(key, value string) baggage.Member {

-	m, err := baggage.NewMemberRaw(key, value)

-	if err != nil {

-		log.G(context.Background()).WithFields(log.Fields{

-			"error": err,

-			"key":   key,

-			"value": value,

-		}).Fatal("OTel baggage member creation failure")

-	}

-	return m

-}

deleted file mode 100644

@@ -1,71 +0,0 @@

-package otelutil

-

-import (

-	"os"

-)

-

-const (

-	traceParentKey = "traceparent"

-	traceStateKey  = "tracestate"

-

-	// See https://github.com/open-telemetry/opentelemetry-specification/issues/740

-	// and https://github.com/open-telemetry/oteps/pull/258.

-	traceParentEnvVar = "TRACEPARENT"

-	traceStateEnvVar  = "TRACESTATE"

-)

-

-type EnvironCarrier struct {

-	TraceParent, TraceState string

-}

-

-// Get returns the value associated with the passed key.

-func (c *EnvironCarrier) Get(key string) string {

-	switch key {

-	case traceParentKey:

-		return c.TraceParent

-	case traceStateKey:

-		return c.TraceState

-	}

-	return ""

-}

-

-// Set stores the key-value pair.

-func (c *EnvironCarrier) Set(key, value string) {

-	switch key {

-	case traceParentKey:

-		c.TraceParent = value

-	case traceStateKey:

-		c.TraceState = value

-	}

-	// Other keys are not supported at this time.

-}

-

-// Keys lists the keys stored in this carrier.

-func (c *EnvironCarrier) Keys() []string {

-	var k []string

-	if c.TraceParent != "" {

-		k = append(k, traceParentKey)

-	}

-	if c.TraceState != "" {

-		k = append(k, traceStateKey)

-	}

-	return k

-}

-

-func (c *EnvironCarrier) Environ() []string {

-	var env []string

-	if c.TraceParent != "" {

-		env = append(env, traceParentEnvVar+"="+c.TraceParent)

-	}

-	if c.TraceState != "" {

-		env = append(env, traceStateEnvVar+"="+c.TraceState)

-	}

-	return env

-}

-

-func PropagateFromEnvironment() *EnvironCarrier {

-	return &EnvironCarrier{

-		TraceParent: os.Getenv(traceParentEnvVar),

-		TraceState:  os.Getenv(traceStateEnvVar),

-	}

-}

deleted file mode 100644

@@ -1,39 +0,0 @@

-package otelutil

-

-import (

-	"context"

-

-	"github.com/containerd/log"

-	"github.com/moby/buildkit/util/tracing/detect"

-	"go.opentelemetry.io/contrib/processors/baggagecopy"

-	"go.opentelemetry.io/otel/baggage"

-	"go.opentelemetry.io/otel/sdk/resource"

-	sdktrace "go.opentelemetry.io/otel/sdk/trace"

-	"go.opentelemetry.io/otel/trace"

-	"go.opentelemetry.io/otel/trace/noop"

-)

-

-func NewTracerProvider(ctx context.Context, allowNoop bool) (trace.TracerProvider, func(context.Context) error) {

-	noopShutdown := func(ctx context.Context) error { return nil }

-

-	exp, err := detect.NewSpanExporter(ctx)

-	if err != nil {

-		log.G(ctx).WithError(err).Warn("Failed to initialize tracing, skipping")

-		if allowNoop {

-			return noop.NewTracerProvider(), noopShutdown

-		}

-	}

-

-	if allowNoop && detect.IsNoneSpanExporter(exp) {

-		log.G(ctx).Info("OTEL tracing is not configured, using no-op tracer provider")

-		return noop.NewTracerProvider(), noopShutdown

-	}

-

-	tp := sdktrace.NewTracerProvider(

-		sdktrace.WithResource(resource.Default()),

-		sdktrace.WithSyncer(detect.Recorder),

-		sdktrace.WithBatcher(exp),

-		sdktrace.WithSpanProcessor(baggagecopy.NewSpanProcessor(func(member baggage.Member) bool { return true })),

-	)

-	return tp, tp.Shutdown

-}

deleted file mode 100644

@@ -1,17 +0,0 @@

-package otelutil

-

-import (

-	"go.opentelemetry.io/otel/codes"

-	"go.opentelemetry.io/otel/trace"

-)

-

-// RecordStatus records the status of a span based on the error provided.

-//

-// If err is nil, the span status is unmodified. If err is not nil, the span

-// takes status Error, and the error message is recorded.

-func RecordStatus(span trace.Span, err error) {

-	if err != nil {

-		span.RecordError(err)

-		span.SetStatus(codes.Error, err.Error())

-	}

-}