Skip to content
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

[exporter/Datadogexporter] Use Agent modules for validating hostname #34030

Merged
merged 8 commits into from
Jul 12, 2024
Merged

[exporter/Datadogexporter] Use Agent modules for validating hostname #34030

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b22f8ec
Use Agent modules for validating hostname
dineshg13 Jul 11, 2024
20106a9
PR feedback + fix test
dineshg13 Jul 11, 2024
287e30c
fix tests + lint
dineshg13 Jul 11, 2024
66fc4d6
remove defer flush
dineshg13 Jul 11, 2024
24c4195
merge main
dineshg13 Jul 11, 2024
e413095
Merge branch 'main' into dinesh.gurumurthy/use-host-validate-module
dineshg13 Jul 11, 2024
ea5ba3d
Merge remote-tracking branch 'origin/main' into dinesh.gurumurthy/use…
dineshg13 Jul 12, 2024
066b5a6
add link to the issue
dineshg13 Jul 12, 2024
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
4 changes: 2 additions & 2 deletions exporter/datadogexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/hostmetadata/valid"
"github.com/DataDog/datadog-agent/pkg/util/hostname/validate"
)

var (
Expand Down Expand Up @@ -469,7 +469,7 @@ func (c *Config) Validate() error {
return errNoMetadata
}

if err := valid.Hostname(c.Hostname); c.Hostname != "" && err != nil {
if err := validate.ValidHostname(c.Hostname); c.Hostname != "" && err != nil {
return fmt.Errorf("hostname field is invalid: %w", err)
}

Expand Down
6 changes: 4 additions & 2 deletions exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,10 @@ require (
k8s.io/client-go v0.29.3
)

require github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.1
require (
github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.1
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.1
)
dineshg13 marked this conversation as resolved.
Show resolved Hide resolved

require (
cloud.google.com/go/auth v0.5.1 // indirect
Expand Down Expand Up @@ -123,7 +126,6 @@ require (
github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions exporter/datadogexporter/internal/hostmetadata/internal/system/host.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/hostmetadata/valid"
"github.com/DataDog/datadog-agent/pkg/util/hostname/validate"
)

type HostInfo struct {
Expand Down Expand Up @@ -44,7 +44,7 @@ func (hi *HostInfo) GetHostname(logger *zap.Logger) string {
if hi.FQDN == "" {
// Don't report failure since FQDN was just not available
return hi.OS
} else if err := valid.Hostname(hi.FQDN); err != nil {
} else if err := validate.ValidHostname(hi.FQDN); err != nil {
logger.Info("FQDN is not valid", zap.Error(err))
return hi.OS
}
Expand Down
14 changes: 0 additions & 14 deletions exporter/datadogexporter/internal/hostmetadata/valid/package_test.go
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions exporter/datadogexporter/internal/hostmetadata/valid/valid.go
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions exporter/datadogexporter/internal/hostmetadata/valid/valid_test.go
View file
Open in desktop

This file was deleted.

Loading