Skip to content

Commit

Permalink
add linux compatibility for diagnose port-conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed May 15, 2024
1 parent ae0274b commit ec72950
Show file tree
Hide file tree
Showing 7 changed files with 655 additions and 34 deletions.
2 changes: 1 addition & 1 deletion pkg/diagnose/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ func getSuites(diagCfg diagnosis.Config, deps SuitesDeps) []diagnosis.Suite {
catalog.Register("connectivity-datadog-autodiscovery", connectivity.DiagnoseMetadataAutodiscoveryConnectivity)
catalog.Register("connectivity-datadog-event-platform", eventplatformimpl.Diagnose)
// port-conflict suite available in darwin only for now
if runtime.GOOS == "darwin" {
if runtime.GOOS == "darwin" || runtime.GOOS == "linux" {
catalog.Register("port-conflict", func() []diagnosis.Diagnosis { return ports.DiagnosePortSuite() })
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/util/port/portlist/netstat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// This product includes software developed at Datadog (https://www.datadoghq.com/).
// Copyright 2014-present Datadog, Inc.

//go:build darwin && !ios
// +build darwin,!ios
//go:build darwin
// +build darwin

package portlist

Expand Down
Loading

0 comments on commit ec72950

Please sign in to comment.