From fe7c2f8dc8b4d2ab5b13f3d0f20a7c7da61c0d7c Mon Sep 17 00:00:00 2001 From: Gabriel Aszalos Date: Wed, 1 Nov 2023 16:42:07 +0100 Subject: [PATCH] exporter/datadog: disable APM stats via feature flag (#28616) This change adds the "exporter.datadogexporter.disable_apm_stats" feature flag, which can be enabled to disable APM stats computation. Updates #28615 --- .chloggen/gbbr_nostats.yaml | 27 +++++++++++++ cmd/configschema/go.mod | 18 ++++----- cmd/configschema/go.sum | 36 ++++++++--------- cmd/otelcontribcol/go.mod | 20 +++++----- cmd/otelcontribcol/go.sum | 39 ++++++++++--------- connector/datadogconnector/go.mod | 18 ++++----- connector/datadogconnector/go.sum | 36 ++++++++--------- exporter/datadogexporter/factory.go | 7 ++++ exporter/datadogexporter/go.mod | 18 ++++----- exporter/datadogexporter/go.sum | 36 ++++++++--------- .../datadogexporter/integrationtest/go.mod | 18 ++++----- .../datadogexporter/integrationtest/go.sum | 36 ++++++++--------- exporter/datadogexporter/traces_exporter.go | 10 ++++- go.mod | 18 ++++----- go.sum | 36 ++++++++--------- internal/datadog/go.mod | 18 ++++----- internal/datadog/go.sum | 36 ++++++++--------- processor/datadogprocessor/go.mod | 18 ++++----- processor/datadogprocessor/go.sum | 36 ++++++++--------- 19 files changed, 262 insertions(+), 219 deletions(-) create mode 100755 .chloggen/gbbr_nostats.yaml diff --git a/.chloggen/gbbr_nostats.yaml b/.chloggen/gbbr_nostats.yaml new file mode 100755 index 000000000000..0f1b234d6ee1 --- /dev/null +++ b/.chloggen/gbbr_nostats.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: exporter/datadog + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Added the "exporter.datadogexporter.DisableAPMStats" feature gate to disable APM stats computation. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [28615] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 89fbf0ad36af..e9334456bd90 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -213,14 +213,14 @@ require ( github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.15.0 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.18.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect @@ -291,7 +291,7 @@ require ( github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect - github.com/containerd/cgroups v1.1.0 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index dbd23be5fb1a..f17f2cfef4ff 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -157,22 +157,22 @@ github.com/ClickHouse/clickhouse-go/v2 v2.15.0/go.mod h1:kXt1SRq0PIRa6aKZD7TnFnY github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.18.0 h1:QkX1vY1JtvDeF6N6EarPrJMHlerVGdTvGQOUWqfeVDs= github.com/DataDog/datadog-api-client-go/v2 v2.18.0/go.mod h1:lHlfhsNQ2qZclvpVQTfrGowUDIdIzAao38A05f9EQpc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -447,8 +447,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= -github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 000487efb1e1..e88ad93641b8 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -252,14 +252,14 @@ require ( github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.15.0 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.18.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect @@ -328,11 +328,11 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/cilium/ebpf v0.7.0 // indirect + github.com/cilium/ebpf v0.9.1 // indirect github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect - github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.1.0 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 9fc105990aa1..36af9887f8b5 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -156,22 +156,22 @@ github.com/ClickHouse/clickhouse-go/v2 v2.15.0/go.mod h1:kXt1SRq0PIRa6aKZD7TnFnY github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.18.0 h1:QkX1vY1JtvDeF6N6EarPrJMHlerVGdTvGQOUWqfeVDs= github.com/DataDog/datadog-api-client-go/v2 v2.18.0/go.mod h1:lHlfhsNQ2qZclvpVQTfrGowUDIdIzAao38A05f9EQpc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -416,8 +416,9 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= -github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= +github.com/cilium/ebpf v0.9.1 h1:64sn2K3UKw8NbP/blsixRpF3nXuyhz/VjRlRzvlBRu4= +github.com/cilium/ebpf v0.9.1/go.mod h1:+OhNOIXx/Fnu1IE8bJz2dzOA+VSfyTfdNUVdlQnxUFY= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I= @@ -445,8 +446,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index f4c5e969f30c..69ed4dbaff09 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.88.0 github.com/stretchr/testify v1.8.4 @@ -15,13 +15,13 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect @@ -30,7 +30,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // 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/docker/go-units v0.5.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index f3030f801160..7d84cc31a3e0 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -1,19 +1,19 @@ -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= @@ -35,8 +35,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 593d4c3fa35f..017e9fd0512a 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -35,6 +35,13 @@ var mertricExportNativeClientFeatureGate = featuregate.GlobalRegistry().MustRegi featuregate.WithRegisterDescription("When enabled, metric export in datadogexporter uses native Datadog client APIs instead of Zorkian APIs."), ) +// noAPMStatsFeatureGate causes the trace consumer to skip APM stats computation. +var noAPMStatsFeatureGate = featuregate.GlobalRegistry().MustRegister( + "exporter.datadogexporter.DisableAPMStats", + featuregate.StageAlpha, + featuregate.WithRegisterDescription("Datadog Exporter will not compute APM Stats"), +) + // isMetricExportV2Enabled returns true if metric export in datadogexporter uses native Datadog client APIs, false if it uses Zorkian APIs func isMetricExportV2Enabled() bool { return mertricExportNativeClientFeatureGate.IsEnabled() diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 38aa8649b652..458a0148316f 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/DataDog/agent-payload/v5 v5.0.89 - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 github.com/DataDog/datadog-api-client-go/v2 v2.18.0 github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.0 @@ -54,12 +54,12 @@ require ( cloud.google.com/go/compute v1.23.0 // indirect cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect @@ -72,7 +72,7 @@ require ( github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // 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/docker/distribution v2.8.2+incompatible // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index bc0c10820337..97985e219b13 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -50,22 +50,22 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.18.0 h1:QkX1vY1JtvDeF6N6EarPrJMHlerVGdTvGQOUWqfeVDs= github.com/DataDog/datadog-api-client-go/v2 v2.18.0/go.mod h1:lHlfhsNQ2qZclvpVQTfrGowUDIdIzAao38A05f9EQpc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -145,8 +145,8 @@ github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 9b2a26be4d34..6e6c8fa391da 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.88.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.88.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.88.0 @@ -30,13 +30,13 @@ require ( cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.18.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect @@ -57,7 +57,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // 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/docker/go-units v0.5.0 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 1822bd1459f0..a232cc7674a0 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -48,22 +48,22 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.18.0 h1:QkX1vY1JtvDeF6N6EarPrJMHlerVGdTvGQOUWqfeVDs= github.com/DataDog/datadog-api-client-go/v2 v2.18.0/go.mod h1:lHlfhsNQ2qZclvpVQTfrGowUDIdIzAao38A05f9EQpc= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= @@ -134,8 +134,8 @@ github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index 5ce3084be205..8e3125367ade 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -90,6 +90,10 @@ func newTracesExporter( var _ consumer.ConsumeTracesFunc = (*traceExporter)(nil).consumeTraces +// headerComputedStats specifies the HTTP header which indicates whether APM stats +// have already been computed for a payload. +const headerComputedStats = "Datadog-Client-Computed-Stats" + func (exp *traceExporter) consumeTraces( ctx context.Context, td ptrace.Traces, @@ -115,9 +119,13 @@ func (exp *traceExporter) consumeTraces( rspans := td.ResourceSpans() hosts := make(map[string]struct{}) tags := make(map[string]struct{}) + header := make(http.Header) + if noAPMStatsFeatureGate.IsEnabled() { + header[headerComputedStats] = []string{"true"} + } for i := 0; i < rspans.Len(); i++ { rspan := rspans.At(i) - src := exp.agent.OTLPReceiver.ReceiveResourceSpans(ctx, rspan, http.Header{}) + src := exp.agent.OTLPReceiver.ReceiveResourceSpans(ctx, rspan, header) switch src.Kind { case source.HostnameKind: hosts[src.Identifier] = struct{}{} diff --git a/go.mod b/go.mod index b452f3bf17f1..7a395a64dd2c 100644 --- a/go.mod +++ b/go.mod @@ -226,14 +226,14 @@ require ( github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.15.0 // indirect github.com/DataDog/agent-payload/v5 v5.0.89 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.18.0 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect @@ -307,7 +307,7 @@ require ( github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect - github.com/containerd/cgroups v1.1.0 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // indirect github.com/containerd/console v1.0.3 // indirect github.com/containerd/ttrpc v1.2.2 // indirect github.com/coreos/go-oidc v2.2.1+incompatible // indirect diff --git a/go.sum b/go.sum index 1d85377b4989..4db139112da6 100644 --- a/go.sum +++ b/go.sum @@ -161,22 +161,22 @@ github.com/ClickHouse/clickhouse-go/v2 v2.15.0/go.mod h1:kXt1SRq0PIRa6aKZD7TnFnY github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DataDog/agent-payload/v5 v5.0.89 h1:uuLWf/exyNYBnheG9OH2dOWZpCJvaEHX3W9CAd8KarU= github.com/DataDog/agent-payload/v5 v5.0.89/go.mod h1:oQZi1VZp1e3QvlSUX4iphZCpJaFepUxWq0hNXxihKBM= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-api-client-go/v2 v2.18.0 h1:QkX1vY1JtvDeF6N6EarPrJMHlerVGdTvGQOUWqfeVDs= github.com/DataDog/datadog-api-client-go/v2 v2.18.0/go.mod h1:lHlfhsNQ2qZclvpVQTfrGowUDIdIzAao38A05f9EQpc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -451,8 +451,8 @@ github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= -github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= github.com/containerd/containerd v1.7.7 h1:QOC2K4A42RQpcrZyptP6z9EJZnlHfHJUfZrAAHe15q4= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 735a0175b28f..cfe1c7902ff2 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -3,20 +3,20 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/datado go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0017.0.20231026220224-6405e152a2d9 ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect @@ -25,7 +25,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // 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/docker/go-units v0.5.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index a12ae678d6f2..ed08da393211 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -1,19 +1,19 @@ -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= @@ -35,8 +35,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 9485a2fa8f5e..a979feea76f8 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/datad go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.48.1 + github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.0 github.com/DataDog/sketches-go v1.4.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.88.0 @@ -20,13 +20,13 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/trace v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.0 // indirect @@ -34,7 +34,7 @@ require ( github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect - github.com/containerd/cgroups v1.0.4 // indirect + github.com/containerd/cgroups/v3 v3.0.2 // 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/docker/go-units v0.5.0 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index ec32dfcade06..4b832100b120 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -1,19 +1,19 @@ -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1 h1:uS2NzlwpCs+ZBHE9MLK1tGgxJOe2fVbwwjEEu34Kll4= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.48.1/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1 h1:dJC8KQ1XUtM6Pfq3x5MV9KLXnB2Q1lJ70E1hAcxDHKs= -github.com/DataDog/datadog-agent/pkg/proto v0.48.1/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1 h1:5nE6N3JSs2IG3xzMthNFhXfOaXlrsdgqmJ73lndFf8c= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.48.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1 h1:2yhGetREZlomEniLJmt+KIClgsWIKOqnUCIKH1D12Rc= -github.com/DataDog/datadog-agent/pkg/trace v0.48.1/go.mod h1:24Ct0NokFmHNvy+oHkDQ9589fLYAlJcLCFQTWiAzOf4= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1 h1:wPh8rTOGVc212I+Oiek2yALrHOL1UJmS3+XYBv5Wb0Q= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.48.1/go.mod h1:wYr3mEs5nYZuu7u9IkVzMaLmEoPH4cPG9WdastYRSJE= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1 h1:0tOZ2S6G4Y6aeBPbrkL68xGN235kkjNjp71T4rEclVM= -github.com/DataDog/datadog-agent/pkg/util/log v0.48.1/go.mod h1:WxtFyf5kxB/gKKoAJMCtGd0MI7ZrbSjk8wCxTjx55oI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1 h1:xFZ6rpOv00L/20e7Y8rGVOW4wr4y+rHlBydOH9rdKeI= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.48.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1 h1:N7hTFdOBIaPHQ1W98kKs9AvW91WgiMTDD82iH8pyBXI= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.48.1/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2 h1:Y56sdsJotnJmxTzyHvADM2/0VpWzonQrSAeIjHCqk+s= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.49.0-rc.2/go.mod h1:HzySONXnAgSmIQfL6gOv9hWprKJkx8CicuXuUbmgWfo= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 h1:l/VVYTvmuu5iO6Hx3Zh7r9Ax5J0CFDJ/Mc0CXNqiyBk= +github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2 h1:MXrLVVauNLDQnJ0TTY35L1rtKv7YnNU3zl8wtE5sI9g= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.49.0-rc.2/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 h1:ciOBHpTSHrFy/xn/+ana53F3cvPdhR3JGuoHeGa6r+4= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7/go.mod h1:x6SswkmUaSmjAhSPUeVixs/Czr0w9Y5324Anoa6V+xE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2 h1:X3nPQuiTkBVWaBGLb9oEycHhSzMJsgRcb3VNoxlGyYM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.49.0-rc.2/go.mod h1:hVKZ+BweMQiL/dOCPvSPH/66vDSd3A3IeWQPuExkZw0= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2 h1:64AGy6AuNW/7uW+ix55S1iFqadpzLDHYk5LtbHCeSJc= +github.com/DataDog/datadog-agent/pkg/util/log v0.49.0-rc.2/go.mod h1:RvGVny6LcLD0F9/N5OnxPoXKE8GwFtAKCD/viDv0Jw8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2 h1:Z4PwDkI/ML5spAbG1aXbPkWiJ4T4XD2pQqKgfSy/rb8= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.49.0-rc.2/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 h1:SQ6pGb8ppcTnCKoTuaCfZpAhMlTWhEqdIQiVL1Jgpnk= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= github.com/DataDog/datadog-go/v5 v5.1.1 h1:JLZ6s2K1pG2h9GkvEvMdEGqMDyVLEAccdX5TltWcLMU= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= @@ -35,8 +35,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= +github.com/containerd/cgroups/v3 v3.0.2/go.mod h1:JUgITrzdFqp42uI2ryGA+ge0ap/nxzYgkGmIcetmErE= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=