diff --git a/daemon/command/daemon.go b/daemon/command/daemon.go index 9782dd0b6b..086b11e9ea 100644 --- a/daemon/command/daemon.go +++ b/daemon/command/daemon.go @@ -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" diff --git a/daemon/create.go b/daemon/create.go index 2d3ccbd422..ae1bc44e67 100644 --- a/daemon/create.go +++ b/daemon/create.go @@ -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" diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 0b010c1936..a0cc3a9b7e 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -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" diff --git a/internal/otelutil/baggage.go b/daemon/internal/otelutil/baggage.go similarity index 100% rename from internal/otelutil/baggage.go rename to daemon/internal/otelutil/baggage.go diff --git a/internal/otelutil/environ_carrier.go b/daemon/internal/otelutil/environ_carrier.go similarity index 100% rename from internal/otelutil/environ_carrier.go rename to daemon/internal/otelutil/environ_carrier.go diff --git a/internal/otelutil/provider.go b/daemon/internal/otelutil/provider.go similarity index 100% rename from internal/otelutil/provider.go rename to daemon/internal/otelutil/provider.go diff --git a/internal/otelutil/status.go b/daemon/internal/otelutil/status.go similarity index 100% rename from internal/otelutil/status.go rename to daemon/internal/otelutil/status.go diff --git a/daemon/libnetwork/controller.go b/daemon/libnetwork/controller.go index 4dccbbd190..f1e2d208eb 100644 --- a/daemon/libnetwork/controller.go +++ b/daemon/libnetwork/controller.go @@ -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" diff --git a/daemon/libnetwork/default_gateway_linux.go b/daemon/libnetwork/default_gateway_linux.go index 9fedf710cd..da9fad42a2 100644 --- a/daemon/libnetwork/default_gateway_linux.go +++ b/daemon/libnetwork/default_gateway_linux.go @@ -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" ) diff --git a/daemon/libnetwork/drivers/bridge/bridge_linux.go b/daemon/libnetwork/drivers/bridge/bridge_linux.go index 71da3ddf5e..9ffb146f49 100644 --- a/daemon/libnetwork/drivers/bridge/bridge_linux.go +++ b/daemon/libnetwork/drivers/bridge/bridge_linux.go @@ -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" diff --git a/daemon/libnetwork/drivers/bridge/bridge_store.go b/daemon/libnetwork/drivers/bridge/bridge_store.go index cfa07e26dd..07d087f00e 100644 --- a/daemon/libnetwork/drivers/bridge/bridge_store.go +++ b/daemon/libnetwork/drivers/bridge/bridge_store.go @@ -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" diff --git a/daemon/libnetwork/drivers/bridge/setup.go b/daemon/libnetwork/drivers/bridge/setup.go index 56d688938e..54c363423b 100644 --- a/daemon/libnetwork/drivers/bridge/setup.go +++ b/daemon/libnetwork/drivers/bridge/setup.go @@ -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" ) diff --git a/daemon/libnetwork/sandbox_externalkey_unix.go b/daemon/libnetwork/sandbox_externalkey_unix.go index 13edbeb9ba..25fbdc5d98 100644 --- a/daemon/libnetwork/sandbox_externalkey_unix.go +++ b/daemon/libnetwork/sandbox_externalkey_unix.go @@ -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" diff --git a/daemon/network.go b/daemon/network.go index f655298c28..a72ce3613e 100644 --- a/daemon/network.go +++ b/daemon/network.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" diff --git a/daemon/server/router/grpc/grpc.go b/daemon/server/router/grpc/grpc.go index bacd776dca..cbcd988156 100644 --- a/daemon/server/router/grpc/grpc.go +++ b/daemon/server/router/grpc/grpc.go @@ -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" diff --git a/daemon/server/server.go b/daemon/server/server.go index cab4ddbe78..4eac07f0f7 100644 --- a/daemon/server/server.go +++ b/daemon/server/server.go @@ -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" diff --git a/daemon/start.go b/daemon/start.go index 01963715f1..6a551165f9 100644 --- a/daemon/start.go +++ b/daemon/start.go @@ -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"