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.

Sign up for GitHub

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

WIP Datadog exporter logs refactor #27450

Closed
wants to merge 5 commits into from
Closed

WIP Datadog exporter logs refactor #27450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f84853d
Refactor logs code to match datadog agent
liustanley Oct 5, 2023
f696597
Use logsagentexporter
liustanley Oct 5, 2023
8dfe692
Clean up imports
liustanley Oct 5, 2023
5d56acf
Update imports, add logs dd url setting
liustanley Oct 10, 2023
dd492f8
Add dockerfile
liustanley Oct 10, 2023
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
20 changes: 20 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM golang:1.20 AS build

WORKDIR /src
ADD . /src

RUN make otelcontribcol

FROM alpine:latest as certs
RUN apk --update add ca-certificates

FROM scratch

ARG USER_UID=10001
USER ${USER_UID}

COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=build /src/bin/otelcontribcol_linux_amd64 /otelcol-contrib
ENTRYPOINT ["/otelcol-contrib"]
CMD ["--config", "/etc/otel/config.yaml"]
EXPOSE 4317 55680 55679
88 changes: 78 additions & 10 deletions cmd/configschema/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,45 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/configschem

go 1.20

replace (
github.com/DataDog/datadog-agent/comp/core/config => github.com/DataDog/datadog-agent/comp/core/config v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/comp/core/telemetry => github.com/DataDog/datadog-agent/comp/core/telemetry v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/comp/logs/agent/config => github.com/DataDog/datadog-agent/comp/logs/agent/config v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types => github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/collector/check/defaults => github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/conf => github.com/DataDog/datadog-agent/pkg/conf v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/config/configsetup => github.com/DataDog/datadog-agent/pkg/config/configsetup v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/config/load => github.com/DataDog/datadog-agent/pkg/config/load v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/auditor => github.com/DataDog/datadog-agent/pkg/logs/auditor v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/client => github.com/DataDog/datadog-agent/pkg/logs/client v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/diagnostic/module => github.com/DataDog/datadog-agent/pkg/logs/diagnostic/module v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/internal/processor => github.com/DataDog/datadog-agent/pkg/logs/internal/processor v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/internal/status => github.com/DataDog/datadog-agent/pkg/logs/internal/status v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/internal/util/test_utils => github.com/DataDog/datadog-agent/pkg/logs/internal/util/test_utils v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/message => github.com/DataDog/datadog-agent/pkg/logs/message v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/metrics => github.com/DataDog/datadog-agent/pkg/logs/metrics v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/pipeline => github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/sender => github.com/DataDog/datadog-agent/pkg/logs/sender v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/sources => github.com/DataDog/datadog-agent/pkg/logs/sources v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/logs/status/module => github.com/DataDog/datadog-agent/pkg/logs/status/module v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/otlp/internal/testutil => github.com/DataDog/datadog-agent/pkg/otlp/internal/testutil v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/otlp/logsagentexporter => github.com/DataDog/datadog-agent/pkg/otlp/logsagentexporter v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/secrets => github.com/DataDog/datadog-agent/pkg/secrets v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/status/health => github.com/DataDog/datadog-agent/pkg/status/health v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/telemetry => github.com/DataDog/datadog-agent/pkg/telemetry v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/backoff => github.com/DataDog/datadog-agent/pkg/util/backoff v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/executable => github.com/DataDog/datadog-agent/pkg/util/executable v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/fxutil => github.com/DataDog/datadog-agent/pkg/util/fxutil v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/go_routines => github.com/DataDog/datadog-agent/pkg/util/go_routines v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/http => github.com/DataDog/datadog-agent/pkg/util/http v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/log => github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/scrubber => github.com/DataDog/datadog-agent/pkg/util/scrubber v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/startstop => github.com/DataDog/datadog-agent/pkg/util/startstop v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/stats_tracker => github.com/DataDog/datadog-agent/pkg/util/stats_tracker v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/util/system/socket => github.com/DataDog/datadog-agent/pkg/util/system/socket v0.0.0-20231005190945-23465b25bd3c
github.com/DataDog/datadog-agent/pkg/version => github.com/DataDog/datadog-agent/pkg/version v0.0.0-20231005190945-23465b25bd3c
)

require (
github.com/fatih/structtag v1.2.0
github.com/google/uuid v1.3.1
Expand Down Expand Up @@ -212,23 +251,48 @@ require (
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/ClickHouse/ch-go v0.58.2 // indirect
github.com/ClickHouse/clickhouse-go/v2 v2.14.1 // indirect
github.com/DataDog/agent-payload/v5 v5.0.89 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-beta.1 // indirect
github.com/DataDog/agent-payload/v5 v5.0.96 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/comp/logs/agent/config v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/conf v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/auditor v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/client v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/diagnostic/module v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/internal/processor v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/internal/status v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/message v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/metrics v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/sender v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/sources v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/logs/status/module v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/otlp/logsagentexporter v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/status/health v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/telemetry v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-beta.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/backoff v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/util/go_routines v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/util/http v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.0-rc.2 // indirect
github.com/DataDog/datadog-agent/pkg/util/startstop v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/util/stats_tracker v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.17.0 // indirect
github.com/DataDog/datadog-go/v5 v5.1.1 // indirect
github.com/DataDog/go-tuf v1.0.1-0.5.2 // indirect
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.0 // indirect
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.0 // indirect
github.com/DataDog/sketches-go v1.4.2 // indirect
github.com/DataDog/viper v1.12.0 // indirect
github.com/DataDog/zstd v1.5.2 // indirect
github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.19.1 // indirect
Expand Down Expand Up @@ -276,6 +340,7 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.17.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.23.0 // indirect
github.com/aws/smithy-go v1.14.2 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/bmatcuk/doublestar/v4 v4.6.0 // indirect
Expand Down Expand Up @@ -532,6 +597,7 @@ require (
github.com/ovh/go-ovh v1.4.1 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/paulmach/orb v0.10.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
github.com/philhofer/fwd v1.1.2 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
Expand All @@ -546,7 +612,7 @@ require (
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/prometheus v0.47.0 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
Expand Down Expand Up @@ -654,6 +720,8 @@ require (
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.17.0 // indirect
go.uber.org/fx v1.20.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
Expand Down
Loading