From 8e62f94dd28e13782662f74e7c491f10bb4a49a7 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Tue, 11 Jun 2024 16:28:21 -0400 Subject: [PATCH 1/2] Add warn log for connectivity check --- .../logsagentpipeline/logsagentpipelineimpl/agent.go | 7 +++++-- .../logsagentpipeline/logsagentpipelineimpl/agent_test.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go index 9ad68b1537cb6..c874c00b21fba 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent.go @@ -100,7 +100,7 @@ func (a *Agent) Start(context.Context) error { a.log.Debug("Starting logs-agent...") // setup the server config - endpoints, err := buildEndpoints(a.config) + endpoints, err := buildEndpoints(a.config, a.log) if err != nil { message := fmt.Sprintf("Invalid endpoints: %v", err) @@ -219,10 +219,13 @@ func (a *Agent) SetupPipeline( } // buildEndpoints builds endpoints for the logs agent -func buildEndpoints(coreConfig pkgconfigmodel.Reader) (*config.Endpoints, error) { +func buildEndpoints(coreConfig pkgconfigmodel.Reader, log logComponent.Component) (*config.Endpoints, error) { httpConnectivity := config.HTTPConnectivityFailure if endpoints, err := config.BuildHTTPEndpoints(coreConfig, intakeTrackType, config.AgentJSONIntakeProtocol, config.DefaultIntakeOrigin); err == nil { httpConnectivity = http.CheckConnectivity(endpoints.Main, coreConfig) + if !httpConnectivity { + log.Warn("Error while validating API key") + } } return config.BuildEndpoints(coreConfig, httpConnectivity, intakeTrackType, config.AgentJSONIntakeProtocol, config.DefaultIntakeOrigin) } diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go index 3698f61e3d6ef..22c5f72b68f5d 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go @@ -179,7 +179,7 @@ func TestBuildEndpoints(t *testing.T) { configComponent.MockModule(), )) - endpoints, err := buildEndpoints(config) + endpoints, err := buildEndpoints(config, nil) assert.Nil(t, err) assert.Equal(t, "agent-intake.logs.datadoghq.com", endpoints.Main.Host) } From 0e6e9a5165360bd81e5b5047a688bda743b82c51 Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Tue, 11 Jun 2024 16:48:35 -0400 Subject: [PATCH 2/2] Fix test --- .../logsagentpipeline/logsagentpipelineimpl/agent_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go index 22c5f72b68f5d..50cf5d335f10b 100644 --- a/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go +++ b/comp/otelcol/logsagentpipeline/logsagentpipelineimpl/agent_test.go @@ -175,11 +175,12 @@ func TestAgentTestSuite(t *testing.T) { } func TestBuildEndpoints(t *testing.T) { - config := fxutil.Test[configComponent.Component](t, fx.Options( + deps := fxutil.Test[testDeps](t, fx.Options( configComponent.MockModule(), + logimpl.MockModule(), )) - endpoints, err := buildEndpoints(config, nil) + endpoints, err := buildEndpoints(deps.Config, deps.Log) assert.Nil(t, err) assert.Equal(t, "agent-intake.logs.datadoghq.com", endpoints.Main.Host) }