From 546340df7a02ac6f8bf5509e7740ac192c2f9e90 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Tue, 14 Nov 2023 10:46:36 -0500 Subject: [PATCH] [exporter/datadog] Deprecate peer_service_aggregation in favor of peer_tags_aggregation (#29089) **Description:** Deprecate peer_service_aggregation in favor of peer_tags_aggregation. Counterpart of https://github.com/DataDog/datadog-agent/pull/20550. --- .chloggen/dd-deprecate-peer-svc-aggr.yaml | 27 +++++++ .chloggen/dd-peer-tag-aggr.yaml | 27 +++++++ cmd/configschema/go.mod | 19 ++--- cmd/configschema/go.sum | 38 ++++----- cmd/otelcontribcol/go.mod | 19 ++--- cmd/otelcontribcol/go.sum | 38 ++++----- exporter/datadogexporter/config.go | 12 +++ exporter/datadogexporter/config_warnings.go | 7 ++ .../datadogexporter/config_warnings_test.go | 77 +++++++++++++++++++ .../datadogexporter/examples/collector.yaml | 25 ++++-- exporter/datadogexporter/go.mod | 19 ++--- exporter/datadogexporter/go.sum | 38 ++++----- .../datadogexporter/integrationtest/go.mod | 19 ++--- .../datadogexporter/integrationtest/go.sum | 38 ++++----- exporter/datadogexporter/traces_exporter.go | 1 + go.mod | 19 ++--- go.sum | 38 ++++----- testbed/go.mod | 2 +- testbed/go.sum | 4 +- 19 files changed, 324 insertions(+), 143 deletions(-) create mode 100644 .chloggen/dd-deprecate-peer-svc-aggr.yaml create mode 100644 .chloggen/dd-peer-tag-aggr.yaml diff --git a/.chloggen/dd-deprecate-peer-svc-aggr.yaml b/.chloggen/dd-deprecate-peer-svc-aggr.yaml new file mode 100644 index 000000000000..764fe0e27a26 --- /dev/null +++ b/.chloggen/dd-deprecate-peer-svc-aggr.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: deprecation + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Deprecate config `traces::peer_service_aggregation` in favor of `traces::peer_tags_aggregation`" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29089] + +# (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/.chloggen/dd-peer-tag-aggr.yaml b/.chloggen/dd-peer-tag-aggr.yaml new file mode 100644 index 000000000000..750d9bead957 --- /dev/null +++ b/.chloggen/dd-peer-tag-aggr.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: datadogexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Add a new config `traces::peer_tags_aggregation` that enables aggregation of peer related tags in Datadog exporter" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29089] + +# (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 8866b9a7eeb1..e4a2cbe38ece 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -214,16 +214,17 @@ 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.49.0-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel // 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-agent/pkg/obfuscate v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 // 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-sqllexer v0.0.8 // 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.1 // indirect @@ -675,7 +676,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 04c8ecc29cd6..5e002959230b 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -149,27 +149,29 @@ 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.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.50.0-devel h1:lGJKaJlKDbycF6jItLw8ONN8GX3dkN6S+95AvDfGF+s= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel/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-agent/pkg/obfuscate v0.50.0-rc.1 h1:W6IVI3zWwoJGcFagJ/kwltFL1IIErBZzcBy994PQsQE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.1/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 h1:zDhs0MnT72cZOxxbPjkGI00NMYgsydOanBX3GZHuS1I= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 h1:EywptZStgHbDWLScnHfaCj6QNb698DY68pCnPEQrsts= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 h1:A1uj4IMFs4rWp5LRalsqqnoC1f7QuYuN/b6/L7k4KCc= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1/go.mod h1:Q84EzSKpY/HtasusZM4ZPuYqbPQEbmIcAGzd7tXUX1I= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 h1:iJSVz+YsndcMA/yYNih/qmuvwD1AR7IYX0cXXePpeys= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1/go.mod h1:JUOECuM5XcoxjEPs30C568vGBWtqScjnsC2KXY1OQ7Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 h1:NK2kcRdv/r0WycAlGD2JFSmOcNvazzilPvZzk3l105g= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1/go.mod h1:RMBDVajNx78CpFHnbat0aIGcwVQZp8s+smRlcJkvZGg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 h1:SgaCKuX9e3O5eLRIr+zqW1dlIw/TP3RDKQZUa2FfF8c= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 h1:aCDYC/AkDS/EOm4GV1bFmiev6pTt+Qjj1yGBJv8U7+k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1/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= 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-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7nM0E= +github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= @@ -2160,8 +2162,8 @@ google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdS google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 939cc06827b5..73c2146146cd 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -254,16 +254,17 @@ 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.49.0-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel // 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-agent/pkg/obfuscate v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 // 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-sqllexer v0.0.8 // 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.1 // indirect @@ -686,7 +687,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 0f63a7670b6b..69d538588315 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -148,27 +148,29 @@ 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.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.50.0-devel h1:lGJKaJlKDbycF6jItLw8ONN8GX3dkN6S+95AvDfGF+s= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel/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-agent/pkg/obfuscate v0.50.0-rc.1 h1:W6IVI3zWwoJGcFagJ/kwltFL1IIErBZzcBy994PQsQE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.1/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 h1:zDhs0MnT72cZOxxbPjkGI00NMYgsydOanBX3GZHuS1I= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 h1:EywptZStgHbDWLScnHfaCj6QNb698DY68pCnPEQrsts= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 h1:A1uj4IMFs4rWp5LRalsqqnoC1f7QuYuN/b6/L7k4KCc= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1/go.mod h1:Q84EzSKpY/HtasusZM4ZPuYqbPQEbmIcAGzd7tXUX1I= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 h1:iJSVz+YsndcMA/yYNih/qmuvwD1AR7IYX0cXXePpeys= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1/go.mod h1:JUOECuM5XcoxjEPs30C568vGBWtqScjnsC2KXY1OQ7Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 h1:NK2kcRdv/r0WycAlGD2JFSmOcNvazzilPvZzk3l105g= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1/go.mod h1:RMBDVajNx78CpFHnbat0aIGcwVQZp8s+smRlcJkvZGg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 h1:SgaCKuX9e3O5eLRIr+zqW1dlIw/TP3RDKQZUa2FfF8c= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 h1:aCDYC/AkDS/EOm4GV1bFmiev6pTt+Qjj1yGBJv8U7+k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1/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= 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-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7nM0E= +github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= @@ -2157,8 +2159,8 @@ google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdS google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 3d1c67c79307..87a3c0cf55e3 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -277,8 +277,20 @@ type TracesConfig struct { // For the best experience with `peer.service`, it is recommended to also enable `compute_stats_by_span_kind`. // If enabling both causes the datadog exporter to consume too many resources, try disabling `compute_stats_by_span_kind` first. // If the overhead remains high, it will be due to a high cardinality of `peer.service` values from the traces. You may need to check your instrumentation. + // Deprecated: Please use PeerTagsAggregation instead PeerServiceAggregation bool `mapstructure:"peer_service_aggregation"` + // If set to true, enables aggregation of peer related tags (e.g., `peer.service`, `db.instance`, etc.) in the datadog exporter. + // If disabled, aggregated trace stats will not include these tags as dimensions on trace metrics. + // For the best experience with peer tags, Datadog also recommends enabling `compute_stats_by_span_kind`. + // If you are using an OTel tracer, it's best to have both enabled because client/producer spans with relevant peer tags + // may not be marked by the datadog exporter as top-level spans. + // If enabling both causes the datadog exporter to consume too many resources, try disabling `compute_stats_by_span_kind` first. + // A high cardinality of peer tags or APM resources can also contribute to higher CPU and memory consumption. + // You can check for the cardinality of these fields by making trace search queries in the Datadog UI. + // The default list of peer tags can be found in https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/stats/concentrator.go. + PeerTagsAggregation bool `mapstructure:"peer_tags_aggregation"` + // TraceBuffer specifies the number of Datadog Agent TracerPayloads to buffer before dropping. // The default value is 0, meaning the Datadog Agent TracerPayloads are unbuffered. TraceBuffer int `mapstructure:"trace_buffer"` diff --git a/exporter/datadogexporter/config_warnings.go b/exporter/datadogexporter/config_warnings.go index dffd9d6d3946..8197903d2285 100644 --- a/exporter/datadogexporter/config_warnings.go +++ b/exporter/datadogexporter/config_warnings.go @@ -32,6 +32,13 @@ var renamedSettings = []deprecatedError{ c.Metrics.HistConfig.SendAggregations = c.Metrics.HistConfig.SendCountSum }, }, + { + oldName: "traces::peer_service_aggregation", + newName: "traces::peer_tags_aggregation", + updateFn: func(c *Config) { + c.Traces.PeerTagsAggregation = c.Traces.PeerServiceAggregation + }, + }, } // Error implements the error interface. diff --git a/exporter/datadogexporter/config_warnings_test.go b/exporter/datadogexporter/config_warnings_test.go index baab9c5eee2d..ea2220d1fdd2 100644 --- a/exporter/datadogexporter/config_warnings_test.go +++ b/exporter/datadogexporter/config_warnings_test.go @@ -94,3 +94,80 @@ func TestSendAggregations(t *testing.T) { } } + +func TestPeerTags(t *testing.T) { + tests := []struct { + name string + cfgMap *confmap.Conf + expectedPeerTagsValue bool + warnings []string + err string + }{ + { + name: "both traces::peer_service_aggregation and traces::peer_tags_aggregation", + cfgMap: confmap.NewFromStringMap(map[string]any{ + "traces": map[string]any{ + "peer_service_aggregation": true, + "peer_tags_aggregation": true, + }, + }), + err: "\"traces::peer_service_aggregation\" and \"traces::peer_tags_aggregation\" can't be both set at the same time: use \"traces::peer_tags_aggregation\" only instead", + }, + { + name: "traces::peer_service_aggregation set to true", + cfgMap: confmap.NewFromStringMap(map[string]any{ + "traces": map[string]any{ + "peer_service_aggregation": true, + }, + }), + expectedPeerTagsValue: true, + warnings: []string{ + "\"traces::peer_service_aggregation\" has been deprecated in favor of \"traces::peer_tags_aggregation\"", + }, + }, + { + name: "traces::peer_service_aggregation set to false", + cfgMap: confmap.NewFromStringMap(map[string]any{ + "traces": map[string]any{ + "peer_service_aggregation": false, + }, + }), + warnings: []string{ + "\"traces::peer_service_aggregation\" has been deprecated in favor of \"traces::peer_tags_aggregation\"", + }, + }, + { + name: "traces::peer_service_aggregation and traces::peer_tags_aggregation unset", + cfgMap: confmap.New(), + expectedPeerTagsValue: false, + }, + { + name: "traces::peer_tags_aggregation set", + cfgMap: confmap.NewFromStringMap(map[string]any{ + "traces": map[string]any{ + "peer_tags_aggregation": true, + }, + }), + expectedPeerTagsValue: true, + }, + } + + for _, testInstance := range tests { + t.Run(testInstance.name, func(t *testing.T) { + f := NewFactory() + cfg := f.CreateDefaultConfig().(*Config) + err := cfg.Unmarshal(testInstance.cfgMap) + if err != nil || testInstance.err != "" { + assert.EqualError(t, err, testInstance.err) + } else { + assert.Equal(t, testInstance.expectedPeerTagsValue, cfg.Traces.PeerTagsAggregation) + var warningStr []string + for _, warning := range cfg.warnings { + warningStr = append(warningStr, warning.Error()) + } + assert.ElementsMatch(t, testInstance.warnings, warningStr) + } + }) + } + +} diff --git a/exporter/datadogexporter/examples/collector.yaml b/exporter/datadogexporter/examples/collector.yaml index 8a5c692ede11..829c1775bd92 100644 --- a/exporter/datadogexporter/examples/collector.yaml +++ b/exporter/datadogexporter/examples/collector.yaml @@ -325,25 +325,40 @@ exporters: # # span_name_as_resource_name: true - ## @param compute_stats_by_span_kind - enables APM stats computation based on `span.kind` + ## @param compute_stats_by_span_kind - enables APM stats computation based on `span.kind` - optional ## If set to true, enables an additional stats computation check on spans to see they have an eligible `span.kind` (server, consumer, client, producer). ## If enabled, a span with an eligible `span.kind` will have stats computed. If disabled, only top-level and measured spans will have stats computed. ## NOTE: For stats computed from OTel traces, only top-level spans are considered when this option is off. # # compute_stats_by_span_kind: true - ## @param peer_service_aggregation - enables `peer.service` aggregation on trace stats in Datadog exporter + ## @param peer_service_aggregation - enables `peer.service` aggregation on trace stats in Datadog exporter - optional ## If set to true, enables `peer.service` aggregation in the exporter. If disabled, aggregated trace stats will not include `peer.service` as a dimension. ## For the best experience with `peer.service`, it is recommended to also enable `compute_stats_by_span_kind`. ## If enabling both causes the datadog exporter to consume too many resources, try disabling `compute_stats_by_span_kind` first. ## If the overhead remains high, it will be due to a high cardinality of `peer.service` values from the traces. You may need to check your instrumentation. + ## Deprecated: Please use peer_tags_aggregation instead # # peer_service_aggregation: true - ## @param trace_buffer - specifies the number of Datadog Agent TracerPayloads to buffer before dropping. - ## If unset, the default value is 0, meaning the Datadog Agent TracerPayloads are unbuffered. + ## @param peer_tags_aggregation - enables aggregation of peer related tags in Datadog exporter - optional + ## If set to true, enables aggregation of peer related tags (e.g., `peer.service`, `db.instance`, etc.) in Datadog exporter. + ## If disabled, aggregated trace stats will not include these tags as dimensions on trace metrics. + ## For the best experience with peer tags, Datadog also recommends enabling `compute_stats_by_span_kind`. + ## If you are using an OTel tracer, it's best to have both enabled because client/producer spans with relevant peer tags + ## may not be marked by Datadog exporter as top-level spans. + ## If enabling both causes Datadog exporter to consume too many resources, try disabling `compute_stats_by_span_kind` first. + ## A high cardinality of peer tags or APM resources can also contribute to higher CPU and memory consumption. + ## You can check for the cardinality of these fields by making trace search queries in the Datadog UI. + ## The default list of peer tags can be found in https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/stats/concentrator.go. + # + # peer_tags_aggregation: false + + ## @param trace_buffer - specifies the number of outgoing trace payloads to buffer before dropping - optional + ## If unset, the default value is 0, meaning the outgoing trace payloads are unbuffered. ## If you start seeing log messages like `Payload in channel full. Dropped 1 payload.` in the datadog exporter, consider - ## setting a higher `trace_buffer` to avoid traces being dropped. + ## setting a higher `trace_buffer` to avoid traces being dropped. + # # trace_buffer: 10 ## @param host_metadata - custom object - optional diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index dc562159fe65..7ec514edda59 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.50.0-devel - github.com/DataDog/datadog-agent/pkg/trace v0.50.0-devel.0.20231030140030-aa8a206e6ac7 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 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.1 @@ -54,13 +54,14 @@ 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.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-agent/pkg/obfuscate v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 // indirect github.com/DataDog/datadog-go/v5 v5.1.1 // indirect + github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect @@ -218,7 +219,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 484f33fd5be8..957ddd69f47d 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -50,27 +50,29 @@ 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.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.50.0-devel h1:lGJKaJlKDbycF6jItLw8ONN8GX3dkN6S+95AvDfGF+s= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel/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-agent/pkg/obfuscate v0.50.0-rc.1 h1:W6IVI3zWwoJGcFagJ/kwltFL1IIErBZzcBy994PQsQE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.1/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 h1:zDhs0MnT72cZOxxbPjkGI00NMYgsydOanBX3GZHuS1I= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 h1:EywptZStgHbDWLScnHfaCj6QNb698DY68pCnPEQrsts= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 h1:A1uj4IMFs4rWp5LRalsqqnoC1f7QuYuN/b6/L7k4KCc= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1/go.mod h1:Q84EzSKpY/HtasusZM4ZPuYqbPQEbmIcAGzd7tXUX1I= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 h1:iJSVz+YsndcMA/yYNih/qmuvwD1AR7IYX0cXXePpeys= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1/go.mod h1:JUOECuM5XcoxjEPs30C568vGBWtqScjnsC2KXY1OQ7Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 h1:NK2kcRdv/r0WycAlGD2JFSmOcNvazzilPvZzk3l105g= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1/go.mod h1:RMBDVajNx78CpFHnbat0aIGcwVQZp8s+smRlcJkvZGg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 h1:SgaCKuX9e3O5eLRIr+zqW1dlIw/TP3RDKQZUa2FfF8c= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 h1:aCDYC/AkDS/EOm4GV1bFmiev6pTt+Qjj1yGBJv8U7+k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1/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= 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-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7nM0E= +github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= @@ -1055,8 +1057,8 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index b8a278081130..e28698062f15 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.50.0-devel + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 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,15 +30,16 @@ 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.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-agent/pkg/obfuscate v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 // 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-sqllexer v0.0.8 // 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.1 // indirect @@ -191,7 +192,7 @@ require ( gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 7eb8b079e41d..0c1ccb93f936 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -48,26 +48,28 @@ 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.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.50.0-devel h1:lGJKaJlKDbycF6jItLw8ONN8GX3dkN6S+95AvDfGF+s= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel/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-agent/pkg/obfuscate v0.50.0-rc.1 h1:W6IVI3zWwoJGcFagJ/kwltFL1IIErBZzcBy994PQsQE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.1/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 h1:zDhs0MnT72cZOxxbPjkGI00NMYgsydOanBX3GZHuS1I= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 h1:EywptZStgHbDWLScnHfaCj6QNb698DY68pCnPEQrsts= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 h1:A1uj4IMFs4rWp5LRalsqqnoC1f7QuYuN/b6/L7k4KCc= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1/go.mod h1:Q84EzSKpY/HtasusZM4ZPuYqbPQEbmIcAGzd7tXUX1I= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 h1:iJSVz+YsndcMA/yYNih/qmuvwD1AR7IYX0cXXePpeys= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1/go.mod h1:JUOECuM5XcoxjEPs30C568vGBWtqScjnsC2KXY1OQ7Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 h1:NK2kcRdv/r0WycAlGD2JFSmOcNvazzilPvZzk3l105g= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1/go.mod h1:RMBDVajNx78CpFHnbat0aIGcwVQZp8s+smRlcJkvZGg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 h1:SgaCKuX9e3O5eLRIr+zqW1dlIw/TP3RDKQZUa2FfF8c= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 h1:aCDYC/AkDS/EOm4GV1bFmiev6pTt+Qjj1yGBJv8U7+k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1/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= github.com/DataDog/datadog-go/v5 v5.1.1/go.mod h1:KhiYb2Badlv9/rofz+OznKoEF5XKTonWyhx5K83AP8E= +github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7nM0E= +github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= @@ -947,8 +949,8 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index 8e3125367ade..71a02caf1b0c 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -199,6 +199,7 @@ func newTraceAgent(ctx context.Context, params exporter.CreateSettings, cfg *Con acfg.SkipSSLValidation = cfg.LimitedHTTPClientSettings.TLSSetting.InsecureSkipVerify acfg.ComputeStatsBySpanKind = cfg.Traces.ComputeStatsBySpanKind acfg.PeerServiceAggregation = cfg.Traces.PeerServiceAggregation + acfg.PeerTagsAggregation = cfg.Traces.PeerTagsAggregation if v := cfg.Traces.flushInterval; v > 0 { acfg.TraceWriter.FlushPeriodSeconds = v } diff --git a/go.mod b/go.mod index 51ea6d0905e7..b84555300224 100644 --- a/go.mod +++ b/go.mod @@ -226,16 +226,17 @@ 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.49.0-rc.2 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel // 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-agent/pkg/obfuscate v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 // 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-sqllexer v0.0.8 // 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.1 // indirect @@ -672,7 +673,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 9b280ca60bd0..6cd468c2aa6f 100644 --- a/go.sum +++ b/go.sum @@ -153,27 +153,29 @@ 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.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.50.0-devel h1:lGJKaJlKDbycF6jItLw8ONN8GX3dkN6S+95AvDfGF+s= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel/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-agent/pkg/obfuscate v0.50.0-rc.1 h1:W6IVI3zWwoJGcFagJ/kwltFL1IIErBZzcBy994PQsQE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.1/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 h1:zDhs0MnT72cZOxxbPjkGI00NMYgsydOanBX3GZHuS1I= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1 h1:EywptZStgHbDWLScnHfaCj6QNb698DY68pCnPEQrsts= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.1/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1 h1:A1uj4IMFs4rWp5LRalsqqnoC1f7QuYuN/b6/L7k4KCc= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.1/go.mod h1:Q84EzSKpY/HtasusZM4ZPuYqbPQEbmIcAGzd7tXUX1I= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1 h1:iJSVz+YsndcMA/yYNih/qmuvwD1AR7IYX0cXXePpeys= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.1/go.mod h1:JUOECuM5XcoxjEPs30C568vGBWtqScjnsC2KXY1OQ7Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1 h1:NK2kcRdv/r0WycAlGD2JFSmOcNvazzilPvZzk3l105g= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.1/go.mod h1:RMBDVajNx78CpFHnbat0aIGcwVQZp8s+smRlcJkvZGg= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1 h1:SgaCKuX9e3O5eLRIr+zqW1dlIw/TP3RDKQZUa2FfF8c= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.1/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1 h1:aCDYC/AkDS/EOm4GV1bFmiev6pTt+Qjj1yGBJv8U7+k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.1/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= 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-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7nM0E= +github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc h1:gtlKB6B50/UEuFm1LeMn0R5a+tubx69OecPqxfXJDmU= @@ -2164,8 +2166,8 @@ google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdS google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= diff --git a/testbed/go.mod b/testbed/go.mod index 7f70f3760649..97b23d644f31 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -80,7 +80,7 @@ require ( github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 // indirect github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 16c21dd5dfee..3a5204c6b969 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -70,8 +70,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkM github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel h1:lGJKaJlKDbycF6jItLw8ONN8GX3dkN6S+95AvDfGF+s= -github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel/go.mod h1:A4qG1PwNPYcM391xyksJ47ZZjknSAQVvNdXAXsrR+N0= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 h1:zDhs0MnT72cZOxxbPjkGI00NMYgsydOanBX3GZHuS1I= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 h1:N2BRKjJ/c+ipDwt5b+ijqEc2EsmK3zXq2lNeIPnSwMI= github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02/go.mod h1:EalMiS87Guu6PkLdxz7gmWqi+dRs9sjYLTOyTrM/aVU= github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20201009091607-ce4e57cdf8f4/go.mod h1:cRy7lwapA3jcjnX74kU6NFkXaRGQyB0l/QZA0IwYGEQ=