feat: upgrade dependencies and migrate deprecated APIs to new ones by kezhenxu94 · Pull Request #139 · apache/skywalking-infra-e2e

kezhenxu94 · 2026-02-14T05:05:43Z

Summary

Upgrade testcontainers-go from v0.11.1 to v0.40.0
Upgrade docker/docker from v20.10.7 to v28.5.2
Upgrade k8s.io/* packages from v0.22.2 to v0.35.1
Upgrade sigs.k8s.io/kind from v0.27.0 to v0.31.0
Migrate deprecated LocalDockerCompose API to new ComposeStack API
Replace deprecated Docker types.* with new container.*, network.*, events.*, image.* packages
Update RESTMapper.NewShortcutExpander to use warning callback

Test plan

go build ./... passes
go test ./... passes

- Upgrade testcontainers-go from v0.11.1 to v0.40.0 - Upgrade docker/docker from v20.10.7 to v28.5.2 - Upgrade k8s.io/* packages from v0.22.2 to v0.35.1 - Upgrade sigs.k8s.io/kind from v0.27.0 to v0.31.0 - Migrate deprecated LocalDockerCompose API to new ComposeStack API - Replace deprecated types.EventsOptions with events.ListOptions - Replace deprecated types.Container* types with container.* types - Replace deprecated types.Network* types with network.* types - Update RESTMapper.NewShortcutExpander to use warning callback - Add parseComposeFile() to parse compose files directly with yaml.v3 - Add loadEnvFromFile() to load environment variables from files

Copilot

Pull request overview

This PR upgrades several core dependencies (testcontainers-go, docker client, Kubernetes libs, kind) and migrates the codebase off deprecated APIs, especially around docker-compose orchestration and Docker SDK type packages.

Changes:

Migrates deprecated Testcontainers LocalDockerCompose usage to the modules/compose stack API.
Updates Docker SDK usages from deprecated types.* to newer container.*, network.*, events.*, and image.* packages.
Updates Kubernetes RESTMapper shortcut expander usage to the newer callback-enabled API.

Reviewed changes

Copilot reviewed 13 out of 14 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
internal/util/k8s.go	Updates RESTMapper shortcut expander to new signature with warning callback.
internal/components/setup/kind.go	Migrates Docker image list/pull to `types/image` option types.
internal/components/setup/compose_provider.go	Updates Docker container/network types and expands `wait.StrategyTarget` implementation surface.
internal/components/setup/compose_listener.go	Updates Docker events options/types and adjusts event message ID access.
internal/components/setup/compose.go	Reworks compose startup to use `compose` module stacks and adds compose/env parsing helpers.
internal/components/cleanup/compose.go	Migrates compose cleanup to `compose` module stack teardown.
go.mod	Upgrades module dependencies and adds `replace` directives for Docker archive compatibility.

Comments suppressed due to low confidence (1)

internal/components/setup/compose_provider.go:185

inspectContainer duplicates the same ContainerInspect call added in Inspect. To reduce duplication and keep behavior consistent, consider implementing inspectContainer by calling Inspect (or remove one of them if only one is needed).

func (c *DockerContainer) inspectContainer(ctx context.Context) (*container.InspectResponse, error) {
	inspect, err := c.provider.client.ContainerInspect(ctx, c.ID)
	if err != nil {
		return nil, err
	}

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-14T05:16:20Z

internal/components/setup/compose_listener.go

 func (c *ComposeContainerListener) Listen(consumer func(container *ComposeContainer)) error {
-	containerEvents, errors := c.client.Events(c.ctx, types.EventsOptions{
+	containerEvents, errors := c.client.Events(c.ctx, events.ListOptions{
 		Filters: filters.NewArgs(
 			filters.Arg("type", "container"),
 			filters.Arg("event", "start"),


client.Events returns channels; downstream handling should not rely on len(errCh) to detect failures and should also handle channel closure (ok checks) to avoid spinning on closed channels. Consider restructuring Listen to propagate the first error deterministically (e.g., via select on errCh) and exit the goroutine when channels close.

Copilot · 2026-02-14T05:16:20Z

internal/components/setup/compose.go

@@ -68,27 +69,43 @@ func ComposeSetup(e2eConfig *config.E2EConfig) error {
 		return err
 	}


The Docker client created here is never closed. The Docker SDK client holds underlying HTTP connections; please defer cli.Close() after successful creation (similar to pullImages in kind.go) to avoid leaking resources in long-running processes/tests.

Suggested change

}

}

defer cli.Close()

Copilot · 2026-02-14T05:16:20Z

internal/components/setup/compose.go

+		envVars, err := loadEnvFromFile(profilePath)
+		if err != nil {
+			return fmt.Errorf("load env file error: %v", err)
+		}


Same as above: this returns a propagated error but uses %v instead of %w, which prevents callers from unwrapping the underlying error.

Copilot · 2026-02-14T05:16:21Z

go.mod

+// Compatibility fix for docker/cli which imports github.com/docker/docker/pkg/archive
+// but the package has been moved to github.com/moby/go-archive
+replace github.com/moby/go-archive => github.com/moby/go-archive v0.1.0
+
+replace github.com/docker/docker/pkg/archive => github.com/moby/go-archive v0.1.0


This self-replace (replace X => X v...) is effectively a version pin but is non-idiomatic and easy to misread as a no-op. Prefer adding an explicit require github.com/moby/go-archive v0.1.0 (or letting go mod tidy select) and keep replace only for the actual path substitution that’s needed.

Copilot · 2026-02-14T05:16:21Z

internal/components/setup/compose.go

 	// Listen container create
 	listener := NewComposeContainerListener(context.Background(), cli, services)


The callback passed to listener.Listen (below) mutates the outer err variable from another goroutine, which is a data race and can overwrite the function’s control-flow error value. Use a local variable inside the callback to handle/log errors without assigning to the outer err.

Copilot · 2026-02-14T05:16:21Z

internal/components/setup/compose.go

+	composeServices, err := parseComposeFile(composeConfigPath)
+	if err != nil {
+		return fmt.Errorf("parse compose file error: %v", err)
+	}


These errors are formatted with %v, which loses wrapping semantics and makes errors.Is/As harder upstream. Prefer %w when returning an error you’re propagating (as done elsewhere in this file for other failures).

Copilot · 2026-02-14T05:16:21Z

internal/components/setup/compose_provider.go

+	}
+
+	// No networks found
+	return "", nil


When no networks are found, this returns an empty IP with a nil error. That can lead to confusing downstream failures (treating "" as a valid IP). Prefer returning a non-nil error when the container has no network/IP information available.

Suggested change

return "", nil

return "", fmt.Errorf("container has no network/IP information available")

Copilot · 2026-02-14T05:16:21Z

internal/components/setup/compose_provider.go

+func (c *DockerContainer) Exec(ctx context.Context, cmd []string, options ...exec.ProcessOption) (int, io.Reader, error) {
 	cli := c.provider.client
-	response, err := cli.ContainerExecCreate(ctx, c.ID, types.ExecConfig{
-		Cmd:    cmd,
-		Detach: false,
+	response, err := cli.ContainerExecCreate(ctx, c.ID, container.ExecOptions{
+		Cmd:          cmd,
+		Detach:       false,


Exec accepts options ...exec.ProcessOption and returns an io.Reader, but the implementation currently ignores all options and never attaches to capture stdout/stderr (it later returns a dummy reader). This can break callers/strategies that rely on ProcessOption behavior or output content. Consider applying options to the exec configuration and using ContainerExecAttach (or otherwise documenting/removing the output return).

Copilot AI review requested due to automatic review settings February 14, 2026 05:05

Copilot started reviewing on behalf of kezhenxu94 February 14, 2026 05:06 View session

kezhenxu94 marked this pull request as draft February 14, 2026 05:06

kezhenxu94 added 2 commits February 14, 2026 13:11

go version

4993e42

bump golint

a03eb27

Copilot AI reviewed Feb 14, 2026

View reviewed changes

kezhenxu94 added 5 commits February 14, 2026 13:31

cgo enabled

c67b38c

cgo

84eec21

build

213d4c4

build one platform

761d101

add an aggregation step

f68a34a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: upgrade dependencies and migrate deprecated APIs to new ones#139

feat: upgrade dependencies and migrate deprecated APIs to new ones#139
kezhenxu94 wants to merge 8 commits intomainfrom
upgrade-deps-and-migrate-deprecated-apis

kezhenxu94 commented Feb 14, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Copilot AI Feb 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Comments

		@@ -68,27 +69,43 @@ func ComposeSetup(e2eConfig *config.E2EConfig) error {
		return err
		}

		// Listen container create
		listener := NewComposeContainerListener(context.Background(), cli, services)

	return "", nil
	return "", fmt.Errorf("container has no network/IP information available")

Conversation

kezhenxu94 commented Feb 14, 2026

Summary

Test plan

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Comments