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.

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

Add logsagentpipeline component for OTLP ingest paths #25032

Merged
merged 21 commits into from
Apr 26, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Fix imports
  • Loading branch information
liustanley committed Apr 24, 2024

Partially verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
commit cab6b2c57648249032d716b320ee025a30284525
4 changes: 2 additions & 2 deletions cmd/otel-agent/subcommands/run/command.go
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ import (
"github.com/DataDog/datadog-agent/comp/metadata/inventoryagent/inventoryagentimpl"
"github.com/DataDog/datadog-agent/comp/otelcol"
"github.com/DataDog/datadog-agent/comp/otelcol/collector"
"github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline"
"github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline/logsagentpipelineimpl"
"github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline"
"github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl"
"github.com/DataDog/datadog-agent/comp/serializer/compression"
"github.com/DataDog/datadog-agent/comp/serializer/compression/compressionimpl/strategy"
"github.com/DataDog/datadog-agent/pkg/serializer"
2 changes: 1 addition & 1 deletion comp/otelcol/collector/pipeline.go
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ import (
corelog "github.com/DataDog/datadog-agent/comp/core/log"
"github.com/DataDog/datadog-agent/comp/core/status"
"github.com/DataDog/datadog-agent/comp/metadata/inventoryagent"
"github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline"
"github.com/DataDog/datadog-agent/comp/otelcol/otlp"
"github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline"
"github.com/DataDog/datadog-agent/pkg/logs/message"
"github.com/DataDog/datadog-agent/pkg/serializer"
"github.com/DataDog/datadog-agent/pkg/util/optional"
2 changes: 1 addition & 1 deletion comp/otelcol/logsagentpipeline/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline
module github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline

go 1.21.0

Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ import (
"github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface"
logComponent "github.com/DataDog/datadog-agent/comp/core/log"
"github.com/DataDog/datadog-agent/comp/logs/agent/config"
"github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline"
"github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline"
pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model"
"github.com/DataDog/datadog-agent/pkg/logs/auditor"
"github.com/DataDog/datadog-agent/pkg/logs/client"
6 changes: 3 additions & 3 deletions comp/otelcol/logsagentpipeline/logsagentpipelineimpl/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipelineimpl
module github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl

go 1.21.0

@@ -11,7 +11,7 @@ replace (
github.com/DataDog/datadog-agent/comp/core/secrets => ../../../core/secrets
github.com/DataDog/datadog-agent/comp/core/telemetry => ../../../core/telemetry
github.com/DataDog/datadog-agent/comp/logs/agent/config => ../../../logs/agent/config
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline => ../../logsagentpipeline
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ../../logsagentpipeline
github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults
github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env
github.com/DataDog/datadog-agent/pkg/config/logs => ../../../../pkg/config/logs
@@ -57,7 +57,7 @@ require (
github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/core/log v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/pkg/config/model v0.53.0-rc.2
github.com/DataDog/datadog-agent/pkg/config/setup v0.53.0-rc.2
github.com/DataDog/datadog-agent/pkg/logs/auditor v0.53.0-rc.2
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -37,10 +37,10 @@ replace (
github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface => ./comp/forwarder/orchestrator/orchestratorinterface
github.com/DataDog/datadog-agent/comp/logs/agent/config => ./comp/logs/agent/config
github.com/DataDog/datadog-agent/comp/netflow/payload => ./comp/netflow/payload
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline => ./comp/otelcol/logsagentpipeline
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl => ./comp/otelcol/logsagentpipeline/logsagentpipelineimpl
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter => ./comp/otelcol/otlp/components/exporter/logsagentexporter
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter => ./comp/otelcol/otlp/components/exporter/serializerexporter
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline => ./comp/otelcol/logsagentpipeline
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline/logsagentpipelineimpl => ./comp/otelcol/logsagentpipeline/logsagentpipelineimpl
github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil => ./comp/otelcol/otlp/testutil
github.com/DataDog/datadog-agent/comp/serializer/compression => ./comp/serializer/compression
github.com/DataDog/datadog-agent/pkg/aggregator/ckey => ./pkg/aggregator/ckey/
@@ -614,10 +614,10 @@ require (
github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/netflow/payload v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/serializerexporter v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/logsagentpipeline/logsagentpipelineimpl v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.53.0-rc.2
github.com/DataDog/datadog-agent/comp/serializer/compression v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.53.0-rc.2