Merge branch 'main' into feature/elasticsearch_otel_model

.github/auto_assign.yml

@@ -15,6 +15,7 @@ assigneeGroups:
     - bryan-aguilar
     - crobert-1
     - dashpole
+    - mwear
     - songy23
     - fatsheep9146
     # Maintainers

CONTRIBUTING.md

@@ -253,6 +253,7 @@ to be included in the distributed otelcol-contrib binaries and docker images.
 
 The following GitHub users are the currently available sponsors, either by being an approver or a maintainer of the contrib repository. The list is ordered based on a random sort of the list of sponsors done live at the Collector SIG meeting on 27-Apr-2022 and serves as the seed for the round-robin selection of sponsors, as described in the section above.
 
+* [@mwear](https://github.com/mwear)
 * [@djaglowski](https://github.com/djaglowski)
 * [@codeboten](https://github.com/codeboten)
 * [@mx-psi](https://github.com/mx-psi)

README.md

@@ -71,7 +71,6 @@ Triagers ([@open-telemetry/collector-contrib-triagers](https://github.com/orgs/o
 
 - [Benedikt Bongartz](https://github.com/frzifus), Red Hat
 - [Jared Tan](https://github.com/JaredTan95), DaoCloud
-- [Matt Wear](https://github.com/mwear), Lightstep
 - [Murphy Chen](https://github.com/Frapschen), DaoCloud
 - Actively seeking contributors to triage issues
 
@@ -89,6 +88,7 @@ Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs
 - [Bryan Aguilar](https://github.com/bryan-aguilar), AWS
 - [Curtis Robert](https://github.com/crobert-1), Splunk
 - [David Ashpole](https://github.com/dashpole), Google
+- [Matt Wear](https://github.com/mwear), Lightstep
 - [Yang Song](https://github.com/songy23), DataDog
 - [Ziqi Zhao](https://github.com/fatsheep9146), Alibaba
 

exporter/datadogexporter/config.go

@@ -10,6 +10,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/DataDog/datadog-agent/pkg/util/hostname/validate"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/confignet"
@@ -18,8 +19,6 @@ import (
 	"go.opentelemetry.io/collector/confmap"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
 	"go.uber.org/zap"
-
-	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter/internal/hostmetadata/valid"
 )
 
 var (
@@ -469,7 +468,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)
 	}
 

exporter/datadogexporter/config_test.go

@@ -41,7 +41,7 @@ func TestValidate(t *testing.T) {
 				API:        APIConfig{Key: "notnull"},
 				TagsConfig: TagsConfig{Hostname: "invalid_host"},
 			},
-			err: "hostname field is invalid: 'invalid_host' is not RFC1123 compliant",
+			err: "hostname field is invalid: invalid_host is not RFC1123 compliant",
 		},
 		{
 			name: "no metadata",

exporter/datadogexporter/go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.1
+	github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.1 // indirect
@@ -23,6 +24,7 @@ require (
 	github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.1 // indirect
 	github.com/DataDog/datadog-agent/pkg/trace v0.56.0-rc.1.0.20240711082232-dc70454ece9f
+	github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.1
 	github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.1 // indirect
 	github.com/DataDog/datadog-api-client-go/v2 v2.27.0
 	github.com/DataDog/datadog-go/v5 v5.5.0
@@ -86,8 +88,6 @@ 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 (
 	cloud.google.com/go/auth v0.5.1 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
@@ -123,7 +123,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

exporter/datadogexporter/internal/hostmetadata/internal/system/host.go

@@ -9,10 +9,9 @@ import (
 	"os"
 	"sync"
 
+	"github.com/DataDog/datadog-agent/pkg/util/hostname/validate"
 	"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"
 )
 
 type HostInfo struct {
@@ -44,7 +43,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
 	}

exporter/datadogexporter/internal/hostmetadata/internal/system/package_test.go

@@ -10,5 +10,9 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m)
+	// We have to ignore seelog because of upstream issue
+	// https://github.com/cihub/seelog/issues/182
+	goleak.VerifyTestMain(m,
+		goleak.IgnoreAnyFunction("github.com/cihub/seelog.(*asyncLoopLogger).processQueue"),
+	)
 }