Skip to content

[chore][testbed] Use os.MkdirTemp on Windows #42770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
songy23 merged 5 commits into from
Sep 19, 2025
Merged

[chore][testbed] Use os.MkdirTemp on Windows #42770

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec1305f
[chore][testbed] Use os.MkdirTemp on Windows
mx-psi Sep 18, 2025
00b1f06
Fix linting
mx-psi Sep 18, 2025
ee16df2
Merge branch 'main' into mx-psi/more-mkdirtemp
songy23 Sep 18, 2025
4252260
[chore] Move to internal/common/testutil and sanitize pattern like th…
mx-psi Sep 19, 2025
9c1c73e
make generate and add nolint directive
mx-psi Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion testbed/testbed/child_process_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,21 @@ func (cp *childProcessCollector) PrepareConfig(t *testing.T, configStr string) (
configCleanup = func() {
// NoOp
}

var dir string
if runtime.GOOS == "windows" {
// On Windows, use os.MkdirTemp to create directory since t.TempDir results in an error during cleanup in scoped-tests.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42639
dir, err = os.MkdirTemp("", t.Name()) //nolint:usetesting
Comment thread
mx-psi marked this conversation as resolved.
Outdated
if err != nil {
return configCleanup, fmt.Errorf("failed to create temporary directory: %w", err)
}
} else {
dir = t.TempDir()
}

var file *os.File
file, err = os.CreateTemp(t.TempDir(), "agent*.yaml")
file, err = os.CreateTemp(dir, "agent*.yaml")
if err != nil {
log.Printf("%s", err)
return configCleanup, err
Expand Down
14 changes: 13 additions & 1 deletion testbed/testbed/in_process_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,19 @@ func (ipp *inProcessCollector) PrepareConfig(t *testing.T, configStr string) (co
func (ipp *inProcessCollector) Start(StartParams) error {
var err error

confFile, err := os.CreateTemp(ipp.t.TempDir(), "conf-")
var dir string
if runtime.GOOS == "windows" {
// On Windows, use os.MkdirTemp to create directory since t.TempDir results in an error during cleanup in scoped-tests.
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/42639
dir, err = os.MkdirTemp("", ipp.t.Name())
Comment thread
mx-psi marked this conversation as resolved.
Outdated
if err != nil {
return fmt.Errorf("failed to create temporary directory: %w", err)
}
} else {
dir = ipp.t.TempDir()
}

confFile, err := os.CreateTemp(dir, "conf-")
if err != nil {
return err
}
Expand Down
Loading