diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 8ef1fd373e3f..bd1e93c4cc2c 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -22,8 +22,8 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 // indirect github.com/gocql/gocql v1.6.0 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.91.0 // indirect @@ -215,23 +215,23 @@ require ( github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.16.0 // indirect - github.com/DataDog/agent-payload/v5 v5.0.89 // 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/agent-payload/v5 v5.0.101 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.20.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 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 32f5c4ed3765..277cb481cb1f 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -155,26 +155,26 @@ github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTY github.com/ClickHouse/clickhouse-go/v2 v2.16.0 h1:rhMfnPewXPnY4Q4lQRGdYuTLRBRKJEIEYHtbUMrzmvI= github.com/ClickHouse/clickhouse-go/v2 v2.16.0/go.mod h1:J7SPfIxwR+x4mQ+o8MLSe0oY50NNntEqCIjFe/T1VPM= github.com/DATA-DOG/go-sqlmock v1.5.1 h1:FK6RCIUSfmbnI/imIICmboyQBkOckutaa6R5YYlLZyo= -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.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/agent-payload/v5 v5.0.101 h1:/MjtenucwoRzv1cafv46fcvserECivPKEWDsemT2Grg= +github.com/DataDog/agent-payload/v5 v5.0.101/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0 h1:80T+UuTh+28qODc2vw+HxzMoIu0dYBT7/RCHXxdYpJE= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= 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= @@ -182,19 +182,19 @@ github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7 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= -github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1 h1:16YkGLmeJH830m3dG0owtdSMXDkmTZdRd1EWZ1XIO6M= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1/go.mod h1:re1FCVuKWovntr4bODIUe+iYT2Al0gbS0WK726XLz7w= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 h1:oFW083L4oIyrYL06/3yCU5lnslaj8haSmQidFDK9rQk= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 h1:Kp4byxXZG8HmrbCH6rVhq/yWnW/ddKt0TqtjWzlj4N0= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3/go.mod h1:oN2FZ3z4WiBkfsexz6Uc/IU+yjlQ+xrMpDmVnj8fF/Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 h1:y8rL7rCty4VhPFJi6TgOZXI7MrGRVYNV0oqbNblWi/c= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0/go.mod h1:x+QjxvvVxewuyNymMjR+2fm0LAQSMF2mhw7Yhx61jp4= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 h1:FbqbNsZ3179TUV+y932rKhhTxHMS5adlBb+9om1heGY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0/go.mod h1:v0FMEai3NccZjZr2jmX4t8Nobh3R8KxoRuj6PExoTRo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -760,7 +760,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -1415,7 +1414,7 @@ github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAj github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= +github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -1527,10 +1526,10 @@ github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UD github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1983,11 +1982,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1999,6 +1996,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 6e183900a817..367c69929b48 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -259,25 +259,25 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.16.0 // indirect - github.com/DataDog/agent-payload/v5 v5.0.89 // 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/agent-payload/v5 v5.0.101 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.20.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 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index c9a544925dad..b52f9d795377 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -154,26 +154,26 @@ github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTY github.com/ClickHouse/clickhouse-go/v2 v2.16.0 h1:rhMfnPewXPnY4Q4lQRGdYuTLRBRKJEIEYHtbUMrzmvI= github.com/ClickHouse/clickhouse-go/v2 v2.16.0/go.mod h1:J7SPfIxwR+x4mQ+o8MLSe0oY50NNntEqCIjFe/T1VPM= github.com/DATA-DOG/go-sqlmock v1.5.1 h1:FK6RCIUSfmbnI/imIICmboyQBkOckutaa6R5YYlLZyo= -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.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/agent-payload/v5 v5.0.101 h1:/MjtenucwoRzv1cafv46fcvserECivPKEWDsemT2Grg= +github.com/DataDog/agent-payload/v5 v5.0.101/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0 h1:80T+UuTh+28qODc2vw+HxzMoIu0dYBT7/RCHXxdYpJE= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= 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= @@ -181,19 +181,19 @@ github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7 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= -github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1 h1:16YkGLmeJH830m3dG0owtdSMXDkmTZdRd1EWZ1XIO6M= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1/go.mod h1:re1FCVuKWovntr4bODIUe+iYT2Al0gbS0WK726XLz7w= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 h1:oFW083L4oIyrYL06/3yCU5lnslaj8haSmQidFDK9rQk= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 h1:Kp4byxXZG8HmrbCH6rVhq/yWnW/ddKt0TqtjWzlj4N0= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3/go.mod h1:oN2FZ3z4WiBkfsexz6Uc/IU+yjlQ+xrMpDmVnj8fF/Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 h1:y8rL7rCty4VhPFJi6TgOZXI7MrGRVYNV0oqbNblWi/c= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0/go.mod h1:x+QjxvvVxewuyNymMjR+2fm0LAQSMF2mhw7Yhx61jp4= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 h1:FbqbNsZ3179TUV+y932rKhhTxHMS5adlBb+9om1heGY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0/go.mod h1:v0FMEai3NccZjZr2jmX4t8Nobh3R8KxoRuj6PExoTRo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -757,7 +757,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -1411,7 +1410,7 @@ github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAj github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= +github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -1522,10 +1521,10 @@ github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UD github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1978,11 +1977,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1994,6 +1991,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/connector/datadogconnector/connector.go b/connector/datadogconnector/connector.go index 7e8efd7ffacf..69c7a0f1f99e 100644 --- a/connector/datadogconnector/connector.go +++ b/connector/datadogconnector/connector.go @@ -41,18 +41,18 @@ type connectorImp struct { var _ component.Component = (*connectorImp)(nil) // testing that the connectorImp properly implements the type Component interface // function to create a new connector -func newConnector(logger *zap.Logger, _ component.Config, metricsConsumer consumer.Metrics, tracesConsumer consumer.Traces) (*connectorImp, error) { - logger.Info("Building datadog connector") +func newConnector(set component.TelemetrySettings, _ component.Config, metricsConsumer consumer.Metrics, tracesConsumer consumer.Traces) (*connectorImp, error) { + set.Logger.Info("Building datadog connector") in := make(chan *pb.StatsPayload, 100) - trans, err := metrics.NewTranslator(logger) + trans, err := metrics.NewTranslator(set) ctx := context.Background() if err != nil { return nil, err } return &connectorImp{ - logger: logger, + logger: set.Logger, agent: datadog.NewAgent(ctx, in), translator: trans, in: in, diff --git a/connector/datadogconnector/factory.go b/connector/datadogconnector/factory.go index 5d1d6673426c..a209a6af9405 100644 --- a/connector/datadogconnector/factory.go +++ b/connector/datadogconnector/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { // defines the consumer type of the connector // we want to consume traces and export metrics therefore define nextConsumer as metrics, consumer is the next component in the pipeline func createTracesToMetricsConnector(_ context.Context, params connector.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (connector.Traces, error) { - c, err := newConnector(params.Logger, cfg, nextConsumer, nil) + c, err := newConnector(params.TelemetrySettings, cfg, nextConsumer, nil) if err != nil { return nil, err } @@ -44,7 +44,7 @@ func createTracesToMetricsConnector(_ context.Context, params connector.CreateSe } func createTracesToTracesConnector(_ context.Context, params connector.CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (connector.Traces, error) { - c, err := newConnector(params.Logger, cfg, nil, nextConsumer) + c, err := newConnector(params.TelemetrySettings, cfg, nil, nextConsumer) if err != nil { return nil, err } diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 08f6303ce9f4..b7603aa5a5ad 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.91.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.91.0 @@ -15,17 +15,18 @@ require ( ) require ( - 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.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // 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/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -84,7 +85,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.15.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // 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/yaml.v2 v2.4.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 561af9e621ba..c15f9773d4d9 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -1,30 +1,32 @@ -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.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/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-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/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 h1:ly/egks++IqejMVPcp0OWV1fcL+Nsq4EHF48AAQPKu4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -178,6 +180,8 @@ go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0= go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -245,8 +249,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +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.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index f080683d968d..6b78f00f3310 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -3,16 +3,16 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado go 1.20 require ( - github.com/DataDog/agent-payload/v5 v5.0.89 - 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 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 + github.com/DataDog/agent-payload/v5 v5.0.101 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 + github.com/DataDog/datadog-api-client-go/v2 v2.20.0 + github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 github.com/DataDog/sketches-go v1.4.3 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 github.com/aws/aws-sdk-go v1.49.1 @@ -65,12 +65,12 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // 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-agent/pkg/obfuscate v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // 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 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 05115a36204d..ea04dd3889fd 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -63,26 +63,26 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= 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/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.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/agent-payload/v5 v5.0.101 h1:/MjtenucwoRzv1cafv46fcvserECivPKEWDsemT2Grg= +github.com/DataDog/agent-payload/v5 v5.0.101/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0 h1:80T+UuTh+28qODc2vw+HxzMoIu0dYBT7/RCHXxdYpJE= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= 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= @@ -90,19 +90,19 @@ github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7 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= -github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1 h1:16YkGLmeJH830m3dG0owtdSMXDkmTZdRd1EWZ1XIO6M= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1/go.mod h1:re1FCVuKWovntr4bODIUe+iYT2Al0gbS0WK726XLz7w= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 h1:oFW083L4oIyrYL06/3yCU5lnslaj8haSmQidFDK9rQk= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 h1:Kp4byxXZG8HmrbCH6rVhq/yWnW/ddKt0TqtjWzlj4N0= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3/go.mod h1:oN2FZ3z4WiBkfsexz6Uc/IU+yjlQ+xrMpDmVnj8fF/Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 h1:y8rL7rCty4VhPFJi6TgOZXI7MrGRVYNV0oqbNblWi/c= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0/go.mod h1:x+QjxvvVxewuyNymMjR+2fm0LAQSMF2mhw7Yhx61jp4= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 h1:FbqbNsZ3179TUV+y932rKhhTxHMS5adlBb+9om1heGY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0/go.mod h1:v0FMEai3NccZjZr2jmX4t8Nobh3R8KxoRuj6PExoTRo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= @@ -335,7 +335,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -666,7 +665,7 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUt github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= +github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -699,6 +698,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= @@ -710,10 +710,10 @@ github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU= github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= @@ -1015,10 +1015,8 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1027,6 +1025,8 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 1c71206dce5d..7f40d1a03a14 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-rc.1 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.91.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.91.0 @@ -29,24 +29,24 @@ require ( cloud.google.com/go/compute v1.23.3 // 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/agent-payload/v5 v5.0.89 // 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/agent-payload/v5 v5.0.101 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.20.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 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 // indirect @@ -87,8 +87,6 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.5.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/imdario/mergo v0.3.16 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 555a191cbafd..86e43eb5481d 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -52,45 +52,45 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw72xHJc34BNNykqSOeEJDAWkhf0u12/Jk= 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/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.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/agent-payload/v5 v5.0.101 h1:/MjtenucwoRzv1cafv46fcvserECivPKEWDsemT2Grg= +github.com/DataDog/agent-payload/v5 v5.0.101/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0 h1:80T+UuTh+28qODc2vw+HxzMoIu0dYBT7/RCHXxdYpJE= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= 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= -github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1 h1:16YkGLmeJH830m3dG0owtdSMXDkmTZdRd1EWZ1XIO6M= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1/go.mod h1:re1FCVuKWovntr4bODIUe+iYT2Al0gbS0WK726XLz7w= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 h1:oFW083L4oIyrYL06/3yCU5lnslaj8haSmQidFDK9rQk= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 h1:Kp4byxXZG8HmrbCH6rVhq/yWnW/ddKt0TqtjWzlj4N0= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3/go.mod h1:oN2FZ3z4WiBkfsexz6Uc/IU+yjlQ+xrMpDmVnj8fF/Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 h1:y8rL7rCty4VhPFJi6TgOZXI7MrGRVYNV0oqbNblWi/c= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0/go.mod h1:x+QjxvvVxewuyNymMjR+2fm0LAQSMF2mhw7Yhx61jp4= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 h1:FbqbNsZ3179TUV+y932rKhhTxHMS5adlBb+9om1heGY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0/go.mod h1:v0FMEai3NccZjZr2jmX4t8Nobh3R8KxoRuj6PExoTRo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= @@ -293,7 +293,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -333,14 +332,11 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 h1:6UKoz5ujsI55KNpsJH3UwCq3T8k github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y= github.com/hashicorp/consul/api v1.26.1 h1:5oSXOO5fboPZeW5SN+TdGFP/BILDgBm19OrPZ/pICIM= github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= -github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -531,7 +527,7 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/scaleway/scaleway-sdk-go v1.0.0-beta.21 h1:yWfiTPwYxB0l5fGMhl/G+liULugVIHD9AU77iNLrURQ= github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAjPbcMsODrTQUpJ02eNLUoxBg= github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= +github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -562,15 +558,16 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU= github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/vmihailenco/msgpack/v4 v4.3.12 h1:07s4sz9IReOgdikxLTKNbBdqDMLsjPKXwvCazn8G65U= @@ -849,13 +846,13 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= diff --git a/exporter/datadogexporter/internal/metrics/consumer_test.go b/exporter/datadogexporter/internal/metrics/consumer_test.go index 37bceedf1861..d9b84df03367 100644 --- a/exporter/datadogexporter/internal/metrics/consumer_test.go +++ b/exporter/datadogexporter/internal/metrics/consumer_test.go @@ -14,6 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/pdata/pmetric" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "go.uber.org/zap" @@ -28,7 +29,9 @@ func (t testProvider) Source(context.Context) (source.Source, error) { } func newTranslator(t *testing.T, logger *zap.Logger) *metrics.Translator { - tr, err := metrics.NewTranslator(logger, + set := componenttest.NewNopTelemetrySettings() + set.Logger = logger + tr, err := metrics.NewTranslator(set, metrics.WithHistogramMode(metrics.HistogramModeDistributions), metrics.WithNumberMode(metrics.NumberModeCumulativeToDelta), metrics.WithFallbackSourceProvider(testProvider("fallbackHostname")), diff --git a/exporter/datadogexporter/logs_exporter_test.go b/exporter/datadogexporter/logs_exporter_test.go index 7f01c3629af9..f2e9fb5d1ab4 100644 --- a/exporter/datadogexporter/logs_exporter_test.go +++ b/exporter/datadogexporter/logs_exporter_test.go @@ -8,7 +8,6 @@ import ( "encoding/binary" "fmt" "testing" - "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -21,6 +20,8 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/traceutil" ) +const timeFormatString = "2006-01-02T15:04:05.000Z07:00" + func TestLogsExporter(t *testing.T) { lr := testdata.GenerateLogsOneLogRecord() ld := lr.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0) @@ -44,7 +45,7 @@ func TestLogsExporter(t *testing.T) { "message": ld.Body().AsString(), "app": "server", "instance_num": "1", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "dd.span_id": fmt.Sprintf("%d", spanIDToUint64(ld.SpanID())), "dd.trace_id": fmt.Sprintf("%d", traceIDToUint64(ld.TraceID())), @@ -74,7 +75,7 @@ func TestLogsExporter(t *testing.T) { "message": "hello", "app": "server", "instance_num": "1", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "dd.span_id": fmt.Sprintf("%d", spanIDToUint64(ld.SpanID())), "dd.trace_id": fmt.Sprintf("%d", traceIDToUint64(ld.TraceID())), @@ -104,7 +105,7 @@ func TestLogsExporter(t *testing.T) { "message": ld.Body().AsString(), "app": "server", "instance_num": "1", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "dd.span_id": fmt.Sprintf("%d", spanIDToUint64(ld.SpanID())), "dd.trace_id": fmt.Sprintf("%d", traceIDToUint64(ld.TraceID())), @@ -136,7 +137,7 @@ func TestLogsExporter(t *testing.T) { "message": ld.Body().AsString(), "app": "server", "instance_num": "1", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "dd.span_id": fmt.Sprintf("%d", spanIDToUint64(ld.SpanID())), "dd.trace_id": fmt.Sprintf("%d", traceIDToUint64(ld.TraceID())), @@ -152,7 +153,7 @@ func TestLogsExporter(t *testing.T) { "message": "something happened", "env": "dev", "customer": "acme", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "ddtags": "tag1:true,otel_source:datadog_exporter", "otel.severity_text": "Info", @@ -180,7 +181,7 @@ func TestLogsExporter(t *testing.T) { "message": ld.Body().AsString(), "app": "server", "instance_num": "1", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "dd.span_id": fmt.Sprintf("%d", spanIDToUint64(ld.SpanID())), "dd.trace_id": fmt.Sprintf("%d", traceIDToUint64(ld.TraceID())), @@ -196,7 +197,7 @@ func TestLogsExporter(t *testing.T) { "message": "something happened", "env": "dev", "customer": "acme", - "@timestamp": testdata.TestLogTime.Format(time.RFC3339), + "@timestamp": testdata.TestLogTime.Format(timeFormatString), "status": "Info", "ddtags": "tag2:true,otel_source:datadog_exporter", "otel.severity_text": "Info", diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 01f0342786f1..b0144727ebd0 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -18,6 +18,7 @@ import ( "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" otlpmetrics "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" @@ -50,7 +51,7 @@ type metricsExporter struct { } // translatorFromConfig creates a new metrics translator from the exporter -func translatorFromConfig(logger *zap.Logger, cfg *Config, sourceProvider source.Provider) (*otlpmetrics.Translator, error) { +func translatorFromConfig(set component.TelemetrySettings, cfg *Config, sourceProvider source.Provider) (*otlpmetrics.Translator, error) { options := []otlpmetrics.TranslatorOption{ otlpmetrics.WithDeltaTTL(cfg.Metrics.DeltaTTL), otlpmetrics.WithFallbackSourceProvider(sourceProvider), @@ -82,7 +83,7 @@ func translatorFromConfig(logger *zap.Logger, cfg *Config, sourceProvider source options = append(options, otlpmetrics.WithInitialCumulMonoValueMode( otlpmetrics.InitialCumulMonoValueMode(cfg.Metrics.SumConfig.InitialCumulativeMonotonicMode))) - return otlpmetrics.NewTranslator(logger, options...) + return otlpmetrics.NewTranslator(set, options...) } func newMetricsExporter( @@ -94,7 +95,7 @@ func newMetricsExporter( apmStatsProcessor api.StatsProcessor, metadataReporter *inframetadata.Reporter, ) (*metricsExporter, error) { - tr, err := translatorFromConfig(params.Logger, cfg, sourceProvider) + tr, err := translatorFromConfig(params.TelemetrySettings, cfg, sourceProvider) if err != nil { return nil, err } diff --git a/exporter/datadogexporter/metrics_exporter_test.go b/exporter/datadogexporter/metrics_exporter_test.go index 8dcf3d792a47..8bb134e86d83 100644 --- a/exporter/datadogexporter/metrics_exporter_test.go +++ b/exporter/datadogexporter/metrics_exporter_test.go @@ -23,6 +23,7 @@ import ( "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confignet" "go.opentelemetry.io/collector/exporter/exportertest" "go.opentelemetry.io/collector/pdata/pcommon" @@ -750,8 +751,9 @@ func createTestMetricsWithStats() pmetric.Metrics { "custom_attribute": "custom_value", }) dest := md.ResourceMetrics() - logger, _ := zap.NewDevelopment() - trans, err := metrics.NewTranslator(logger) + set := componenttest.NewNopTelemetrySettings() + set.Logger, _ = zap.NewDevelopment() + trans, err := metrics.NewTranslator(set) if err != nil { panic(err) } diff --git a/go.mod b/go.mod index c8ea87b706d2..f704d1a7321e 100644 --- a/go.mod +++ b/go.mod @@ -236,25 +236,25 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v1.2.0 // indirect github.com/ClickHouse/ch-go v0.58.2 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.16.0 // indirect - github.com/DataDog/agent-payload/v5 v5.0.89 // 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/agent-payload/v5 v5.0.101 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.20.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 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/go.sum b/go.sum index 895370583292..7106327f2971 100644 --- a/go.sum +++ b/go.sum @@ -159,26 +159,26 @@ github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTY github.com/ClickHouse/clickhouse-go/v2 v2.16.0 h1:rhMfnPewXPnY4Q4lQRGdYuTLRBRKJEIEYHtbUMrzmvI= github.com/ClickHouse/clickhouse-go/v2 v2.16.0/go.mod h1:J7SPfIxwR+x4mQ+o8MLSe0oY50NNntEqCIjFe/T1VPM= github.com/DATA-DOG/go-sqlmock v1.5.1 h1:FK6RCIUSfmbnI/imIICmboyQBkOckutaa6R5YYlLZyo= -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.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/agent-payload/v5 v5.0.101 h1:/MjtenucwoRzv1cafv46fcvserECivPKEWDsemT2Grg= +github.com/DataDog/agent-payload/v5 v5.0.101/go.mod h1:COngtbYYCncpIPiE5D93QlXDH/3VAKk10jDNwGHcMRE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/go.mod h1:EOGgNrSPskIxY3+KgCl+yEggMjrGqrA2oL5va+/p2jM= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0 h1:80T+UuTh+28qODc2vw+HxzMoIu0dYBT7/RCHXxdYpJE= +github.com/DataDog/datadog-api-client-go/v2 v2.20.0/go.mod h1:oD5Lx8Li3oPRa/BSBenkn4i48z+91gwYORF/+6ph71g= 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= @@ -186,19 +186,19 @@ github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7 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= -github.com/DataDog/gohai v0.0.0-20220718130825-1776f9beb9cc/go.mod h1:oyPC4jWHHjVVNjslDAKp8EqfQBaSmODjHt4HCX+C+9Q= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1 h1:16YkGLmeJH830m3dG0owtdSMXDkmTZdRd1EWZ1XIO6M= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.8.1/go.mod h1:re1FCVuKWovntr4bODIUe+iYT2Al0gbS0WK726XLz7w= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3 h1:oFW083L4oIyrYL06/3yCU5lnslaj8haSmQidFDK9rQk= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.3/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3 h1:Kp4byxXZG8HmrbCH6rVhq/yWnW/ddKt0TqtjWzlj4N0= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.8.3/go.mod h1:oN2FZ3z4WiBkfsexz6Uc/IU+yjlQ+xrMpDmVnj8fF/Y= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= +github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0 h1:y8rL7rCty4VhPFJi6TgOZXI7MrGRVYNV0oqbNblWi/c= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.9.0/go.mod h1:x+QjxvvVxewuyNymMjR+2fm0LAQSMF2mhw7Yhx61jp4= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0 h1:FbqbNsZ3179TUV+y932rKhhTxHMS5adlBb+9om1heGY= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.9.0/go.mod h1:v0FMEai3NccZjZr2jmX4t8Nobh3R8KxoRuj6PExoTRo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -766,7 +766,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -1420,7 +1419,7 @@ github.com/secure-systems-lab/go-securesystemslib v0.7.0 h1:OwvJ5jQf9LnIAS83waAj github.com/secure-systems-lab/go-securesystemslib v0.7.0/go.mod h1:/2gYnlnHVQ6xeGtfIqFy7Do03K4cdCY0A/GlJLDKLHI= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= +github.com/shirou/gopsutil/v3 v3.22.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= github.com/shirou/gopsutil/v3 v3.23.11 h1:i3jP9NjCPUz7FiZKxlMnODZkdSIp2gnzfrvsu9CuWEQ= github.com/shirou/gopsutil/v3 v3.23.11/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -1532,10 +1531,10 @@ github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UD github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1989,11 +1988,9 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2005,6 +2002,8 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 766774e64c03..7b4c875f312b 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -3,24 +3,25 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/datado go 1.20 require ( - 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/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0 ) require ( - 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.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // 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/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect github.com/DataDog/sketches-go v1.4.3 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect @@ -36,9 +37,16 @@ require ( github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/google/uuid v1.4.0 // indirect + github.com/hashicorp/go-version v1.6.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.17.0 // indirect + github.com/knadh/koanf/maps v0.1.1 // indirect + github.com/knadh/koanf/providers/confmap v0.1.0 // indirect + github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect @@ -55,7 +63,14 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect + go.opentelemetry.io/collector/component v0.91.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect + go.opentelemetry.io/collector/confmap v0.91.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0 // indirect go.opentelemetry.io/collector/semconv v0.91.0 // indirect + go.opentelemetry.io/otel v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect @@ -66,7 +81,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.15.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // 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/yaml.v2 v2.4.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index 5f8625fc674b..1c428d730d0f 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -1,30 +1,32 @@ -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.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/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-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/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 h1:ly/egks++IqejMVPcp0OWV1fcL+Nsq4EHF48AAQPKu4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -50,6 +52,8 @@ github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -72,18 +76,32 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= +github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= github.com/karrick/godirwalk v1.17.0/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= +github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/lightstep/go-expohisto v1.0.0 h1:UPtTS1rGdtehbbAF7o/dhkWLTDI73UifG8LbfQI7cA4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c h1:VtwQ41oftZwlMnOEbMWQtSEUgU64U4s+GHk7hZK+jtY= github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= +github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -140,10 +158,26 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/collector/component v0.91.0 h1:aBT1i2zGyfh9PalYJLfXVvQp+osHyalwyDFselI1CtA= +go.opentelemetry.io/collector/component v0.91.0/go.mod h1:2KBHvjNFdU7oOjsObQeC4Ta2Ef607OISU5obznW00fw= +go.opentelemetry.io/collector/config/configtelemetry v0.91.0 h1:mEwvqrYfwUJ7LwYfpcF9M8z7LHFoYaKhEPhnERD/88E= +go.opentelemetry.io/collector/config/configtelemetry v0.91.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= +go.opentelemetry.io/collector/confmap v0.91.0 h1:7U2MT+u74oEzq/WWrpXSLKB7nX5jPNC4drwtQdYfwKk= +go.opentelemetry.io/collector/confmap v0.91.0/go.mod h1:uxV+fZ85kG31oovL6Cl3fAMQ3RRPwUvfAbbA9WT1Yhk= +go.opentelemetry.io/collector/featuregate v1.0.0 h1:5MGqe2v5zxaoo73BUOvUTunftX5J8RGrbFsC2Ha7N3g= +go.opentelemetry.io/collector/featuregate v1.0.0/go.mod h1:xGbRuw+GbutRtVVSEy3YR2yuOlEyiUMhN2M9DJljgqY= go.opentelemetry.io/collector/pdata v1.0.0 h1:ECP2jnLztewsHmL1opL8BeMtWVc7/oSlKNhfY9jP8ec= go.opentelemetry.io/collector/pdata v1.0.0/go.mod h1:TsDFgs4JLNG7t6x9D8kGswXUz4mme+MyNChHx8zSF6k= go.opentelemetry.io/collector/semconv v0.91.0 h1:TRd+yDDfKQl+aNtS24wmEbJp1/QE/xAFV9SB5zWGxpE= go.opentelemetry.io/collector/semconv v0.91.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= @@ -210,8 +244,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +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.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff --git a/processor/datadogprocessor/factory.go b/processor/datadogprocessor/factory.go index d5bbbcceddb9..7e8f547277b8 100644 --- a/processor/datadogprocessor/factory.go +++ b/processor/datadogprocessor/factory.go @@ -23,5 +23,5 @@ func NewFactory() processor.Factory { } func createTracesProcessor(ctx context.Context, params processor.CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (processor.Traces, error) { - return newProcessor(ctx, params.Logger, cfg, nextConsumer) + return newProcessor(ctx, params.TelemetrySettings, cfg, nextConsumer) } diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 5c140d9ff32f..4030b605d479 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -4,8 +4,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/datad go 1.20 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-devel - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 github.com/DataDog/sketches-go v1.4.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.91.0 github.com/stretchr/testify v1.8.4 @@ -20,17 +20,18 @@ require ( ) require ( - 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.7 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 // 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/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 // indirect 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 @@ -87,7 +88,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.4.0 // indirect golang.org/x/tools v0.15.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/grpc v1.59.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index ce64255a5f5a..07b88e5baddd 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -1,30 +1,32 @@ -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.7 h1:ULN8UQqgtmEgWvOEIDzWgxLZ3TEZJ9MXBUpVGE8PPBc= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.50.0-rc.7/go.mod h1:A4nLJvxlg6BO/8/zg81til9yT0uRPuXDFMAzDMpmgn4= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7 h1:pQh4uZnc9mQbGMJ1R8C88GlseqmdFIKftDZLrQW71Ss= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.50.0-rc.7/go.mod h1:Vc+snp0Bey4MrrJyiV2tVxxJb6BmLomPvN1RgAvjGaQ= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7 h1:qWKAINgUtyuJQOCcthjPST8PzigPP8Pr0EtHdTgJVoA= +github.com/DataDog/datadog-agent/pkg/trace v0.50.0-rc.7/go.mod h1:i6OrrkHDlgCB4vUaPfM4FxVij2QdA/t07Ykwu74ySGA= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7 h1:J7ocZItHWrUEvGWVqFa7wsghotcF53oFn1qH7Tlh7VM= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.50.0-rc.7/go.mod h1:b0I5L9Eegsq3kca9pQCAVt1rQHI05sza7LVHKGzC+ms= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7 h1:vBo+iVlLpjrvJkX88mbFDtWFy0F6tEi865p+N4RTf7A= +github.com/DataDog/datadog-agent/pkg/util/log v0.50.0-rc.7/go.mod h1:/fGZteE4rr3iz6y30a0A3MuebJ6Jckx+AiKcyYgT87k= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7 h1:eM+GcYjk4sSik8tFgf8zNT1KViZZM4F4I580SZnTs7s= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.50.0-rc.7/go.mod h1:eTXti9mx7qhkoi+Qg3mMmvVY5McghUUgsf4Hrk9zY8k= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7 h1:QByjh+uLdnYjqIjdYP9XyEgObD9o8ydL4jBy4sEPlbU= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.50.0-rc.7/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-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/opentelemetry-mapping-go/pkg/internal/sketchtest v0.8.1 h1:0GyngySyxePf1RozAdm8p51uxT/kDsxqhzWPZGNrqVg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1 h1:ly/egks++IqejMVPcp0OWV1fcL+Nsq4EHF48AAQPKu4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.8.1/go.mod h1:8jOAAH5PrNN6zICpu65M7mNPAeOQsW5Wk/sq80txutA= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1 h1:TbZDzUrW8iahevDY5Xw+j1EfrX8XZdeg/M6UYBl9mxg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.8.1/go.mod h1:nVIKiAwP/Zd8IFxeHhEAiirJRH1kOOoZ315HQeSEkng= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1 h1:4cyzwoXrnjElTIlsFbpyXQkAJs3+6ly9HExOu9lrup4= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.8.1/go.mod h1:3AEt8/uCtbpzjPOPPxIBDcR1qcUq2hBbrkrdE/qNfb0= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.9.0 h1:oT5B12H+tLtAEEH0YqgmppofM/yRBzyI9+ykS9OQvIs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0 h1:Y+CllChr2yfE2RLd+c5hvK56DDGVEdDrhAl1OyzuuwU= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.9.0/go.mod h1:naFq9h+fQpgI7AKJ+YkWlAAYDU8/FB8LyfA39bmRNHs= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0 h1:WsCPJS+a34kw1gj46WpJjQBHrLVwh1ubCdHUx9nf1ec= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.9.0/go.mod h1:m61Tq6DA2U+PjNTX6WD3TH2U7QnA49+7IGaYK4bu7fQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0 h1:U93rYuk3ChT/I+2r36JI8agi1AwdH8vRiHh+bCSXZeU= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.9.0/go.mod h1:KOzWHRj2AcJPmP1hm4WQUfzEIYRBP4NaTX9Iu+D3UNs= github.com/DataDog/sketches-go v1.4.3 h1:ZB9nijteJRFUQixkQfatCqASartGNfiolIlMiEv3u/w= github.com/DataDog/sketches-go v1.4.3/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -180,6 +182,8 @@ go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk/metric v1.21.0 h1:smhI5oD714d6jHE6Tie36fPx4WDFIg+Y6RfAY4ICcR0= go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -248,8 +252,8 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +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.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk= google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= diff --git a/processor/datadogprocessor/processor.go b/processor/datadogprocessor/processor.go index 5ace04936c86..7eb70d5fa3e3 100644 --- a/processor/datadogprocessor/processor.go +++ b/processor/datadogprocessor/processor.go @@ -44,14 +44,14 @@ type datadogProcessor struct { exit chan struct{} } -func newProcessor(ctx context.Context, logger *zap.Logger, config component.Config, nextConsumer consumer.Traces) (*datadogProcessor, error) { +func newProcessor(ctx context.Context, set component.TelemetrySettings, config component.Config, nextConsumer consumer.Traces) (*datadogProcessor, error) { cfg := config.(*Config) in := make(chan *pb.StatsPayload, 100) - trans, err := metrics.NewTranslator(logger) + trans, err := metrics.NewTranslator(set) if err != nil { return nil, err } - logger.Warn( + set.Logger.Warn( "The datadogprocessor has been deprecated in favor of the datadogconnector", zap.String( "documentation", @@ -59,7 +59,7 @@ func newProcessor(ctx context.Context, logger *zap.Logger, config component.Conf ), ) return &datadogProcessor{ - logger: logger, + logger: set.Logger, nextConsumer: nextConsumer, agent: datadog.NewAgent(ctx, in), translator: trans, diff --git a/processor/datadogprocessor/processor_test.go b/processor/datadogprocessor/processor_test.go index 5e3c198c925f..789a0122f640 100644 --- a/processor/datadogprocessor/processor_test.go +++ b/processor/datadogprocessor/processor_test.go @@ -14,12 +14,12 @@ import ( "github.com/DataDog/sketches-go/ddsketch" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/extension" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - "go.uber.org/zap" "google.golang.org/protobuf/proto" "github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog" @@ -29,7 +29,7 @@ func TestProcessorStart(t *testing.T) { ctx := context.Background() t.Run("fail", func(t *testing.T) { - p, err := newProcessor(ctx, zap.NewNop(), createDefaultConfig(), &mockTracesConsumer{}) + p, err := newProcessor(ctx, componenttest.NewNopTelemetrySettings(), createDefaultConfig(), &mockTracesConsumer{}) require.NoError(t, err) defer p.Shutdown(ctx) //nolint:errcheck require.True(t, p.Capabilities().MutatesData) @@ -42,7 +42,7 @@ func TestProcessorStart(t *testing.T) { }) t.Run("fail/2", func(t *testing.T) { - p, err := newProcessor(ctx, zap.NewNop(), createDefaultConfig(), &mockTracesConsumer{}) + p, err := newProcessor(ctx, componenttest.NewNopTelemetrySettings(), createDefaultConfig(), &mockTracesConsumer{}) require.NoError(t, err) defer p.Shutdown(ctx) //nolint:errcheck err = p.Start(ctx, &mockHost{ @@ -56,7 +56,7 @@ func TestProcessorStart(t *testing.T) { }) t.Run("succeed/0", func(t *testing.T) { - p, err := newProcessor(ctx, zap.NewNop(), createDefaultConfig(), &mockTracesConsumer{}) + p, err := newProcessor(ctx, componenttest.NewNopTelemetrySettings(), createDefaultConfig(), &mockTracesConsumer{}) require.NoError(t, err) defer p.Shutdown(ctx) //nolint:errcheck err = p.Start(ctx, &mockHost{ @@ -69,7 +69,7 @@ func TestProcessorStart(t *testing.T) { }) t.Run("succeed/1", func(t *testing.T) { - p, err := newProcessor(ctx, zap.NewNop(), createDefaultConfig(), &mockTracesConsumer{}) + p, err := newProcessor(ctx, componenttest.NewNopTelemetrySettings(), createDefaultConfig(), &mockTracesConsumer{}) require.NoError(t, err) defer p.Shutdown(ctx) //nolint:errcheck err = p.Start(ctx, &mockHost{ @@ -82,7 +82,7 @@ func TestProcessorStart(t *testing.T) { }) t.Run("succeed/2", func(t *testing.T) { - lp, err := newProcessor(ctx, zap.NewNop(), &Config{MetricsExporter: component.NewIDWithName("datadog", "2")}, &mockTracesConsumer{}) + lp, err := newProcessor(ctx, componenttest.NewNopTelemetrySettings(), &Config{MetricsExporter: component.NewIDWithName("datadog", "2")}, &mockTracesConsumer{}) require.NoError(t, err) defer lp.Shutdown(ctx) //nolint:errcheck err = lp.Start(ctx, &mockHost{ @@ -99,7 +99,7 @@ func TestProcessorStart(t *testing.T) { func TestProcessorIngest(t *testing.T) { var mockConsumer mockTracesConsumer ctx := context.Background() - p, err := newProcessor(ctx, zap.NewNop(), createDefaultConfig(), &mockConsumer) + p, err := newProcessor(ctx, componenttest.NewNopTelemetrySettings(), createDefaultConfig(), &mockConsumer) require.NoError(t, err) out := make(chan *pb.StatsPayload, 1) ing := &mockIngester{Out: out} diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index 9333bb8265d6..b8c04e438dcf 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/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.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.91.0 github.com/stretchr/testify v1.8.4 github.com/vmihailenco/msgpack/v4 v4.3.13 diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index 8f82773f33e2..1c535c54745c 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -1,8 +1,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -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.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/go.mod h1:HvK26YCxg6MfYvPJgpHC7nSjw6DTpNhd75Wlb0GAvis= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= diff --git a/testbed/go.mod b/testbed/go.mod index fd731fb4ca24..2ce2a73155e2 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -73,7 +73,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v4 v4.2.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v2 v2.2.1 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7 // 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 4dea988ec5a0..642514cf0236 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -55,8 +55,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1 h1:WpB/QDNLpMw github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= 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-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/proto v0.50.0-rc.7 h1:qJuxmeIiXZNML5/Y9KEf7QKEKKIeliiTIxgRGvGAQBc= +github.com/DataDog/datadog-agent/pkg/proto v0.50.0-rc.7/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=