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

Olivierg/gateway usage gauge #37499

Merged
merged 19 commits into from
Feb 7, 2025
Merged

Olivierg/gateway usage gauge #37499

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2befed7
Send datadog.otel.gateway for metrics and traces
ogaca-dd Jan 24, 2025
89ee046
Update dependencies
ogaca-dd Jan 24, 2025
01463fe
Send datadog.otel.gateway for logs when isLogsAgentExporterEnabled is…
ogaca-dd Jan 27, 2025
d5a6f30
Update opentelemetry-mapping-go to v0.25.0
ogaca-dd Feb 3, 2025
30a9944
Update github.com/DataDog/datadog-agent to commit in main
ogaca-dd Feb 4, 2025
ba8e4f3
Merge branch 'main' of ssh://github.com/open-telemetry/opentelemetry-…
ogaca-dd Feb 4, 2025
30e1765
Add changelog
ogaca-dd Feb 4, 2025
45ee334
Fix github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/sta…
ogaca-dd Feb 5, 2025
9696430
Merge branch 'main' of ssh://github.com/open-telemetry/opentelemetry-…
ogaca-dd Feb 5, 2025
7943a57
make gotidy
ogaca-dd Feb 5, 2025
61bf04b
Fix integration tests
ogaca-dd Feb 5, 2025
1b9d35c
Make sure gatewayUsage is not null
ogaca-dd Feb 5, 2025
a1f9fbe
Fix formating
ogaca-dd Feb 6, 2025
042ad03
Fix test in datadogconnector
ogaca-dd Feb 6, 2025
761b567
Fix "json: cannot unmarshal object into Go value of type testutil.JSO…
ogaca-dd Feb 6, 2025
a697103
Fix Test_metricsExporter_PushMetricsData
ogaca-dd Feb 6, 2025
a49615f
Fix exporter test
ogaca-dd Feb 7, 2025
3c44d36
Fix lint issue in metrics_exporter_test.go
ogaca-dd Feb 7, 2025
19c722e
Update exporter/datadogexporter/internal/metrics/series.go
songy23 Feb 7, 2025
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
12 changes: 7 additions & 5 deletions exporter/datadogexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ type factory struct {
attributesErr error

registry *featuregate.Registry

gatewayUsage *attributes.GatewayUsage
}

func (f *factory) SourceProvider(set component.TelemetrySettings, configHostname string, timeout time.Duration) (source.Provider, error) {
Expand Down Expand Up @@ -160,7 +162,7 @@ func (f *factory) TraceAgent(ctx context.Context, wg *sync.WaitGroup, params exp
}

func newFactoryWithRegistry(registry *featuregate.Registry) exporter.Factory {
f := &factory{registry: registry}
f := &factory{registry: registry, gatewayUsage: attributes.NewGatewayUsage()}
return exporter.NewFactory(
metadata.Type,
f.createDefaultConfig,
Expand Down Expand Up @@ -299,7 +301,7 @@ func (f *factory) createMetricsExporter(
return nil
}
} else {
exp, metricsErr := newMetricsExporter(ctx, set, cfg, acfg, &f.onceMetadata, attrsTranslator, hostProvider, metadataReporter, statsIn)
exp, metricsErr := newMetricsExporter(ctx, set, cfg, acfg, &f.onceMetadata, attrsTranslator, hostProvider, metadataReporter, statsIn, f.gatewayUsage)
if metricsErr != nil {
cancel() // first cancel context
wg.Wait() // then wait for shutdown
Expand Down Expand Up @@ -412,7 +414,7 @@ func (f *factory) createTracesExporter(
return nil
}
} else {
tracex, err2 := newTracesExporter(ctx, set, cfg, &f.onceMetadata, hostProvider, traceagent, metadataReporter)
tracex, err2 := newTracesExporter(ctx, set, cfg, &f.onceMetadata, hostProvider, traceagent, metadataReporter, f.gatewayUsage)
if err2 != nil {
cancel()
wg.Wait() // then wait for shutdown
Expand Down Expand Up @@ -502,15 +504,15 @@ func (f *factory) createLogsExporter(
return nil
}
case isLogsAgentExporterEnabled():
la, exp, err := newLogsAgentExporter(ctx, set, cfg, hostProvider)
la, exp, err := newLogsAgentExporter(ctx, set, cfg, hostProvider, f.gatewayUsage)
if err != nil {
cancel()
return nil, err
}
logsAgent = la
pusher = exp.ConsumeLogs
default:
exp, err := newLogsExporter(ctx, set, cfg, &f.onceMetadata, attributesTranslator, hostProvider, metadataReporter)
exp, err := newLogsExporter(ctx, set, cfg, &f.onceMetadata, attributesTranslator, hostProvider, metadataReporter, f.gatewayUsage)
if err != nil {
cancel()
return nil, err
Expand Down
56 changes: 29 additions & 27 deletions exporter/datadogexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ require (
github.com/DataDog/datadog-agent/pkg/logs/sds v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/logs/sources v0.61.0
github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.63.0-devel
github.com/DataDog/datadog-agent/pkg/proto v0.64.0-devel
github.com/DataDog/datadog-agent/pkg/status/health v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.61.0
github.com/DataDog/datadog-agent/pkg/trace v0.64.0-devel.0.20250124161229-3bfe342fadfd
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.61.0
github.com/DataDog/datadog-agent/pkg/util/startstop v0.61.0 // indirect
github.com/DataDog/datadog-api-client-go/v2 v2.34.0
github.com/DataDog/datadog-go/v5 v5.6.0
github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.24.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.24.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.24.0
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.24.0
github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.24.1-0.20250124131402-bcd6fd1617a6
ogaca-dd marked this conversation as resolved.
Show resolved Hide resolved
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.24.1-0.20250124131402-bcd6fd1617a6
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.24.1-0.20250124131402-bcd6fd1617a6
github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.24.1-0.20250124131402-bcd6fd1617a6
github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.24.0
github.com/DataDog/sketches-go v1.4.6 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0
Expand Down Expand Up @@ -83,7 +83,7 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
google.golang.org/protobuf v1.36.3
google.golang.org/protobuf v1.36.4
gopkg.in/yaml.v2 v2.4.0
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0
k8s.io/apimachinery v0.31.3
Expand Down Expand Up @@ -115,9 +115,10 @@ require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.61.0 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.61.0 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.61.0 // indirect
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.64.0-devel // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.61.0 // indirect
github.com/DataDog/datadog-agent/comp/def v0.61.0 // indirect
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.61.0 // indirect
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.64.0-devel.0.20250124161229-3bfe342fadfd // indirect
github.com/DataDog/datadog-agent/comp/trace/compression/def v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.61.0 // indirect
Expand All @@ -131,7 +132,7 @@ require (
github.com/DataDog/datadog-agent/pkg/logs/processor v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/logs/sender v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.64.0-devel.0.20250124163325-fc18e81037cd // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/telemetry v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/backoff v0.61.0 // indirect
Expand All @@ -140,7 +141,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/http v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.64.0-devel.0.20250124163325-fc18e81037cd // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.61.0 // indirect
Expand All @@ -150,7 +151,7 @@ require (
github.com/DataDog/datadog-agent/pkg/util/winutil v0.61.0 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.61.0 // indirect
github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42 // indirect
github.com/DataDog/go-sqllexer v0.0.16 // indirect
github.com/DataDog/go-sqllexer v0.0.20 // indirect
github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect
github.com/DataDog/viper v1.14.0 // indirect
github.com/DataDog/zstd v1.5.6 // indirect
Expand Down Expand Up @@ -179,7 +180,7 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/containerd/cgroups/v3 v3.0.3 // indirect
github.com/containerd/cgroups/v3 v3.0.5 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dennwc/varint v1.0.0 // indirect
Expand All @@ -189,7 +190,7 @@ require (
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ebitengine/purego v0.8.1 // indirect
github.com/ebitengine/purego v0.8.2 // indirect
github.com/elastic/go-grok v0.3.1 // indirect
github.com/elastic/lunes v0.1.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
Expand All @@ -213,11 +214,11 @@ require (
github.com/go-zookeeper/zk v1.0.3 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/goccy/go-json v0.10.4 // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/mock v1.7.0-rc.1 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
Expand Down Expand Up @@ -268,7 +269,7 @@ require (
github.com/leodido/go-syslog/v4 v4.2.0 // indirect
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
github.com/linode/linodego v1.37.0 // indirect
github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
github.com/magefile/mage v1.15.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
Expand All @@ -280,6 +281,7 @@ require (
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/userns v0.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
Expand All @@ -298,10 +300,10 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.118.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.0 // indirect
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/openshift/api v3.9.0+incompatible // indirect
github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect
github.com/outcaste-io/ristretto v0.2.1 // indirect
github.com/outcaste-io/ristretto v0.2.3 // indirect
github.com/ovh/go-ovh v1.6.0 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
Expand All @@ -311,7 +313,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/prometheus-community/windows_exporter v0.27.2 // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
Expand All @@ -321,7 +323,7 @@ require (
github.com/prometheus/prometheus v0.54.1 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.29 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shirou/gopsutil/v4 v4.24.12 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
Expand All @@ -334,7 +336,7 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/tinylib/msgp v1.2.5 // indirect
github.com/tklauser/go-sysconf v0.3.14 // indirect
github.com/tklauser/numcpus v0.8.0 // indirect
github.com/tklauser/numcpus v0.9.0 // indirect
github.com/ua-parser/uap-go v0.0.0-20240611065828-3a4781585db6 // indirect
github.com/valyala/fastjson v1.6.4 // indirect
github.com/vultr/govultr/v2 v2.17.2 // indirect
Expand Down Expand Up @@ -403,21 +405,21 @@ require (
go.uber.org/fx v1.22.2 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.32.0 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
golang.org/x/mod v0.22.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/oauth2 v0.25.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
golang.org/x/tools v0.28.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.29.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/api v0.188.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
google.golang.org/grpc v1.69.4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250124145028-65684f501c47 // indirect
google.golang.org/grpc v1.70.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading
Loading