[otel] extension: addressing poorly resolved conflict

DataDog · Sep 26, 2024 · e9c2531 · e9c2531
1 parent b2588a2
commit e9c2531
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/comp/otelcol/ddflareextension/impl/config.go b/comp/otelcol/ddflareextension/impl/config.go
@@ -10,7 +10,6 @@ import (
 	"errors"
 	"fmt"
 
-	apiauth "github.com/DataDog/datadog-agent/comp/api/authtoken"
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/confmap"
@@ -35,7 +34,6 @@ type Config struct {
 
 	factories              *otelcol.Factories
 	configProviderSettings otelcol.ConfigProviderSettings
-	authtoken              apiauth.Component
 }
 
 var _ component.Config = (*Config)(nil)

diff --git a/comp/otelcol/ddflareextension/impl/extension.go b/comp/otelcol/ddflareextension/impl/extension.go
@@ -32,7 +32,7 @@ type ddExtension struct {
 	cfg *Config // Extension configuration.
 
 	telemetry   component.TelemetrySettings
-	server      *http.Server
+	server      *server
 	info        component.BuildInfo
 	debug       extensionDef.DebugSourceResponse
 	configStore *configStore

diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod
@@ -103,7 +103,6 @@ replace (
 )
 
 require (
-	github.com/DataDog/datadog-agent/comp/api/authtoken v0.0.0-00010101000000-000000000000
 	github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.0.0-00010101000000-000000000000
 	github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.0.0-00010101000000-000000000000
 	github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter v0.0.0-00010101000000-000000000000
@@ -163,6 +162,7 @@ require (
 	github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.2 // indirect
 	github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel // indirect
+	github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel // indirect
 	github.com/DataDog/datadog-agent/comp/core/secrets v0.57.0 // indirect
 	github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/comp/core/tagger/types v0.56.0-rc.3 // indirect
@@ -223,6 +223,7 @@ require (
 	github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/json v0.56.0-rc.3 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/log v0.57.0 // indirect
+	github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect
 	github.com/DataDog/datadog-agent/pkg/util/optional v0.57.0 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/pointer v0.57.0 // indirect
 	github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.0 // indirect