From ef60b790e006528f14845e28ed056e4152e54db0 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 28 Aug 2024 03:37:56 +0200 Subject: [PATCH 01/14] [otel-agent] modularize comp/api/authtoken --- comp/api/authtoken/go.mod | 67 ++++++++ comp/api/authtoken/go.sum | 341 ++++++++++++++++++++++++++++++++++++++ go.mod | 2 +- tasks/modules.py | 1 + 4 files changed, 410 insertions(+), 1 deletion(-) create mode 100644 comp/api/authtoken/go.mod create mode 100644 comp/api/authtoken/go.sum diff --git a/comp/api/authtoken/go.mod b/comp/api/authtoken/go.mod new file mode 100644 index 0000000000000..3fdf2c76d55f2 --- /dev/null +++ b/comp/api/authtoken/go.mod @@ -0,0 +1,67 @@ +module github.com/DataDog/datadog-agent/comp/api/authtoken + +go 1.22.0 + +replace ( + github.com/DataDog/datadog-agent/pkg/config/model => ../../../pkg/config/model + github.com/DataDog/datadog-agent/pkg/util/log => ../../../pkg/util/log + github.com/DataDog/datadog-agent/pkg/util/log/setup => ../../../pkg/util/log/setup + github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../pkg/util/scrubber +) + +require ( + github.com/DataDog/datadog-agent/comp/core/config v0.56.0 + github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel + github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel + github.com/DataDog/datadog-agent/pkg/api v0.56.0 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 + github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0 + github.com/stretchr/testify v1.9.0 + go.uber.org/fx v1.22.2 +) + +require ( + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.0 // indirect + github.com/DataDog/viper v1.13.5 // indirect + github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/mitchellh/mapstructure v1.1.2 // indirect + github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect + github.com/pelletier/go-toml v1.2.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/shirou/gopsutil/v3 v3.23.12 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/spf13/afero v1.1.2 // indirect + github.com/spf13/cast v1.5.1 // indirect + github.com/spf13/cobra v1.7.0 // indirect + github.com/spf13/jwalterweatherman v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/dig v1.18.0 // indirect + go.uber.org/multierr v1.10.0 // indirect + go.uber.org/zap v1.26.0 // indirect + golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/sys v0.24.0 // indirect + golang.org/x/text v0.17.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/comp/api/authtoken/go.sum b/comp/api/authtoken/go.sum new file mode 100644 index 0000000000000..615c34ac36876 --- /dev/null +++ b/comp/api/authtoken/go.sum @@ -0,0 +1,341 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0 h1:f8Bx4HqUmvzorZPMT4pmMe+gOUOCmZRp/uTI3rqJIag= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0/go.mod h1:Lt1Kbt6yvh/2raESb24eglWj2tG/fSz1NGIPLXTRXTk= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 h1://josmUH6k/r4bxIaGjjhFnp84pw1V8A4DeylL6q+YI= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0/go.mod h1:4+dV4tF5qJzvE1qH9jar+CZ/FKLeD6npShwqIcEFLgU= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 h1:HfKnHKqnGokbtfYIoB2mSXcskeF7+Fx36E81LXqypfc= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0/go.mod h1:3Tg/gIhMzFaDhgRZoXoh3cfz+gVIJq6vwga476veV4c= +github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel h1:B40fb8UOJEgomNZxZC95bpH84n3I765MdREnlZomoFk= +github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel/go.mod h1:nHxfEUF4827oAcQvyLCuTvOSyJ64eQ8di6D+0CuBAok= +github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel h1:L1HWFQ9sqkNiuVwza9eZou1sZkvO+EcfqK9mnAnJPnk= +github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel/go.mod h1:GZF6c+WqwIapflJ91ESj6LP4ZjuB5vinfxqdblS+tV8= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0 h1:I1K7ZutddMYOZi8rMOu1KZ7EHDEVpIFMzwXIz3FR2rw= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0/go.mod h1:SfjdMenfVFm4zh1sZVWLYzaAtSDqiBqNJVBSOtIuZKc= +github.com/DataDog/datadog-agent/comp/def v0.56.0 h1:Rh7LpGLZuuTF4ngtIQQ5tZXPjdU7H7nbvdS4WavIWX0= +github.com/DataDog/datadog-agent/comp/def v0.56.0/go.mod h1:DEWoZ2fdGE8yy5Q/p8w06DLm3cBWxW8i9a/xNUxE2qc= +github.com/DataDog/datadog-agent/pkg/api v0.56.0 h1:S1BFvrGu0MBQ1y6YpNA/eRUr1ICMFGN9zi8d+ODT5ZA= +github.com/DataDog/datadog-agent/pkg/api v0.56.0/go.mod h1:ahmoF6W16k3ydGslHxvlFabGEmVIbpEnQw2DnX+xGEE= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 h1:9tGkoQvRGMBZvR/So18TY96cKd6C+13S3A8JEgR42ME= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0/go.mod h1:s9QBNtoBURzy/0FeBInQ7kawNj04OnBNUo8xYr26z3E= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 h1:jUWiF/S3oxecKm0f2MyU2EvPhKyvl2JydEd6p8tkmus= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0/go.mod h1:oohlS9RJ04nDM1QlBmrNmbqUsA/l0Ov+74lcg3CL5nI= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.3 h1:qatCWixeE+3T7eUtIeE1VDz4EvTArEcbnHk/R8Rjy+M= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.3/go.mod h1:G28eubhMcjjlkcyWTd+y3MFcwX1IPNMGr7RuxqDqB48= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 h1:Zy0rk0AhYgpLVJVw4Gy2R++Vr2DgKHUkzRyPYTt36Pk= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0/go.mod h1:kS5c6cEZW73+3vqb/uRL6oFU/Y+vwL6f82im9YXydgI= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 h1:aBD+eiR6gh7X7pfvQKG1oBjN11yh880J/JZa9/FgRgY= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0/go.mod h1:5bFhXoEKiRKu2SOKSiSJqRA0TIbo1Be4dlV0ZT4sEcc= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 h1:0zxtWX4OCmvvS3LhRxBvrDEp2NyulXLY9xasy7VRlqI= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0/go.mod h1:dWUsf3Fa8Yt3hBLU5weUtrpHOBy5lfeI/DOPmx1/0sc= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 h1:xeKPmFWYgS0kfEyIVRHtsY7Idw9p+KxteBbmD1D1JBM= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0/go.mod h1:bg80z4Wv3//+k+mPl1Bvrfy666cgJMKPymbr5QumT8g= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 h1:gBEY8MReoTEsJfO75YoWiVjR4fbLtrfMADcsp+tARLA= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0/go.mod h1:whUpbBTr1GbwrF3aR0zAVFOJ+g3Z3d3tc/zl8RTndy4= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 h1:12+cK40XapM7sPZU49PwT89QCNOz/vp/xwuLH2HD5Ig= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3/go.mod h1:/eK/YeICyB6ARkgFjFanagomCAwXpp4DLmZt4j7heh0= +github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel h1:ylR7+TBxFpkb2j4VKgOXHko/qTUA8lAaMSG3WCpGww8= +github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel/go.mod h1:7XPsQiXF9f3HwZlt+V05Oit57KBRIjkEvGZv27YXiow= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0 h1:/ra+IEI+DzkOZiZkNwabae7AarqhszhYSv8cS9lddYU= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0/go.mod h1:xWT/KJdJg2/0pZyAKZ6XmIiE5sM+AyUo4qvKuPHQ17U= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 h1:RclhHm2RZY9fbjwEcysotdMrbhx8bGXR2xalfwpOHKo= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0 h1:9cIQ2RGV0Hs6mFRar3mW78csqa1J/D3ePnClRqbbAy8= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0/go.mod h1:nBo8e+pSw+Whns5kqcwoPqOiZ6TSH2f71xgw5Kw85EM= +github.com/DataDog/datadog-agent/pkg/version v0.56.0 h1:k1+mEfnUI07IGGx1Tf1xoC/OFmVLD+ugyN6P0cWpvJE= +github.com/DataDog/datadog-agent/pkg/version v0.56.0/go.mod h1:rcA7LtIB5WLpxsems/bWO1iXkyGEgHHje7vJ0b20ZpU= +github.com/DataDog/viper v1.13.5 h1:SZMcyMknYQN2jRY/40A16gUXexlNJOI8sDs1cWZnI64= +github.com/DataDog/viper v1.13.5/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= +github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/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.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9GbyCZHuPgZsrbyIbyKhSzOpg6s= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= +github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= +github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= +github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= +github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA= +github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +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.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +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.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= +go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw= +go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= +go.uber.org/fx v1.22.2 h1:iPW+OPxv0G8w75OemJ1RAnTUrF55zOJlXlo1TbJ0Buw= +go.uber.org/fx v1.22.2/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= +golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/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/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= +golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= diff --git a/go.mod b/go.mod index 6b3024459c022..2a76ec6915f92 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent -go 1.22.0 +go 1.22.5 // v0.8.0 was tagged long ago, and appared on pkg.go.dev. We do not want any tagged version // to appear there. The trick to accomplish this is to make a new version (in this case v0.9.0) diff --git a/tasks/modules.py b/tasks/modules.py index 276f8106a753d..910abf95380bf 100644 --- a/tasks/modules.py +++ b/tasks/modules.py @@ -134,6 +134,7 @@ def dependency_path(self, agent_version): ), "cmd/agent/common/path": GoModule("cmd/agent/common/path", independent=True, used_by_otel=True), "comp/api/api/def": GoModule("comp/api/api/def", independent=True, used_by_otel=True), + "comp/api/authtoken": GoModule("comp/api/authtoken", independent=True, used_by_otel=True), "comp/core/config": GoModule("comp/core/config", independent=True, used_by_otel=True), "comp/core/flare/builder": GoModule("comp/core/flare/builder", independent=True, used_by_otel=True), "comp/core/flare/types": GoModule("comp/core/flare/types", independent=True, used_by_otel=True), From 6d285db198daba9659de20e326c0ed37a0a71be2 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Tue, 27 Aug 2024 15:45:04 +0200 Subject: [PATCH 02/14] [otel-agent] modularize comp/api/authtoken --- comp/api/authtoken/go.mod | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/comp/api/authtoken/go.mod b/comp/api/authtoken/go.mod index 3fdf2c76d55f2..7e1a9a1d2fee8 100644 --- a/comp/api/authtoken/go.mod +++ b/comp/api/authtoken/go.mod @@ -10,6 +10,7 @@ replace ( ) require ( +<<<<<<< HEAD github.com/DataDog/datadog-agent/comp/core/config v0.56.0 github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel @@ -40,12 +41,21 @@ require ( github.com/DataDog/viper v1.13.5 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect +======= + github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 // indirect + github.com/DataDog/viper v1.13.5 // indirect + github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect +>>>>>>> ef7f775d25 ([otel-agent] modularize comp/api/authtoken) github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/magiconair/properties v1.8.1 // indirect github.com/mitchellh/mapstructure v1.1.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/pelletier/go-toml v1.2.0 // indirect +<<<<<<< HEAD github.com/pmezard/go-difflib v1.0.0 // indirect github.com/shirou/gopsutil/v3 v3.23.12 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect @@ -64,4 +74,15 @@ require ( golang.org/x/text v0.17.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect +======= + github.com/spf13/afero v1.1.2 // indirect + github.com/spf13/cast v1.5.1 // indirect + github.com/spf13/jwalterweatherman v1.0.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + go.uber.org/atomic v1.11.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.16.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect +>>>>>>> ef7f775d25 ([otel-agent] modularize comp/api/authtoken) ) From fd69dcc3cf921db850ed3771441c6170e2b9ffca Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Tue, 27 Aug 2024 14:13:30 +0200 Subject: [PATCH 03/14] [otel-agent] extension+flare: require authtoken to use endpoint --- .../collector/impl-pipeline/flare_filler.go | 35 ++++--------------- .../collector/impl-pipeline/pipeline.go | 25 ++++++++++--- comp/otelcol/ddflareextension/impl/config.go | 2 ++ comp/otelcol/ddflareextension/impl/server.go | 20 ++++++++++- go.mod | 10 +++--- 5 files changed, 53 insertions(+), 39 deletions(-) diff --git a/comp/otelcol/collector/impl-pipeline/flare_filler.go b/comp/otelcol/collector/impl-pipeline/flare_filler.go index 109429fb4bb9d..97378486d1a22 100644 --- a/comp/otelcol/collector/impl-pipeline/flare_filler.go +++ b/comp/otelcol/collector/impl-pipeline/flare_filler.go @@ -9,19 +9,16 @@ package collectorimpl import ( - "context" - "crypto/tls" "encoding/json" - "errors" "fmt" "io" "net/http" "net/url" "strings" - "time" flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types" extension "github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def" + apiutil "github.com/DataDog/datadog-agent/pkg/api/util" "github.com/DataDog/datadog-agent/pkg/util/log" ) @@ -130,35 +127,15 @@ func (c *collectorImpl) requestOtelConfigInfo(endpointURL string) ([]byte, error return []byte(overrideConfigResponse), nil } - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + options := apiutil.ReqOptions{ + Ctx: c.ctx, + Authtoken: c.authToken.Get(), } - client := &http.Client{Transport: tr} - timeoutSeconds := c.config.GetInt("otelcollector.extension_timeout") - if timeoutSeconds == 0 { - timeoutSeconds = defaultExtensionTimeout - } - - ctx := context.TODO() - ctx, cancel := context.WithTimeout(ctx, time.Duration(timeoutSeconds)*time.Second) - defer cancel() - req, err := http.NewRequestWithContext(ctx, "GET", endpointURL, nil) + data, err := apiutil.DoGetWithOptions(c.client, endpointURL, &options) if err != nil { return nil, err } - res, err := client.Do(req) - if err != nil { - return nil, err - } - body, err := io.ReadAll(res.Body) - res.Body.Close() - if err != nil { - return nil, err - } - if res.StatusCode >= 400 { - return nil, errors.New(string(body)) - } - return body, nil + return data, nil } diff --git a/comp/otelcol/collector/impl-pipeline/pipeline.go b/comp/otelcol/collector/impl-pipeline/pipeline.go index 2771f70a9fe85..6b0fd740a7587 100644 --- a/comp/otelcol/collector/impl-pipeline/pipeline.go +++ b/comp/otelcol/collector/impl-pipeline/pipeline.go @@ -10,7 +10,10 @@ package collectorimpl import ( "context" + "net/http" + "time" + "github.com/DataDog/datadog-agent/comp/api/authtoken" "github.com/DataDog/datadog-agent/comp/core/config" flaretypes "github.com/DataDog/datadog-agent/comp/core/flare/types" log "github.com/DataDog/datadog-agent/comp/core/log/def" @@ -22,6 +25,7 @@ import ( "github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline" "github.com/DataDog/datadog-agent/comp/otelcol/otlp" "github.com/DataDog/datadog-agent/comp/otelcol/otlp/datatype" + apiutil "github.com/DataDog/datadog-agent/pkg/api/util" "github.com/DataDog/datadog-agent/pkg/logs/message" "github.com/DataDog/datadog-agent/pkg/serializer" "github.com/DataDog/datadog-agent/pkg/util/optional" @@ -44,6 +48,9 @@ type Requires struct { // Log specifies the logging component. Log log.Component + // Authtoken specifies the authentication token component. + Authtoken authtoken.Component + // Serializer specifies the metrics serializer that is used to export metrics // to Datadog. Serializer serializer.MetricSerializer @@ -67,6 +74,7 @@ type Provides struct { } type collectorImpl struct { + authToken authtoken.Component col *otlp.Pipeline config config.Component log log.Component @@ -74,6 +82,8 @@ type collectorImpl struct { logsAgent optional.Option[logsagentpipeline.Component] inventoryAgent inventoryagent.Component tagger tagger.Component + client *http.Client + ctx context.Context } func (c *collectorImpl) start(context.Context) error { @@ -96,11 +106,8 @@ func (c *collectorImpl) start(context.Context) error { return nil } c.col = col - // the context passed to this function has a startup deadline which - // will shutdown the collector prematurely - ctx := context.Background() go func() { - if err := col.Run(ctx); err != nil { + if err := col.Run(c.ctx); err != nil { c.log.Errorf("Error running the OTLP ingest pipeline: %v", err) } }() @@ -121,13 +128,23 @@ func (c *collectorImpl) Status() datatype.CollectorStatus { // NewComponent creates a new Component for this module and returns any errors on failure. func NewComponent(reqs Requires) (Provides, error) { + + timeoutSeconds := reqs.Config.GetInt("otelcollector.extension_timeout") + if timeoutSeconds == 0 { + timeoutSeconds = defaultExtensionTimeout + } + client := apiutil.GetClientWithTimeout(time.Duration(timeoutSeconds)*time.Second, false) + collector := &collectorImpl{ + authToken: reqs.Authtoken, config: reqs.Config, log: reqs.Log, serializer: reqs.Serializer, logsAgent: reqs.LogsAgent, inventoryAgent: reqs.InventoryAgent, tagger: reqs.Tagger, + client: client, + ctx: context.Background(), } reqs.Lc.Append(compdef.Hook{ diff --git a/comp/otelcol/ddflareextension/impl/config.go b/comp/otelcol/ddflareextension/impl/config.go index 640ed5c2030af..7c02e1d2971ae 100644 --- a/comp/otelcol/ddflareextension/impl/config.go +++ b/comp/otelcol/ddflareextension/impl/config.go @@ -10,6 +10,7 @@ import ( "errors" "fmt" + apiauth "github.com/DataDog/datadog-agent/comp/api/authtoken" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" @@ -34,6 +35,7 @@ type Config struct { factories *otelcol.Factories configProviderSettings otelcol.ConfigProviderSettings + authtoken apiauth.Component } var _ component.Config = (*Config)(nil) diff --git a/comp/otelcol/ddflareextension/impl/server.go b/comp/otelcol/ddflareextension/impl/server.go index 2a4c74f66fda8..0ab2a4787734d 100644 --- a/comp/otelcol/ddflareextension/impl/server.go +++ b/comp/otelcol/ddflareextension/impl/server.go @@ -18,8 +18,21 @@ import ( "net" "net/http" "time" + + "github.com/DataDog/datadog-agent/pkg/api/util" + "github.com/gorilla/mux" ) +// validateToken - validates token for legacy API +func validateToken(next http.Handler) http.Handler { + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if err := util.Validate(w, r); err != nil { + return + } + next.ServeHTTP(w, r) + }) +} + func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.Listener, error) { // Generate a self-signed certificate @@ -90,10 +103,15 @@ func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.L MinVersion: tls.VersionTLS12, } + r := mux.NewRouter() + r.Handle("/", handler) + + r.Use(validateToken) + server := &http.Server{ Addr: endpoint, TLSConfig: tlsConfig, - Handler: handler, + Handler: r, } listener, err := net.Listen("tcp", endpoint) diff --git a/go.mod b/go.mod index 2a76ec6915f92..e03213dc5825a 100644 --- a/go.mod +++ b/go.mod @@ -614,8 +614,8 @@ require ( github.com/DataDog/agent-payload/v5 v5.0.132 github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.3 - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.3 - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 + github.com/DataDog/datadog-agent/comp/core/config v0.56.0 + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/core/log/def v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/core/log/impl v0.0.0-00010101000000-000000000000 @@ -626,7 +626,7 @@ require ( github.com/DataDog/datadog-agent/comp/core/status/statusimpl v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/core/tagger/types v0.56.2 github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.3 - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.3 + github.com/DataDog/datadog-agent/comp/def v0.56.0 github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.3 @@ -688,7 +688,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.57.0 github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.0 github.com/DataDog/datadog-agent/pkg/util/flavor v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 github.com/DataDog/datadog-agent/pkg/util/grpc v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.0 github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 @@ -766,7 +766,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.3.1 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 // indirect github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.0.0-20240525065430-d0b647bcb646 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/buf v0.56.0-rc.3 // indirect From b95816891abbc7e06d626afe0541447505bc4a15 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Fri, 30 Aug 2024 04:44:07 -0500 Subject: [PATCH 04/14] [api] authtoken: fixing go.mod [go] mod: tidy --- comp/api/authtoken/go.mod | 37 ++++----- comp/api/authtoken/go.sum | 95 +++++++++++++++++++---- comp/otelcol/converter/impl/go.mod | 11 +-- comp/otelcol/ddflareextension/impl/go.mod | 20 +++-- comp/otelcol/ddflareextension/impl/go.sum | 4 + go.mod | 4 +- 6 files changed, 122 insertions(+), 49 deletions(-) diff --git a/comp/api/authtoken/go.mod b/comp/api/authtoken/go.mod index 7e1a9a1d2fee8..c691be1f53887 100644 --- a/comp/api/authtoken/go.mod +++ b/comp/api/authtoken/go.mod @@ -10,7 +10,6 @@ replace ( ) require ( -<<<<<<< HEAD github.com/DataDog/datadog-agent/comp/core/config v0.56.0 github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel @@ -31,32 +30,34 @@ require ( github.com/DataDog/datadog-agent/pkg/config/model v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/util/system v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/version v0.56.0 // indirect github.com/DataDog/viper v1.13.5 // indirect + github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/davecgh/go-spew v1.1.1 // indirect -======= - github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 // indirect - github.com/DataDog/viper v1.13.5 // indirect - github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect ->>>>>>> ef7f775d25 ([otel-agent] modularize comp/api/authtoken) github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.1 // indirect github.com/mitchellh/mapstructure v1.1.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/pelletier/go-toml v1.2.0 // indirect -<<<<<<< HEAD github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/shirou/gopsutil/v3 v3.23.12 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/spf13/afero v1.1.2 // indirect @@ -65,24 +66,18 @@ require ( github.com/spf13/jwalterweatherman v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect 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.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.18.0 // indirect go.uber.org/multierr v1.10.0 // indirect go.uber.org/zap v1.26.0 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect + golang.org/x/mod v0.20.0 // indirect + golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect + golang.org/x/tools v0.24.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect -======= - github.com/spf13/afero v1.1.2 // indirect - github.com/spf13/cast v1.5.1 // indirect - github.com/spf13/jwalterweatherman v1.0.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - go.uber.org/atomic v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.16.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect ->>>>>>> ef7f775d25 ([otel-agent] modularize comp/api/authtoken) ) diff --git a/comp/api/authtoken/go.sum b/comp/api/authtoken/go.sum index 615c34ac36876..f26618c24cbdc 100644 --- a/comp/api/authtoken/go.sum +++ b/comp/api/authtoken/go.sum @@ -1,5 +1,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0 h1:4ppN8uMvt2Y1Xntchb5n0wrDOeuEIcOC8E13R46OwVk= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0/go.mod h1:89QL6A7FgXhJbvhv40JxTHGSWC+rW/UA7ezjjBPakDM= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0 h1:+8heVDzPVONtqdNnZJg1TiM1xl5iFF3ViUMpuzy+/WE= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0/go.mod h1:B7o1FsKlzr4JSS+CYKYuyABr3eaaq2W7fIA56ntxGHQ= github.com/DataDog/datadog-agent/comp/core/config v0.56.0 h1:f8Bx4HqUmvzorZPMT4pmMe+gOUOCmZRp/uTI3rqJIag= github.com/DataDog/datadog-agent/comp/core/config v0.56.0/go.mod h1:Lt1Kbt6yvh/2raESb24eglWj2tG/fSz1NGIPLXTRXTk= github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 h1://josmUH6k/r4bxIaGjjhFnp84pw1V8A4DeylL6q+YI= @@ -12,6 +17,8 @@ github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel h1:L1HWFQ9sqkN github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel/go.mod h1:GZF6c+WqwIapflJ91ESj6LP4ZjuB5vinfxqdblS+tV8= github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0 h1:I1K7ZutddMYOZi8rMOu1KZ7EHDEVpIFMzwXIz3FR2rw= github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0/go.mod h1:SfjdMenfVFm4zh1sZVWLYzaAtSDqiBqNJVBSOtIuZKc= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0 h1:Ertcl862qNroQ2P36TN1iwrq9TdReeWQpuQKmq2IOPo= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0/go.mod h1:SEZ79adu071FHgeKFdnnbBjVMe5K4cXKAf9YIBmkw68= github.com/DataDog/datadog-agent/comp/def v0.56.0 h1:Rh7LpGLZuuTF4ngtIQQ5tZXPjdU7H7nbvdS4WavIWX0= github.com/DataDog/datadog-agent/comp/def v0.56.0/go.mod h1:DEWoZ2fdGE8yy5Q/p8w06DLm3cBWxW8i9a/xNUxE2qc= github.com/DataDog/datadog-agent/pkg/api v0.56.0 h1:S1BFvrGu0MBQ1y6YpNA/eRUr1ICMFGN9zi8d+ODT5ZA= @@ -20,32 +27,36 @@ github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 h1:9tGkoQv github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0/go.mod h1:s9QBNtoBURzy/0FeBInQ7kawNj04OnBNUo8xYr26z3E= github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 h1:jUWiF/S3oxecKm0f2MyU2EvPhKyvl2JydEd6p8tkmus= github.com/DataDog/datadog-agent/pkg/config/env v0.56.0/go.mod h1:oohlS9RJ04nDM1QlBmrNmbqUsA/l0Ov+74lcg3CL5nI= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.3 h1:qatCWixeE+3T7eUtIeE1VDz4EvTArEcbnHk/R8Rjy+M= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.3/go.mod h1:G28eubhMcjjlkcyWTd+y3MFcwX1IPNMGr7RuxqDqB48= github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 h1:Zy0rk0AhYgpLVJVw4Gy2R++Vr2DgKHUkzRyPYTt36Pk= github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0/go.mod h1:kS5c6cEZW73+3vqb/uRL6oFU/Y+vwL6f82im9YXydgI= github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 h1:aBD+eiR6gh7X7pfvQKG1oBjN11yh880J/JZa9/FgRgY= github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0/go.mod h1:5bFhXoEKiRKu2SOKSiSJqRA0TIbo1Be4dlV0ZT4sEcc= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0 h1:oyJx5AY+nfrl/UoBfhY+vlf5AhVYHBh//J575aYA+90= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0/go.mod h1:mSSn2OzsdgoUnPyBmF8rEDU+ee1RFp+H6LFsJSteN9o= github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 h1:0zxtWX4OCmvvS3LhRxBvrDEp2NyulXLY9xasy7VRlqI= github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0/go.mod h1:dWUsf3Fa8Yt3hBLU5weUtrpHOBy5lfeI/DOPmx1/0sc= github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 h1:xeKPmFWYgS0kfEyIVRHtsY7Idw9p+KxteBbmD1D1JBM= github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0/go.mod h1:bg80z4Wv3//+k+mPl1Bvrfy666cgJMKPymbr5QumT8g= github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 h1:gBEY8MReoTEsJfO75YoWiVjR4fbLtrfMADcsp+tARLA= github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0/go.mod h1:whUpbBTr1GbwrF3aR0zAVFOJ+g3Z3d3tc/zl8RTndy4= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 h1:12+cK40XapM7sPZU49PwT89QCNOz/vp/xwuLH2HD5Ig= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3/go.mod h1:/eK/YeICyB6ARkgFjFanagomCAwXpp4DLmZt4j7heh0= -github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel h1:ylR7+TBxFpkb2j4VKgOXHko/qTUA8lAaMSG3WCpGww8= -github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel/go.mod h1:7XPsQiXF9f3HwZlt+V05Oit57KBRIjkEvGZv27YXiow= github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0 h1:/ra+IEI+DzkOZiZkNwabae7AarqhszhYSv8cS9lddYU= github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0/go.mod h1:xWT/KJdJg2/0pZyAKZ6XmIiE5sM+AyUo4qvKuPHQ17U= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3 h1:RclhHm2RZY9fbjwEcysotdMrbhx8bGXR2xalfwpOHKo= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.3/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0 h1:iREfubwLFZjRZV9QGtvSRiW5Bd3OZfa4+P27d3ABJ0Q= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0/go.mod h1:t1DlnUEMltkvwPLc7zCtP1u5cBDu+30daR2VhQO5bvA= github.com/DataDog/datadog-agent/pkg/util/system v0.56.0 h1:9cIQ2RGV0Hs6mFRar3mW78csqa1J/D3ePnClRqbbAy8= github.com/DataDog/datadog-agent/pkg/util/system v0.56.0/go.mod h1:nBo8e+pSw+Whns5kqcwoPqOiZ6TSH2f71xgw5Kw85EM= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0 h1:/vDPU6LVFZi1ZOt9yot3SmWI/wsHRSNBAnLocPtw7WI= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0/go.mod h1:tBwAMDAEJEaZ5VNe19GJoLLzviZGOPUJH0WnzETWhyY= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0 h1:z0JZcMDTAlxlV9P59pyHT++536jAFDUiQkaIERYWWJY= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0/go.mod h1:m/uWLdpGEi3x/5gybZFeYNEnIdKhGtWW8kFZuM+GSFA= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0 h1:9mcquatK2Z6HLOcYA57j4x4ifjEDwfcgnUiMnO/0woE= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0/go.mod h1:o88yQRcQQU2Dm4BcIRV2JRdjBpemO9OmeN2ZRVYWuBg= github.com/DataDog/datadog-agent/pkg/version v0.56.0 h1:k1+mEfnUI07IGGx1Tf1xoC/OFmVLD+ugyN6P0cWpvJE= github.com/DataDog/datadog-agent/pkg/version v0.56.0/go.mod h1:rcA7LtIB5WLpxsems/bWO1iXkyGEgHHje7vJ0b20ZpU= github.com/DataDog/viper v1.13.5 h1:SZMcyMknYQN2jRY/40A16gUXexlNJOI8sDs1cWZnI64= github.com/DataDog/viper v1.13.5/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -55,10 +66,14 @@ github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQY github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -78,6 +93,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= @@ -86,6 +103,11 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +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/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -99,12 +121,15 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/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.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= @@ -117,24 +142,36 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.13.0/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 h1:S4qyfL2sEm5Budr4KVMyEniCy+PbS55651I/a+Kn/NQ= +github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95/go.mod h1:QiyDdbZLaJ/mZP4Zwc9g2QsfaEA4o7XvvgZegSci5/E= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -152,32 +189,44 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= +github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -213,6 +262,7 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= 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.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-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -221,8 +271,19 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg= +go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ= +go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik= +go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak= +go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI= +go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A= +go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI= +go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw= +go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw= +go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -231,6 +292,8 @@ go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw= go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= go.uber.org/fx v1.22.2 h1:iPW+OPxv0G8w75OemJ1RAnTUrF55zOJlXlo1TbJ0Buw= go.uber.org/fx v1.22.2/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= @@ -244,8 +307,6 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -253,6 +314,8 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -271,6 +334,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -278,6 +343,7 @@ golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190529164535-6a60838ec259/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -285,13 +351,9 @@ golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBc 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/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -306,6 +368,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= @@ -318,9 +382,12 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/comp/otelcol/converter/impl/go.mod b/comp/otelcol/converter/impl/go.mod index ddbd3057c3a11..0b4ee82140ee6 100644 --- a/comp/otelcol/converter/impl/go.mod +++ b/comp/otelcol/converter/impl/go.mod @@ -5,6 +5,7 @@ go 1.22.0 replace ( github.com/DataDog/datadog-agent/cmd/agent/common/path => ../../../../cmd/agent/common/path github.com/DataDog/datadog-agent/comp/api/api/def => ../../../../comp/api/api/def + github.com/DataDog/datadog-agent/comp/api/authtoken => ../../../../comp/api/authtoken github.com/DataDog/datadog-agent/comp/core/config => ../../../../comp/core/config github.com/DataDog/datadog-agent/comp/core/flare/builder => ../../../../comp/core/flare/builder github.com/DataDog/datadog-agent/comp/core/flare/types => ../../../../comp/core/flare/types @@ -34,7 +35,7 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.3 + github.com/DataDog/datadog-agent/comp/core/config v0.56.2 github.com/DataDog/datadog-agent/comp/otelcol/converter/def v0.56.0-rc.3 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/confmap v0.104.0 @@ -48,10 +49,10 @@ require ( ) require ( - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.2 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.2 // indirect github.com/DataDog/datadog-agent/comp/core/secrets v0.56.2 // indirect - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel // indirect @@ -59,7 +60,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/setup v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.2 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/optional v0.56.2 // indirect diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index dc737f335465f..35ab76904a799 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -5,6 +5,7 @@ go 1.22.0 replace ( github.com/DataDog/datadog-agent/cmd/agent/common/path => ../../../../cmd/agent/common/path github.com/DataDog/datadog-agent/comp/api/api/def => ../../../api/api/def + github.com/DataDog/datadog-agent/comp/api/authtoken => ../../../api/authtoken github.com/DataDog/datadog-agent/comp/core/config => ../../../core/config github.com/DataDog/datadog-agent/comp/core/flare/builder => ../../../core/flare/builder github.com/DataDog/datadog-agent/comp/core/flare/types => ../../../core/flare/types @@ -101,10 +102,13 @@ replace ( ) require ( + github.com/DataDog/datadog-agent/comp/api/authtoken v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/processor/infraattributesprocessor v0.0.0-00010101000000-000000000000 + github.com/DataDog/datadog-agent/pkg/api v0.56.2 + github.com/gorilla/mux v1.8.1 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.104.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0 github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.104.0 @@ -151,17 +155,17 @@ require ( github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.3.1 // indirect github.com/DataDog/agent-payload/v5 v5.0.123 // indirect - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/core/config v0.56.2 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.2 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.2 // indirect github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/comp/core/log/def v0.0.0-00010101000000-000000000000 // indirect + github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel // indirect github.com/DataDog/datadog-agent/comp/core/secrets v0.57.0 // indirect github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/types v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/utils v0.56.2 // indirect github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.3 // indirect - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.2 // indirect github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.3 // indirect @@ -182,7 +186,7 @@ require ( github.com/DataDog/datadog-agent/pkg/config/model v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/config/setup v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.0.0-00010101000000-000000000000 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.3 // indirect @@ -213,7 +217,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/common v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/executable v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.0 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/json v0.56.0-rc.3 // indirect @@ -228,7 +232,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/system/socket v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/util/tagger v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.0 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.3 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.2 // indirect github.com/DataDog/datadog-api-client-go/v2 v2.26.0 // indirect github.com/DataDog/datadog-go/v5 v5.5.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240816154533-f7f9beb53a42 // indirect diff --git a/comp/otelcol/ddflareextension/impl/go.sum b/comp/otelcol/ddflareextension/impl/go.sum index 7d4fd6329a01a..9348e749fc7ac 100644 --- a/comp/otelcol/ddflareextension/impl/go.sum +++ b/comp/otelcol/ddflareextension/impl/go.sum @@ -59,6 +59,8 @@ github.com/DataDog/agent-payload/v5 v5.0.123 h1:fc/mME+zXBPo8i8690rVJXeqlZ1o+8ix github.com/DataDog/agent-payload/v5 v5.0.123/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= github.com/DataDog/datadog-agent/comp/core/log v0.54.0 h1:wP3bJua8qmURqLXkmYxrbELMJQ2oO1MuVNfxHJT4wiQ= github.com/DataDog/datadog-agent/comp/core/log v0.54.0/go.mod h1:mtMxZiwg13b4bHgDf8xE6FHgTcadzI5Cc0lx2MSY1mE= +github.com/DataDog/datadog-agent/pkg/api v0.56.2 h1:gxC0lHK6kVt39F60iqRlC1Hp8Ca4+mFzHZ8L+n6zu6k= +github.com/DataDog/datadog-agent/pkg/api v0.56.2/go.mod h1:ZUs3zQrbysHi11uKvYIhxyygjSAgtZGyG5W+TBJ0sgo= github.com/DataDog/datadog-api-client-go/v2 v2.26.0 h1:bZr0hu+hx8L91+yU5EGw8wK3FlCVEIashpx+cylWsf0= github.com/DataDog/datadog-api-client-go/v2 v2.26.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= @@ -358,6 +360,8 @@ github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7 github.com/gophercloud/gophercloud v1.8.0 h1:TM3Jawprb2NrdOnvcHhWJalmKmAmOGgfZElM/3oBYCk= github.com/gophercloud/gophercloud v1.8.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= +github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= diff --git a/go.mod b/go.mod index e03213dc5825a..304b6e944ae47 100644 --- a/go.mod +++ b/go.mod @@ -26,6 +26,7 @@ replace ( replace ( github.com/DataDog/datadog-agent/cmd/agent/common/path => ./cmd/agent/common/path/ github.com/DataDog/datadog-agent/comp/api/api/def => ./comp/api/api/def/ + github.com/DataDog/datadog-agent/comp/api/authtoken => ./comp/api/authtoken github.com/DataDog/datadog-agent/comp/core/config => ./comp/core/config/ github.com/DataDog/datadog-agent/comp/core/flare/builder => ./comp/core/flare/builder github.com/DataDog/datadog-agent/comp/core/flare/types => ./comp/core/flare/types @@ -596,6 +597,7 @@ require ( ) require ( + github.com/DataDog/datadog-agent/comp/api/authtoken v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/core/tagger/utils v0.56.2 github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl v0.0.0-00010101000000-000000000000 @@ -617,7 +619,7 @@ require ( github.com/DataDog/datadog-agent/comp/core/config v0.56.0 github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 - github.com/DataDog/datadog-agent/comp/core/log/def v0.0.0-00010101000000-000000000000 + github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel github.com/DataDog/datadog-agent/comp/core/log/impl v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/core/log/impl-trace v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/core/log/mock v0.0.0-00010101000000-000000000000 From e52311fda680ae09495967bfb34097325c46cdc7 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 4 Sep 2024 18:33:14 +0200 Subject: [PATCH 05/14] [mod] updating replaces --- comp/api/authtoken/go.mod | 10 ++++++++-- comp/api/authtoken/go.sum | 24 ++++++++---------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/comp/api/authtoken/go.mod b/comp/api/authtoken/go.mod index c691be1f53887..52a0ac2584d81 100644 --- a/comp/api/authtoken/go.mod +++ b/comp/api/authtoken/go.mod @@ -3,7 +3,12 @@ module github.com/DataDog/datadog-agent/comp/api/authtoken go 1.22.0 replace ( + github.com/DataDog/datadog-agent/comp/core/config => ../../../comp/core/config + github.com/DataDog/datadog-agent/comp/def => ../../../comp/def + github.com/DataDog/datadog-agent/pkg/config/mock => ../../../pkg/config/mock github.com/DataDog/datadog-agent/pkg/config/model => ../../../pkg/config/model + github.com/DataDog/datadog-agent/pkg/config/setup => ../../../pkg/config/setup + github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../pkg/util/fxutil github.com/DataDog/datadog-agent/pkg/util/log => ../../../pkg/util/log github.com/DataDog/datadog-agent/pkg/util/log/setup => ../../../pkg/util/log/setup github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../pkg/util/scrubber @@ -27,6 +32,7 @@ require ( github.com/DataDog/datadog-agent/comp/def v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 // indirect + github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel // indirect github.com/DataDog/datadog-agent/pkg/config/model v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 // indirect github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 // indirect @@ -70,8 +76,8 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/dig v1.18.0 // indirect - go.uber.org/multierr v1.10.0 // indirect - go.uber.org/zap v1.26.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect golang.org/x/mod v0.20.0 // indirect golang.org/x/sync v0.8.0 // indirect diff --git a/comp/api/authtoken/go.sum b/comp/api/authtoken/go.sum index f26618c24cbdc..e351cb2c00997 100644 --- a/comp/api/authtoken/go.sum +++ b/comp/api/authtoken/go.sum @@ -1,12 +1,10 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0 h1:4ppN8uMvt2Y1Xntchb5n0wrDOeuEIcOC8E13R46OwVk= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0/go.mod h1:89QL6A7FgXhJbvhv40JxTHGSWC+rW/UA7ezjjBPakDM= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.3 h1:dLdkfKaylsdBUt/15TxuSi0gmUwQ+XcNfE+QIkTYZ/4= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.3/go.mod h1:XwtUqn5UJ5MqjmsZ4NvJ+eZIkTB35ZQLQS/1pQmvdb8= github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0 h1:+8heVDzPVONtqdNnZJg1TiM1xl5iFF3ViUMpuzy+/WE= github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0/go.mod h1:B7o1FsKlzr4JSS+CYKYuyABr3eaaq2W7fIA56ntxGHQ= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0 h1:f8Bx4HqUmvzorZPMT4pmMe+gOUOCmZRp/uTI3rqJIag= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0/go.mod h1:Lt1Kbt6yvh/2raESb24eglWj2tG/fSz1NGIPLXTRXTk= github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 h1://josmUH6k/r4bxIaGjjhFnp84pw1V8A4DeylL6q+YI= github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0/go.mod h1:4+dV4tF5qJzvE1qH9jar+CZ/FKLeD6npShwqIcEFLgU= github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 h1:HfKnHKqnGokbtfYIoB2mSXcskeF7+Fx36E81LXqypfc= @@ -19,24 +17,18 @@ github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0 h1:I1K7ZutddMYOZi8rMO github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0/go.mod h1:SfjdMenfVFm4zh1sZVWLYzaAtSDqiBqNJVBSOtIuZKc= github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0 h1:Ertcl862qNroQ2P36TN1iwrq9TdReeWQpuQKmq2IOPo= github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0/go.mod h1:SEZ79adu071FHgeKFdnnbBjVMe5K4cXKAf9YIBmkw68= -github.com/DataDog/datadog-agent/comp/def v0.56.0 h1:Rh7LpGLZuuTF4ngtIQQ5tZXPjdU7H7nbvdS4WavIWX0= -github.com/DataDog/datadog-agent/comp/def v0.56.0/go.mod h1:DEWoZ2fdGE8yy5Q/p8w06DLm3cBWxW8i9a/xNUxE2qc= github.com/DataDog/datadog-agent/pkg/api v0.56.0 h1:S1BFvrGu0MBQ1y6YpNA/eRUr1ICMFGN9zi8d+ODT5ZA= github.com/DataDog/datadog-agent/pkg/api v0.56.0/go.mod h1:ahmoF6W16k3ydGslHxvlFabGEmVIbpEnQw2DnX+xGEE= github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 h1:9tGkoQvRGMBZvR/So18TY96cKd6C+13S3A8JEgR42ME= github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0/go.mod h1:s9QBNtoBURzy/0FeBInQ7kawNj04OnBNUo8xYr26z3E= github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 h1:jUWiF/S3oxecKm0f2MyU2EvPhKyvl2JydEd6p8tkmus= github.com/DataDog/datadog-agent/pkg/config/env v0.56.0/go.mod h1:oohlS9RJ04nDM1QlBmrNmbqUsA/l0Ov+74lcg3CL5nI= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0 h1:Zy0rk0AhYgpLVJVw4Gy2R++Vr2DgKHUkzRyPYTt36Pk= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0/go.mod h1:kS5c6cEZW73+3vqb/uRL6oFU/Y+vwL6f82im9YXydgI= github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 h1:aBD+eiR6gh7X7pfvQKG1oBjN11yh880J/JZa9/FgRgY= github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0/go.mod h1:5bFhXoEKiRKu2SOKSiSJqRA0TIbo1Be4dlV0ZT4sEcc= github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0 h1:oyJx5AY+nfrl/UoBfhY+vlf5AhVYHBh//J575aYA+90= github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0/go.mod h1:mSSn2OzsdgoUnPyBmF8rEDU+ee1RFp+H6LFsJSteN9o= github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 h1:0zxtWX4OCmvvS3LhRxBvrDEp2NyulXLY9xasy7VRlqI= github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0/go.mod h1:dWUsf3Fa8Yt3hBLU5weUtrpHOBy5lfeI/DOPmx1/0sc= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 h1:xeKPmFWYgS0kfEyIVRHtsY7Idw9p+KxteBbmD1D1JBM= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0/go.mod h1:bg80z4Wv3//+k+mPl1Bvrfy666cgJMKPymbr5QumT8g= github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 h1:gBEY8MReoTEsJfO75YoWiVjR4fbLtrfMADcsp+tARLA= github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0/go.mod h1:whUpbBTr1GbwrF3aR0zAVFOJ+g3Z3d3tc/zl8RTndy4= github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0 h1:/ra+IEI+DzkOZiZkNwabae7AarqhszhYSv8cS9lddYU= @@ -292,17 +284,17 @@ go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw= go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE= go.uber.org/fx v1.22.2 h1:iPW+OPxv0G8w75OemJ1RAnTUrF55zOJlXlo1TbJ0Buw= go.uber.org/fx v1.22.2/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= -go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.14.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From 24c052e5955f7363cf739572ae00e0ed0fa243b4 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Wed, 4 Sep 2024 19:07:34 +0200 Subject: [PATCH 06/14] [otel] extension: authtoken unneeded --- comp/otelcol/ddflareextension/impl/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index 35ab76904a799..f301fda7ebda3 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -104,7 +104,7 @@ replace ( require ( github.com/DataDog/datadog-agent/comp/api/authtoken v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.0.0-00010101000000-000000000000 - github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.56.0-rc.3 + github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/processor/infraattributesprocessor v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/api v0.56.2 From 07426a965ea11c0465e57f3bcd1a04a0338d6c74 Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 5 Sep 2024 02:12:18 +0200 Subject: [PATCH 07/14] [otel] extension: update test --- .../ddflareextension/impl/extension_test.go | 19 +++++++++++++++++++ comp/otelcol/ddflareextension/impl/go.mod | 4 ++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/comp/otelcol/ddflareextension/impl/extension_test.go b/comp/otelcol/ddflareextension/impl/extension_test.go index 71d8461a0f409..13752e6cfb1fb 100644 --- a/comp/otelcol/ddflareextension/impl/extension_test.go +++ b/comp/otelcol/ddflareextension/impl/extension_test.go @@ -11,9 +11,14 @@ import ( "encoding/json" "net/http" "net/http/httptest" + "strings" "testing" ddflareextension "github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def" + apiutil "github.com/DataDog/datadog-agent/pkg/api/util" + pkgconfigmodel "github.com/DataDog/datadog-agent/pkg/config/model" + pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup" + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension" @@ -71,11 +76,25 @@ func TestNewExtension(t *testing.T) { } func TestExtensionHTTPHandler(t *testing.T) { + oldConfig := pkgconfigsetup.Datadog() + defer func() { + pkgconfigsetup.SetDatadog(oldConfig) + }() + + conf := pkgconfigmodel.NewConfig("datadog", "DD", strings.NewReplacer(".", "_")) + pkgconfigsetup.SetDatadog(conf) + err := apiutil.CreateAndSetAuthToken(conf) + if err != nil { + t.Fatal(err) + } + // Create a request req, err := http.NewRequest("GET", "/", nil) if err != nil { t.Fatal(err) } + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Authorization", "Bearer "+apiutil.GetAuthToken()) // Create a ResponseRecorder rr := httptest.NewRecorder() diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index f301fda7ebda3..671860876f5f0 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -108,6 +108,8 @@ require ( github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/processor/infraattributesprocessor v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/api v0.56.2 + github.com/DataDog/datadog-agent/pkg/config/model v0.57.0 + github.com/DataDog/datadog-agent/pkg/config/setup v0.57.0 github.com/gorilla/mux v1.8.1 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.104.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.104.0 @@ -183,8 +185,6 @@ require ( github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/config/env v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.57.0 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/config/structure v0.0.0-00010101000000-000000000000 // indirect github.com/DataDog/datadog-agent/pkg/config/utils v0.56.2 // indirect github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.3 // indirect From 8bea5ecdec80cefc9218470b46e4b433e4c4f4cf Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 5 Sep 2024 14:22:14 +0200 Subject: [PATCH 08/14] [otel] extension: small refactor to improve testability --- .../ddflareextension/impl/extension.go | 8 ++-- .../ddflareextension/impl/extension_test.go | 4 +- comp/otelcol/ddflareextension/impl/server.go | 42 ++++++++++++------- 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/comp/otelcol/ddflareextension/impl/extension.go b/comp/otelcol/ddflareextension/impl/extension.go index c1d47e758dc7e..149c19ebd8979 100644 --- a/comp/otelcol/ddflareextension/impl/extension.go +++ b/comp/otelcol/ddflareextension/impl/extension.go @@ -10,7 +10,6 @@ import ( "context" "encoding/json" "fmt" - "net" "net/http" "go.opentelemetry.io/collector/component" @@ -34,7 +33,6 @@ type ddExtension struct { telemetry component.TelemetrySettings server *http.Server - tlsListener net.Listener info component.BuildInfo debug extensionDef.DebugSourceResponse configStore *configStore @@ -151,7 +149,7 @@ func NewExtension(_ context.Context, cfg *Config, telemetry component.TelemetryS ext.configStore.setProvidedConf(providedConf) - ext.server, ext.tlsListener, err = buildHTTPServer(cfg.HTTPConfig.Endpoint, ext) + ext.server, err = newServer(cfg.HTTPConfig.Endpoint, ext) if err != nil { return nil, err } @@ -163,7 +161,7 @@ func (ext *ddExtension) Start(_ context.Context, _ component.Host) error { ext.telemetry.Logger.Info("Starting DD Extension HTTP server", zap.String("url", ext.cfg.HTTPConfig.Endpoint)) go func() { - if err := ext.server.Serve(ext.tlsListener); err != nil && err != http.ErrServerClosed { + if err := ext.server.start(); err != nil && err != http.ErrServerClosed { ext.telemetry.ReportStatus(component.NewFatalErrorEvent(err)) ext.telemetry.Logger.Info("DD Extension HTTP could not start", zap.String("err", err.Error())) } @@ -178,7 +176,7 @@ func (ext *ddExtension) Shutdown(ctx context.Context) error { ext.telemetry.Logger.Info("Shutting down HTTP server") // Give the server a grace period to finish handling requests. - return ext.server.Shutdown(ctx) + return ext.server.shutdown(ctx) } // ServeHTTP the request handler for the extension. diff --git a/comp/otelcol/ddflareextension/impl/extension_test.go b/comp/otelcol/ddflareextension/impl/extension_test.go index 13752e6cfb1fb..4b505ef31a6ad 100644 --- a/comp/otelcol/ddflareextension/impl/extension_test.go +++ b/comp/otelcol/ddflareextension/impl/extension_test.go @@ -118,8 +118,10 @@ func TestExtensionHTTPHandler(t *testing.T) { ddExt.NotifyConfig(context.TODO(), conf) assert.NoError(t, err) + handler := ddExt.server.srv.Handler + // Call the handler's ServeHTTP method - ddExt.ServeHTTP(rr, req) + handler.ServeHTTP(rr, req) // Check the response status code assert.Equalf(t, http.StatusOK, rr.Code, diff --git a/comp/otelcol/ddflareextension/impl/server.go b/comp/otelcol/ddflareextension/impl/server.go index 0ab2a4787734d..4b3c0fcf0c104 100644 --- a/comp/otelcol/ddflareextension/impl/server.go +++ b/comp/otelcol/ddflareextension/impl/server.go @@ -7,6 +7,7 @@ package ddflareextensionimpl import ( + "context" "crypto/rand" "crypto/rsa" "crypto/tls" @@ -23,6 +24,11 @@ import ( "github.com/gorilla/mux" ) +type server struct { + srv *http.Server + listener net.Listener +} + // validateToken - validates token for legacy API func validateToken(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -33,18 +39,18 @@ func validateToken(next http.Handler) http.Handler { }) } -func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.Listener, error) { +func newServer(endpoint string, handler http.Handler) (*server, error) { // Generate a self-signed certificate key, err := rsa.GenerateKey(rand.Reader, 2048) if err != nil { - return nil, nil, err + return nil, err } serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128) serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) if err != nil { - return nil, nil, err + return nil, err } template := x509.Certificate{ @@ -70,12 +76,12 @@ func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.L certDER, err := x509.CreateCertificate(rand.Reader, &template, &template, &key.PublicKey, key) if err != nil { - return nil, nil, err + return nil, err } // parse the resulting certificate so we can use it again _, err = x509.ParseCertificate(certDER) if err != nil { - return nil, nil, err + return nil, err } // PEM encode the certificate (this is a standard TLS encoding) b := pem.Block{Type: "CERTIFICATE", Bytes: certDER} @@ -87,13 +93,13 @@ func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.L pair, err := tls.X509KeyPair(certPEM, keyPEM) if err != nil { - return nil, nil, fmt.Errorf("unable to generate TLS key pair: %v", err) + return nil, fmt.Errorf("unable to generate TLS key pair: %v", err) } tlsCertPool := x509.NewCertPool() ok := tlsCertPool.AppendCertsFromPEM(certPEM) if !ok { - return nil, nil, fmt.Errorf("unable to add new certificate to pool") + return nil, fmt.Errorf("unable to add new certificate to pool") } // Create TLS configuration @@ -108,7 +114,7 @@ func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.L r.Use(validateToken) - server := &http.Server{ + s := &http.Server{ Addr: endpoint, TLSConfig: tlsConfig, Handler: r, @@ -116,14 +122,22 @@ func buildHTTPServer(endpoint string, handler http.Handler) (*http.Server, net.L listener, err := net.Listen("tcp", endpoint) if err != nil { - return nil, nil, err + return nil, err } - tlsListener := tls.NewListener(listener, server.TLSConfig) - go func() { - _ = server.Serve(tlsListener) - }() + tlsListener := tls.NewListener(listener, s.TLSConfig) + + return &server{ + srv: s, + listener: tlsListener, + }, nil - return server, tlsListener, nil +} + +func (s *server) start() error { + return s.srv.Serve(s.listener) +} +func (s *server) shutdown(ctx context.Context) error { + return s.srv.Shutdown(ctx) } From 1328a2ed6d510f3d0e7f48c7e41804dc9fd9791b Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 5 Sep 2024 16:29:33 +0200 Subject: [PATCH 09/14] [otel] extension: adding test for bad token --- .../ddflareextension/impl/extension_test.go | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/comp/otelcol/ddflareextension/impl/extension_test.go b/comp/otelcol/ddflareextension/impl/extension_test.go index 4b505ef31a6ad..aef5cfeaf39f8 100644 --- a/comp/otelcol/ddflareextension/impl/extension_test.go +++ b/comp/otelcol/ddflareextension/impl/extension_test.go @@ -149,6 +149,56 @@ func TestExtensionHTTPHandler(t *testing.T) { } } +func TestExtensionHTTPHandlerBadToken(t *testing.T) { + oldConfig := pkgconfigsetup.Datadog() + defer func() { + pkgconfigsetup.SetDatadog(oldConfig) + }() + + conf := pkgconfigmodel.NewConfig("datadog", "DD", strings.NewReplacer(".", "_")) + pkgconfigsetup.SetDatadog(conf) + err := apiutil.CreateAndSetAuthToken(conf) + if err != nil { + t.Fatal(err) + } + + // Create a request + req, err := http.NewRequest("GET", "/", nil) + if err != nil { + t.Fatal(err) + } + req.Header.Set("Content-Type", "application/json") + req.Header.Set("Authorization", "Bearer badtoken") + + // Create a ResponseRecorder + rr := httptest.NewRecorder() + + // Create an instance of your handler + ext, err := getTestExtension(t) + require.NoError(t, err) + + ddExt := ext.(*ddExtension) + ddExt.telemetry.Logger = zap.New(zap.NewNop().Core()) + + host := newHostWithExtensions( + map[component.ID]component.Component{ + component.MustNewIDWithName("pprof", "custom"): nil, + }, + ) + + ddExt.Start(context.TODO(), host) + + handler := ddExt.server.srv.Handler + + // Call the handler's ServeHTTP method + handler.ServeHTTP(rr, req) + + // Check the response status code + assert.Equalf(t, http.StatusForbidden, rr.Code, + "handler returned wrong status code: got %v want %v", rr.Code, http.StatusForbidden) + +} + type hostWithExtensions struct { component.Host exts map[component.ID]component.Component From 7b03d5fe80d5a055f75ab194a1210601afb8dd0d Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 5 Sep 2024 16:33:46 +0200 Subject: [PATCH 10/14] [mod] go mod tidy --- go.mod | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 304b6e944ae47..75ff7436ec8fb 100644 --- a/go.mod +++ b/go.mod @@ -616,19 +616,19 @@ require ( github.com/DataDog/agent-payload/v5 v5.0.132 github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.3 - github.com/DataDog/datadog-agent/comp/core/config v0.56.0 - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 + github.com/DataDog/datadog-agent/comp/core/config v0.56.2 + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.2 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel github.com/DataDog/datadog-agent/comp/core/log/impl v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/core/log/impl-trace v0.0.0-00010101000000-000000000000 - github.com/DataDog/datadog-agent/comp/core/log/mock v0.0.0-00010101000000-000000000000 + github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel github.com/DataDog/datadog-agent/comp/core/secrets v0.57.0 github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/core/status/statusimpl v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/core/tagger/types v0.56.2 github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.3 - github.com/DataDog/datadog-agent/comp/def v0.56.0 + github.com/DataDog/datadog-agent/comp/def v0.56.2 github.com/DataDog/datadog-agent/comp/forwarder/defaultforwarder v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/forwarder/orchestrator/orchestratorinterface v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.3 @@ -651,14 +651,14 @@ require ( github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.3 github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/aggregator/ckey v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/api v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/api v0.56.2 github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.57.0 github.com/DataDog/datadog-agent/pkg/config/env v0.57.0 github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel github.com/DataDog/datadog-agent/pkg/config/model v0.57.0 github.com/DataDog/datadog-agent/pkg/config/remote v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/config/setup v0.57.0 - github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.2 github.com/DataDog/datadog-agent/pkg/errors v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.3 @@ -690,7 +690,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/executable v0.57.0 github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.0 github.com/DataDog/datadog-agent/pkg/util/flavor v0.56.0-rc.3 - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0 + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.2 github.com/DataDog/datadog-agent/pkg/util/grpc v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.0 github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 @@ -704,7 +704,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/util/uuid v0.56.0-rc.3 github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.0 - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.3 + github.com/DataDog/datadog-agent/pkg/version v0.56.2 github.com/DataDog/go-libddwaf/v3 v3.3.0 github.com/DataDog/go-sqllexer v0.0.14 github.com/Datadog/dublin-traceroute v0.0.1 @@ -768,7 +768,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.3.1 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.2 // indirect github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.0.0-20240525065430-d0b647bcb646 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/buf v0.56.0-rc.3 // indirect From 92a76d0a23ed2fd0ef9455b3e0f93ee1fc3b224a Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Thu, 5 Sep 2024 18:13:21 +0200 Subject: [PATCH 11/14] [mod] go mod fix replaces --- comp/api/authtoken/go.mod | 22 ++++++++++++ comp/api/authtoken/go.sum | 44 ----------------------- comp/otelcol/converter/impl/go.mod | 3 ++ comp/otelcol/ddflareextension/impl/go.mod | 1 + comp/otelcol/ddflareextension/impl/go.sum | 2 -- 5 files changed, 26 insertions(+), 46 deletions(-) diff --git a/comp/api/authtoken/go.mod b/comp/api/authtoken/go.mod index 52a0ac2584d81..c5c867b9842d4 100644 --- a/comp/api/authtoken/go.mod +++ b/comp/api/authtoken/go.mod @@ -3,15 +3,37 @@ module github.com/DataDog/datadog-agent/comp/api/authtoken go 1.22.0 replace ( + github.com/DataDog/datadog-agent/cmd/agent/common/path => ../../../cmd/agent/common/path + github.com/DataDog/datadog-agent/comp/api/api/def => ../../../comp/api/api/def github.com/DataDog/datadog-agent/comp/core/config => ../../../comp/core/config + github.com/DataDog/datadog-agent/comp/core/flare/builder => ../../../comp/core/flare/builder + github.com/DataDog/datadog-agent/comp/core/flare/types => ../../../comp/core/flare/types + github.com/DataDog/datadog-agent/comp/core/log/def => ../../../comp/core/log/def + github.com/DataDog/datadog-agent/comp/core/log/mock => ../../../comp/core/log/mock + github.com/DataDog/datadog-agent/comp/core/secrets => ../../../comp/core/secrets + github.com/DataDog/datadog-agent/comp/core/telemetry => ../../../comp/core/telemetry github.com/DataDog/datadog-agent/comp/def => ../../../comp/def + github.com/DataDog/datadog-agent/pkg/api => ../../../pkg/api + github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../pkg/collector/check/defaults + github.com/DataDog/datadog-agent/pkg/config/env => ../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/mock => ../../../pkg/config/mock github.com/DataDog/datadog-agent/pkg/config/model => ../../../pkg/config/model github.com/DataDog/datadog-agent/pkg/config/setup => ../../../pkg/config/setup + github.com/DataDog/datadog-agent/pkg/config/utils => ../../../pkg/config/utils + github.com/DataDog/datadog-agent/pkg/util/executable => ../../../pkg/util/executable + github.com/DataDog/datadog-agent/pkg/util/filesystem => ../../../pkg/util/filesystem github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../pkg/util/fxutil + github.com/DataDog/datadog-agent/pkg/util/hostname/validate => ../../../pkg/util/hostname/validate/ github.com/DataDog/datadog-agent/pkg/util/log => ../../../pkg/util/log github.com/DataDog/datadog-agent/pkg/util/log/setup => ../../../pkg/util/log/setup + github.com/DataDog/datadog-agent/pkg/util/optional => ../../../pkg/util/optional + github.com/DataDog/datadog-agent/pkg/util/pointer => ../../../pkg/util/pointer github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../pkg/util/scrubber + github.com/DataDog/datadog-agent/pkg/util/system => ../../../pkg/util/system + github.com/DataDog/datadog-agent/pkg/util/system/socket => ../../../pkg/util/system/socket/ + github.com/DataDog/datadog-agent/pkg/util/testutil => ../../../pkg/util/testutil + github.com/DataDog/datadog-agent/pkg/util/winutil => ../../../pkg/util/winutil + github.com/DataDog/datadog-agent/pkg/version => ../../../pkg/version ) require ( diff --git a/comp/api/authtoken/go.sum b/comp/api/authtoken/go.sum index e351cb2c00997..c0f06ba5f32fa 100644 --- a/comp/api/authtoken/go.sum +++ b/comp/api/authtoken/go.sum @@ -1,50 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.3 h1:dLdkfKaylsdBUt/15TxuSi0gmUwQ+XcNfE+QIkTYZ/4= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.3/go.mod h1:XwtUqn5UJ5MqjmsZ4NvJ+eZIkTB35ZQLQS/1pQmvdb8= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0 h1:+8heVDzPVONtqdNnZJg1TiM1xl5iFF3ViUMpuzy+/WE= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0/go.mod h1:B7o1FsKlzr4JSS+CYKYuyABr3eaaq2W7fIA56ntxGHQ= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 h1://josmUH6k/r4bxIaGjjhFnp84pw1V8A4DeylL6q+YI= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0/go.mod h1:4+dV4tF5qJzvE1qH9jar+CZ/FKLeD6npShwqIcEFLgU= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 h1:HfKnHKqnGokbtfYIoB2mSXcskeF7+Fx36E81LXqypfc= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0/go.mod h1:3Tg/gIhMzFaDhgRZoXoh3cfz+gVIJq6vwga476veV4c= -github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel h1:B40fb8UOJEgomNZxZC95bpH84n3I765MdREnlZomoFk= -github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel/go.mod h1:nHxfEUF4827oAcQvyLCuTvOSyJ64eQ8di6D+0CuBAok= -github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel h1:L1HWFQ9sqkNiuVwza9eZou1sZkvO+EcfqK9mnAnJPnk= -github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel/go.mod h1:GZF6c+WqwIapflJ91ESj6LP4ZjuB5vinfxqdblS+tV8= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0 h1:I1K7ZutddMYOZi8rMOu1KZ7EHDEVpIFMzwXIz3FR2rw= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0/go.mod h1:SfjdMenfVFm4zh1sZVWLYzaAtSDqiBqNJVBSOtIuZKc= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0 h1:Ertcl862qNroQ2P36TN1iwrq9TdReeWQpuQKmq2IOPo= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0/go.mod h1:SEZ79adu071FHgeKFdnnbBjVMe5K4cXKAf9YIBmkw68= -github.com/DataDog/datadog-agent/pkg/api v0.56.0 h1:S1BFvrGu0MBQ1y6YpNA/eRUr1ICMFGN9zi8d+ODT5ZA= -github.com/DataDog/datadog-agent/pkg/api v0.56.0/go.mod h1:ahmoF6W16k3ydGslHxvlFabGEmVIbpEnQw2DnX+xGEE= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0 h1:9tGkoQvRGMBZvR/So18TY96cKd6C+13S3A8JEgR42ME= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0/go.mod h1:s9QBNtoBURzy/0FeBInQ7kawNj04OnBNUo8xYr26z3E= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0 h1:jUWiF/S3oxecKm0f2MyU2EvPhKyvl2JydEd6p8tkmus= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0/go.mod h1:oohlS9RJ04nDM1QlBmrNmbqUsA/l0Ov+74lcg3CL5nI= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 h1:aBD+eiR6gh7X7pfvQKG1oBjN11yh880J/JZa9/FgRgY= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0/go.mod h1:5bFhXoEKiRKu2SOKSiSJqRA0TIbo1Be4dlV0ZT4sEcc= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0 h1:oyJx5AY+nfrl/UoBfhY+vlf5AhVYHBh//J575aYA+90= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0/go.mod h1:mSSn2OzsdgoUnPyBmF8rEDU+ee1RFp+H6LFsJSteN9o= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0 h1:0zxtWX4OCmvvS3LhRxBvrDEp2NyulXLY9xasy7VRlqI= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0/go.mod h1:dWUsf3Fa8Yt3hBLU5weUtrpHOBy5lfeI/DOPmx1/0sc= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0 h1:gBEY8MReoTEsJfO75YoWiVjR4fbLtrfMADcsp+tARLA= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0/go.mod h1:whUpbBTr1GbwrF3aR0zAVFOJ+g3Z3d3tc/zl8RTndy4= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0 h1:/ra+IEI+DzkOZiZkNwabae7AarqhszhYSv8cS9lddYU= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0/go.mod h1:xWT/KJdJg2/0pZyAKZ6XmIiE5sM+AyUo4qvKuPHQ17U= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0 h1:iREfubwLFZjRZV9QGtvSRiW5Bd3OZfa4+P27d3ABJ0Q= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0/go.mod h1:t1DlnUEMltkvwPLc7zCtP1u5cBDu+30daR2VhQO5bvA= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0 h1:9cIQ2RGV0Hs6mFRar3mW78csqa1J/D3ePnClRqbbAy8= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0/go.mod h1:nBo8e+pSw+Whns5kqcwoPqOiZ6TSH2f71xgw5Kw85EM= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0 h1:/vDPU6LVFZi1ZOt9yot3SmWI/wsHRSNBAnLocPtw7WI= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0/go.mod h1:tBwAMDAEJEaZ5VNe19GJoLLzviZGOPUJH0WnzETWhyY= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0 h1:z0JZcMDTAlxlV9P59pyHT++536jAFDUiQkaIERYWWJY= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0/go.mod h1:m/uWLdpGEi3x/5gybZFeYNEnIdKhGtWW8kFZuM+GSFA= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0 h1:9mcquatK2Z6HLOcYA57j4x4ifjEDwfcgnUiMnO/0woE= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0/go.mod h1:o88yQRcQQU2Dm4BcIRV2JRdjBpemO9OmeN2ZRVYWuBg= -github.com/DataDog/datadog-agent/pkg/version v0.56.0 h1:k1+mEfnUI07IGGx1Tf1xoC/OFmVLD+ugyN6P0cWpvJE= -github.com/DataDog/datadog-agent/pkg/version v0.56.0/go.mod h1:rcA7LtIB5WLpxsems/bWO1iXkyGEgHHje7vJ0b20ZpU= github.com/DataDog/viper v1.13.5 h1:SZMcyMknYQN2jRY/40A16gUXexlNJOI8sDs1cWZnI64= github.com/DataDog/viper v1.13.5/go.mod h1:wDdUVJ2SHaMaPrCZrlRCObwkubsX8j5sme3LaR/SGTc= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= diff --git a/comp/otelcol/converter/impl/go.mod b/comp/otelcol/converter/impl/go.mod index 0b4ee82140ee6..7d70391723766 100644 --- a/comp/otelcol/converter/impl/go.mod +++ b/comp/otelcol/converter/impl/go.mod @@ -15,11 +15,13 @@ replace ( github.com/DataDog/datadog-agent/comp/otelcol/converter/def => ../def github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def => ../../ddflareextension/def/ github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/impl => ../../ddflareextension/impl/ + github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/mock => ../../../../pkg/config/mock github.com/DataDog/datadog-agent/pkg/config/model => ../../../../pkg/config/model github.com/DataDog/datadog-agent/pkg/config/setup => ../../../../pkg/config/setup + github.com/DataDog/datadog-agent/pkg/config/utils => ../../../../pkg/config/utils github.com/DataDog/datadog-agent/pkg/util/executable => ../../../../pkg/util/executable github.com/DataDog/datadog-agent/pkg/util/filesystem => ../../../../pkg/util/filesystem github.com/DataDog/datadog-agent/pkg/util/fxutil => ../../../../pkg/util/fxutil @@ -32,6 +34,7 @@ replace ( github.com/DataDog/datadog-agent/pkg/util/system/socket => ../../../../pkg/util/system/socket github.com/DataDog/datadog-agent/pkg/util/testutil => ../../../../pkg/util/testutil github.com/DataDog/datadog-agent/pkg/util/winutil => ../../../../pkg/util/winutil + github.com/DataDog/datadog-agent/pkg/version => ../../../../pkg/version ) require ( diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index 671860876f5f0..c6660a36ffc6b 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -39,6 +39,7 @@ replace ( github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip => ../../../trace/compression/impl-gzip github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd => ../../../trace/compression/impl-zstd github.com/DataDog/datadog-agent/pkg/aggregator/ckey => ../../../../pkg/aggregator/ckey + github.com/DataDog/datadog-agent/pkg/api => ../../../../pkg/api github.com/DataDog/datadog-agent/pkg/collector/check/defaults => ../../../../pkg/collector/check/defaults github.com/DataDog/datadog-agent/pkg/config/env => ../../../../pkg/config/env github.com/DataDog/datadog-agent/pkg/config/mock => ../../../../pkg/config/mock diff --git a/comp/otelcol/ddflareextension/impl/go.sum b/comp/otelcol/ddflareextension/impl/go.sum index 9348e749fc7ac..abf09d6988e60 100644 --- a/comp/otelcol/ddflareextension/impl/go.sum +++ b/comp/otelcol/ddflareextension/impl/go.sum @@ -59,8 +59,6 @@ github.com/DataDog/agent-payload/v5 v5.0.123 h1:fc/mME+zXBPo8i8690rVJXeqlZ1o+8ix github.com/DataDog/agent-payload/v5 v5.0.123/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= github.com/DataDog/datadog-agent/comp/core/log v0.54.0 h1:wP3bJua8qmURqLXkmYxrbELMJQ2oO1MuVNfxHJT4wiQ= github.com/DataDog/datadog-agent/comp/core/log v0.54.0/go.mod h1:mtMxZiwg13b4bHgDf8xE6FHgTcadzI5Cc0lx2MSY1mE= -github.com/DataDog/datadog-agent/pkg/api v0.56.2 h1:gxC0lHK6kVt39F60iqRlC1Hp8Ca4+mFzHZ8L+n6zu6k= -github.com/DataDog/datadog-agent/pkg/api v0.56.2/go.mod h1:ZUs3zQrbysHi11uKvYIhxyygjSAgtZGyG5W+TBJ0sgo= github.com/DataDog/datadog-api-client-go/v2 v2.26.0 h1:bZr0hu+hx8L91+yU5EGw8wK3FlCVEIashpx+cylWsf0= github.com/DataDog/datadog-api-client-go/v2 v2.26.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= From 009b5f851ebfa2df83c1d4f8b67782f3717f8f1d Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Fri, 6 Sep 2024 17:58:29 +0200 Subject: [PATCH 12/14] [otel-agent] extension: refactor tests --- .../ddflareextension/impl/extension_test.go | 87 ++++++++----------- 1 file changed, 35 insertions(+), 52 deletions(-) diff --git a/comp/otelcol/ddflareextension/impl/extension_test.go b/comp/otelcol/ddflareextension/impl/extension_test.go index aef5cfeaf39f8..5690a829a96d2 100644 --- a/comp/otelcol/ddflareextension/impl/extension_test.go +++ b/comp/otelcol/ddflareextension/impl/extension_test.go @@ -66,35 +66,20 @@ func getTestExtension(t *testing.T) (ddflareextension.Component, error) { return NewExtension(c, cfg, telemetry, info) } -func TestNewExtension(t *testing.T) { - ext, err := getTestExtension(t) - assert.NoError(t, err) - assert.NotNil(t, ext) - - _, ok := ext.(*ddExtension) - assert.True(t, ok) -} - -func TestExtensionHTTPHandler(t *testing.T) { - oldConfig := pkgconfigsetup.Datadog() - defer func() { - pkgconfigsetup.SetDatadog(oldConfig) - }() - - conf := pkgconfigmodel.NewConfig("datadog", "DD", strings.NewReplacer(".", "_")) - pkgconfigsetup.SetDatadog(conf) - err := apiutil.CreateAndSetAuthToken(conf) - if err != nil { - t.Fatal(err) - } +func getResponseToHandlerRequest(t *testing.T, tokenOverride string) *httptest.ResponseRecorder { // Create a request req, err := http.NewRequest("GET", "/", nil) if err != nil { t.Fatal(err) } + + token := apiutil.GetAuthToken() + if tokenOverride != "" { + token = tokenOverride + } req.Header.Set("Content-Type", "application/json") - req.Header.Set("Authorization", "Bearer "+apiutil.GetAuthToken()) + req.Header.Set("Authorization", "Bearer "+token) // Create a ResponseRecorder rr := httptest.NewRecorder() @@ -123,6 +108,33 @@ func TestExtensionHTTPHandler(t *testing.T) { // Call the handler's ServeHTTP method handler.ServeHTTP(rr, req) + return rr +} + +func TestNewExtension(t *testing.T) { + ext, err := getTestExtension(t) + assert.NoError(t, err) + assert.NotNil(t, ext) + + _, ok := ext.(*ddExtension) + assert.True(t, ok) +} + +func TestExtensionHTTPHandler(t *testing.T) { + oldConfig := pkgconfigsetup.Datadog() + defer func() { + pkgconfigsetup.SetDatadog(oldConfig) + }() + + conf := pkgconfigmodel.NewConfig("datadog", "DD", strings.NewReplacer(".", "_")) + pkgconfigsetup.SetDatadog(conf) + err := apiutil.CreateAndSetAuthToken(conf) + if err != nil { + t.Fatal(err) + } + + rr := getResponseToHandlerRequest(t, "") + // Check the response status code assert.Equalf(t, http.StatusOK, rr.Code, "handler returned wrong status code: got %v want %v", rr.Code, http.StatusOK) @@ -162,36 +174,7 @@ func TestExtensionHTTPHandlerBadToken(t *testing.T) { t.Fatal(err) } - // Create a request - req, err := http.NewRequest("GET", "/", nil) - if err != nil { - t.Fatal(err) - } - req.Header.Set("Content-Type", "application/json") - req.Header.Set("Authorization", "Bearer badtoken") - - // Create a ResponseRecorder - rr := httptest.NewRecorder() - - // Create an instance of your handler - ext, err := getTestExtension(t) - require.NoError(t, err) - - ddExt := ext.(*ddExtension) - ddExt.telemetry.Logger = zap.New(zap.NewNop().Core()) - - host := newHostWithExtensions( - map[component.ID]component.Component{ - component.MustNewIDWithName("pprof", "custom"): nil, - }, - ) - - ddExt.Start(context.TODO(), host) - - handler := ddExt.server.srv.Handler - - // Call the handler's ServeHTTP method - handler.ServeHTTP(rr, req) + rr := getResponseToHandlerRequest(t, "badtoken") // Check the response status code assert.Equalf(t, http.StatusForbidden, rr.Code, From b2588a236732e6c26702eb9ee248521ca5f6f159 Mon Sep 17 00:00:00 2001 From: jackgopack4 Date: Fri, 6 Sep 2024 13:29:38 -0400 Subject: [PATCH 13/14] [mod] fix modules.py check --- tasks/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/modules.py b/tasks/modules.py index 910abf95380bf..4c0c19f495556 100644 --- a/tasks/modules.py +++ b/tasks/modules.py @@ -212,7 +212,7 @@ def dependency_path(self, agent_version): "internal/tools/modparser": GoModule("internal/tools/modparser", condition=lambda: False, should_tag=False), "internal/tools/proto": GoModule("internal/tools/proto", condition=lambda: False, should_tag=False), "pkg/aggregator/ckey": GoModule("pkg/aggregator/ckey", independent=True, used_by_otel=True), - "pkg/api": GoModule("pkg/api", independent=True), + "pkg/api": GoModule("pkg/api", independent=True, used_by_otel=True), "pkg/collector/check/defaults": GoModule("pkg/collector/check/defaults", independent=True, used_by_otel=True), "pkg/config/env": GoModule("pkg/config/env", independent=True, used_by_otel=True), "pkg/config/mock": GoModule("pkg/config/mock", independent=True, used_by_otel=True), From e9c25316a377ec39fbd9cad9f55804d0cb27e4bc Mon Sep 17 00:00:00 2001 From: Jaime Fullaondo Date: Fri, 27 Sep 2024 00:52:53 +0200 Subject: [PATCH 14/14] [otel] extension: addressing poorly resolved conflict --- comp/otelcol/ddflareextension/impl/config.go | 2 -- comp/otelcol/ddflareextension/impl/extension.go | 2 +- comp/otelcol/ddflareextension/impl/go.mod | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/comp/otelcol/ddflareextension/impl/config.go b/comp/otelcol/ddflareextension/impl/config.go index 7c02e1d2971ae..640ed5c2030af 100644 --- a/comp/otelcol/ddflareextension/impl/config.go +++ b/comp/otelcol/ddflareextension/impl/config.go @@ -10,7 +10,6 @@ import ( "errors" "fmt" - apiauth "github.com/DataDog/datadog-agent/comp/api/authtoken" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/confmap" @@ -35,7 +34,6 @@ type Config struct { factories *otelcol.Factories configProviderSettings otelcol.ConfigProviderSettings - authtoken apiauth.Component } var _ component.Config = (*Config)(nil) diff --git a/comp/otelcol/ddflareextension/impl/extension.go b/comp/otelcol/ddflareextension/impl/extension.go index 149c19ebd8979..a03353d72b3ef 100644 --- a/comp/otelcol/ddflareextension/impl/extension.go +++ b/comp/otelcol/ddflareextension/impl/extension.go @@ -32,7 +32,7 @@ type ddExtension struct { cfg *Config // Extension configuration. telemetry component.TelemetrySettings - server *http.Server + server *server info component.BuildInfo debug extensionDef.DebugSourceResponse configStore *configStore diff --git a/comp/otelcol/ddflareextension/impl/go.mod b/comp/otelcol/ddflareextension/impl/go.mod index c6660a36ffc6b..f102a9bdee01f 100644 --- a/comp/otelcol/ddflareextension/impl/go.mod +++ b/comp/otelcol/ddflareextension/impl/go.mod @@ -103,7 +103,6 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/comp/api/authtoken v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/converter/impl v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/ddflareextension/def v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/datadogexporter v0.0.0-00010101000000-000000000000 @@ -163,6 +162,7 @@ require ( github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.2 // indirect github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/core/log/def v0.58.0-devel // indirect + github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel // indirect github.com/DataDog/datadog-agent/comp/core/secrets v0.57.0 // indirect github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/comp/core/tagger/types v0.56.0-rc.3 // indirect @@ -223,6 +223,7 @@ require ( github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/json v0.56.0-rc.3 // indirect github.com/DataDog/datadog-agent/pkg/util/log v0.57.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect github.com/DataDog/datadog-agent/pkg/util/optional v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/util/pointer v0.57.0 // indirect github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.0 // indirect