remove hardcoded name

Author: vitkyrka

comp/core/autodiscovery/providers/names/provider_names.go

@@ -22,6 +22,7 @@ const (
 	KubeServicesFile        = "kubernetes-services-file"
 	KubeEndpoints           = "kubernetes-endpoints"
 	KubeEndpointsFile       = "kubernetes-endpoints-file"
+	ProcessLog              = "process_log"
 	PrometheusPods          = "prometheus-pods"
 	PrometheusServices      = "prometheus-services"
 	RemoteConfig            = "remote-config"

comp/core/autodiscovery/providers/process_log_provider.go

@@ -19,6 +19,7 @@ import (
 	"unicode/utf8"
 
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration"
+	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers/names"
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers/types"
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/telemetry"
 	workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
@@ -28,7 +29,7 @@ import (
 	"github.com/hashicorp/golang-lru/v2/simplelru"
 )
 
-const processLogProviderName = "process_log"
+const processLogProviderName = names.ProcessLog
 
 // serviceLogRef tracks reference count and config for a service+log combination
 type serviceLogRef struct {
@@ -279,7 +280,7 @@ func (p *ProcessLogConfigProvider) buildConfig(process *workloadmeta.Process, lo
 		LogsConfig: data,
 		Provider:   processLogProviderName,
 		Source:     "process-log:" + process.Service.GeneratedName,
-		ServiceID:  fmt.Sprintf("process_log://%s", serviceLogKey),
+		ServiceID:  fmt.Sprintf("%s://%s", names.ProcessLog, serviceLogKey),
 	}, nil
 }
 

comp/core/autodiscovery/providers/process_log_provider_test.go

@@ -8,11 +8,13 @@
 package providers
 
 import (
+	"fmt"
 	"os"
 	"strings"
 	"testing"
 
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration"
+	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers/names"
 	"github.com/DataDog/datadog-agent/comp/core/autodiscovery/providers/types"
 	workloadmeta "github.com/DataDog/datadog-agent/comp/core/workloadmeta/def"
 	"github.com/stretchr/testify/assert"
@@ -64,7 +66,7 @@ func TestProcessLogProviderEvents(t *testing.T) {
 	assert.Len(t, changes.Unschedule, 0)
 	config := changes.Schedule[0]
 	assert.Equal(t, "process-test-service-gen-_var_log_test.log", config.Name)
-	assert.Equal(t, "process_log", config.Provider)
+	assert.Equal(t, names.ProcessLog, config.Provider)
 	assert.Contains(t, string(config.LogsConfig), "/var/log/test.log")
 
 	// check that scheduling the same config again doesn't do anything
@@ -188,7 +190,7 @@ func TestProcessLogProviderString(t *testing.T) {
 	p, ok := provider.(*ProcessLogConfigProvider)
 	require.True(t, ok)
 
-	assert.Equal(t, "process_log", p.String())
+	assert.Equal(t, names.ProcessLog, p.String())
 }
 
 func TestStream(t *testing.T) {
@@ -339,7 +341,7 @@ func TestReferenceCounting(t *testing.T) {
 	assert.Len(t, changes.Unschedule, 0)
 	config := changes.Schedule[0]
 	assert.Equal(t, "process-test-service-gen-_var_log_test.log", config.Name)
-	assert.Equal(t, "process_log://test-service-gen:_var_log_test.log", config.ServiceID)
+	assert.Equal(t, fmt.Sprintf("%s://test-service-gen:_var_log_test.log", names.ProcessLog), config.ServiceID)
 
 	// Verify reference count is 1
 	serviceLogKey := p.generateServiceLogKey("test-service-gen", "/var/log/test.log")
@@ -530,7 +532,7 @@ func TestReferenceCountingPathSanitization(t *testing.T) {
 
 	config := changes.Schedule[0]
 	assert.Equal(t, "process-test-service-gen-_var_log_test.log", config.Name)
-	assert.Equal(t, "process_log://test-service-gen:_var_log_test.log", config.ServiceID)
+	assert.Equal(t, fmt.Sprintf("%s://test-service-gen:_var_log_test.log", names.ProcessLog), config.ServiceID)
 }
 
 func TestInvalidEvent(t *testing.T) {

comp/core/autodiscovery/providers/providers.go

@@ -60,5 +60,5 @@ func RegisterProviders(providerCatalog map[string]types.ConfigProviderFactory) {
 	RegisterProvider(names.PrometheusServicesRegisterName, NewPrometheusServicesConfigProvider, providerCatalog)
 	RegisterProvider(names.ZookeeperRegisterName, NewZookeeperConfigProvider, providerCatalog)
 	RegisterProviderWithComponents(names.GPU, NewGPUConfigProvider, providerCatalog)
-	RegisterProviderWithComponents("process_log", NewProcessLogConfigProvider, providerCatalog)
+	RegisterProviderWithComponents(names.ProcessLog, NewProcessLogConfigProvider, providerCatalog)
 }

pkg/logs/schedulers/ad/scheduler.go

@@ -99,7 +99,7 @@ func (s *Scheduler) Schedule(configs []integration.Config) {
 // before dynamically discovered logs, which should be true since parsing of
 // configuration files is done before discovery of running services.
 func (s *Scheduler) filterConflictingSources(newSources []*sourcesPkg.LogSource, provider string) []*sourcesPkg.LogSource {
-	if provider != "process_log" {
+	if provider != names.ProcessLog {
 		// For non-process_log providers, add all sources without filtering
 		return newSources
 	}
@@ -122,7 +122,7 @@ func (s *Scheduler) filterConflictingSources(newSources []*sourcesPkg.LogSource,
 		path := existingSource.Config.Path
 		if _, exists := newFilePaths[path]; exists {
 			// Found a conflict with a manually configured log file
-			log.Debugf("Ignoring process_log config for %s due to existing manual configuration", path)
+			log.Debugf("Ignoring %s config for %s due to existing manual configuration", names.ProcessLog, path)
 			delete(newFilePaths, path)
 		}
 	}
@@ -205,7 +205,7 @@ func CreateSources(config integration.Config) ([]*sourcesPkg.LogSource, error) {
 	case names.File:
 		// config defined in a file
 		configs, err = logsConfig.ParseYAML(config.LogsConfig)
-	case names.Container, names.Kubernetes, names.KubeContainer, "process_log":
+	case names.Container, names.Kubernetes, names.KubeContainer, names.ProcessLog:
 		// config attached to a container label or a pod annotation
 		configs, err = logsConfig.ParseJSON(config.LogsConfig)
 	case names.RemoteConfig:
@@ -257,7 +257,7 @@ func CreateSources(config integration.Config) ([]*sourcesPkg.LogSource, error) {
 		if service != nil {
 			// a config defined in a container label or a pod annotation does not always contain a type,
 			// override it here to ensure that the config won't be dropped at validation.
-			if (cfg.Type == logsConfig.FileType || cfg.Type == logsConfig.TCPType || cfg.Type == logsConfig.UDPType) && (config.Provider == names.Kubernetes || config.Provider == names.Container || config.Provider == names.KubeContainer || config.Provider == logsConfig.FileType || config.Provider == "process_log") {
+			if (cfg.Type == logsConfig.FileType || cfg.Type == logsConfig.TCPType || cfg.Type == logsConfig.UDPType) && (config.Provider == names.Kubernetes || config.Provider == names.Container || config.Provider == names.KubeContainer || config.Provider == logsConfig.FileType || config.Provider == names.ProcessLog) {
 				// cfg.Type is not overwritten as tailing a file from a Docker or Kubernetes AD configuration
 				// is explicitly supported (other combinations may be supported later)
 				cfg.Identifier = service.Identifier

pkg/logs/schedulers/ad/scheduler_test.go

@@ -222,9 +222,9 @@ func TestProcessLogPriorityOverManualConfig(t *testing.T) {
 	// Now try to add a process_log config for the same file
 	processLogConfig := integration.Config{
 		LogsConfig: []byte(`[{"type":"file","path":"/var/log/app.log","service":"process-service"}]`),
-		Provider:   "process_log",
+		Provider:   names.ProcessLog,
 		Name:       "process-config",
-		ServiceID:  "process_log://test-service:/var_log_app.log",
+		ServiceID:  fmt.Sprintf("%s://test-service:/var_log_app.log", names.ProcessLog),
 	}
 
 	// Clear events for the next test
@@ -243,9 +243,9 @@ func TestProcessLogConfigAllowedWhenNoConflict(t *testing.T) {
 	// Add a process_log config for a file that doesn't have a manual config
 	processLogConfig := integration.Config{
 		LogsConfig: []byte(`[{"type":"file","path":"/var/log/process.log","service":"process-service"}]`),
-		Provider:   "process_log",
+		Provider:   names.ProcessLog,
 		Name:       "process-config",
-		ServiceID:  "process_log://test-service:/var_log_process.log",
+		ServiceID:  fmt.Sprintf("%s://test-service:/var_log_process.log", names.ProcessLog),
 	}
 
 	// Schedule the process_log config
@@ -266,9 +266,9 @@ func TestNonFileTypeProcessLogConfigAllowed(t *testing.T) {
 	// Add a process_log config for a non-file type (should not be filtered)
 	processLogConfig := integration.Config{
 		LogsConfig: []byte(`[{"type":"tcp","service":"process-service"}]`),
-		Provider:   "process_log",
+		Provider:   names.ProcessLog,
 		Name:       "process-config",
-		ServiceID:  "process_log://test-service",
+		ServiceID:  fmt.Sprintf("%s://test-service", names.ProcessLog),
 	}
 
 	// Schedule the process_log config