InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move internal/otelutil to daemon/internal/otelutil

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan
2025-07-24 12:14:30 -07:00
parent b62b542c2e
commit c3b0e0130a
17 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/command/daemon.go
View File

@@ -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"

2
daemon/create.go
View File

@@ -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"

2
daemon/daemon_unix.go
View File

@@ -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"

0
internal/otelutil/baggage.go → daemon/internal/otelutil/baggage.go
View File

0
internal/otelutil/environ_carrier.go → daemon/internal/otelutil/environ_carrier.go
View File

0
internal/otelutil/provider.go → daemon/internal/otelutil/provider.go
View File

0
internal/otelutil/status.go → daemon/internal/otelutil/status.go
View File

2
daemon/libnetwork/controller.go
View File

@@ -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"

2
daemon/libnetwork/default_gateway_linux.go
View File

@@ -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"
)

2
daemon/libnetwork/drivers/bridge/bridge_linux.go
View File

@@ -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"

2
daemon/libnetwork/drivers/bridge/bridge_store.go
View File

@@ -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"

2
daemon/libnetwork/drivers/bridge/setup.go
View File

@@ -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"
)

2
daemon/libnetwork/sandbox_externalkey_unix.go
View File

@@ -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"

2
daemon/network.go
View File

@@ -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"

2
daemon/server/router/grpc/grpc.go
View File

@@ -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"

2
daemon/server/server.go
View File

@@ -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"

2
daemon/start.go
View File

@@ -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"