From ed0ecacb38e8de5a5558ddae019d0985dcd66b1b Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Tue, 22 Aug 2023 07:46:25 -0700 Subject: [PATCH 01/13] chore: update OpenTelemetry to v0.83.0 --- common/go.mod | 2 +- common/go.sum | 4 +- influx2otel/go.mod | 12 ++-- influx2otel/go.sum | 26 +++---- jaeger-influxdb/go.mod | 2 +- jaeger-influxdb/go.sum | 4 +- otel2influx/go.mod | 14 ++-- otel2influx/go.sum | 30 ++++----- otelcol-influxdb/Dockerfile | 2 +- otelcol-influxdb/build.yml | 43 ++++++------ tests-integration/go.mod | 61 +++++++++-------- tests-integration/go.sum | 131 ++++++++++++++++++------------------ 12 files changed, 164 insertions(+), 167 deletions(-) diff --git a/common/go.mod b/common/go.mod index 416ec172..152c127c 100644 --- a/common/go.mod +++ b/common/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.82.0 + go.opentelemetry.io/collector/semconv v0.83.0 ) require ( diff --git a/common/go.sum b/common/go.sum index 83d19a0f..004bfe68 100644 --- a/common/go.sum +++ b/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/semconv v0.82.0 h1:WUeT2a+uZjI6kLvwcBaJnGvo7KSQ/9dIFRcxOQdXucc= -go.opentelemetry.io/collector/semconv v0.82.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= +go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/influx2otel/go.mod b/influx2otel/go.mod index 404efe9c..e3e6f410 100644 --- a/influx2otel/go.mod +++ b/influx2otel/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/influxdata/influxdb-observability/common v0.5.5 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.82.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.82.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.82.0 + go.opentelemetry.io/collector/semconv v0.83.0 ) require ( @@ -21,9 +21,9 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/influx2otel/go.sum b/influx2otel/go.sum index e169b81c..947669e1 100644 --- a/influx2otel/go.sum +++ b/influx2otel/go.sum @@ -22,11 +22,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.82.0 h1:0b6glbENAwPdasKKVOgpR/EaZG1sJhsUfXCRiwZ0drU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.82.0 h1:wBX6PvwO5mopN+uuVU1pyfl54OdrrRT+VPRCyl22O1A= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.82.0/go.mod h1:8bbFs0G0deA/M9oRGqUJ5n/+N1wejo/6CSWztEnz3Hc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.82.0 h1:zSQ0EolsXY3F18kFwEpqAkLc5C2/DE0vbFS3QfMpsDc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.82.0/go.mod h1:wbgo9BklRN8M4Mi+76mo9bMVQY2C5gL/rPKwePQL3l0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 h1:rwaJhPhZf/4A0exUs4cjALn6jnFU2QAL5cSJ/FwzcsE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 h1:/6X4L5BrCyy5Uz/jnLwkiv9E6VfuJl9EFJztWtkWvps= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0/go.mod h1:Dlxbly9XL8iSnb1bsJtpz5OUVtJ+nVTTqbsfy1itydk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 h1:yEuD/gKHNVMwjT4mRZAeUVCe/VO2tqeb5+aFim5jQJs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -38,8 +38,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.82.0 h1:WUeT2a+uZjI6kLvwcBaJnGvo7KSQ/9dIFRcxOQdXucc= -go.opentelemetry.io/collector/semconv v0.82.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= +go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -51,20 +51,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= 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.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index ae548942..6c0c103f 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -14,7 +14,7 @@ require ( github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.82.0 + go.opentelemetry.io/collector/semconv v0.83.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.56.2 diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index a7012acd..6f137a41 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -290,8 +290,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.82.0 h1:WUeT2a+uZjI6kLvwcBaJnGvo7KSQ/9dIFRcxOQdXucc= -go.opentelemetry.io/collector/semconv v0.82.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= +go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= 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/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= diff --git a/otel2influx/go.mod b/otel2influx/go.mod index 866a50e0..2f19d401 100644 --- a/otel2influx/go.mod +++ b/otel2influx/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( github.com/influxdata/influxdb-observability/common v0.5.5 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.82.0 + go.opentelemetry.io/collector/consumer v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.82.0 + go.opentelemetry.io/collector/semconv v0.83.0 go.uber.org/multierr v1.11.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 ) @@ -20,11 +20,11 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect - google.golang.org/grpc v1.56.2 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/otel2influx/go.sum b/otel2influx/go.sum index 29fc555c..ce836cf4 100644 --- a/otel2influx/go.sum +++ b/otel2influx/go.sum @@ -29,13 +29,13 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.82.0 h1:MaKqWT0R4GCdkZDhYWOQkLfoJj9V7GsMbk1gsAuogaw= -go.opentelemetry.io/collector/consumer v0.82.0 h1:vZecylW6bpaphetSTjCLgwXLxSYQ6oe/kzwkx4iF5oE= -go.opentelemetry.io/collector/consumer v0.82.0/go.mod h1:qrhd0i0Gp0RkihcEXb+7Rb584Kal2NmGH1eA4Zg6puA= +go.opentelemetry.io/collector v0.83.0 h1:rKFch1CANepajPwBTvzYj/hKz7RsMyUkPPPNjRCpJ/I= +go.opentelemetry.io/collector/consumer v0.83.0 h1:8wg0UfFxxaGYsTkQGWuf1pE7C/dTvPkkYmBtR6N5BKc= +go.opentelemetry.io/collector/consumer v0.83.0/go.mod h1:YLbmTqvgIOYUlEeWun8wQ4RZ0HaYjsABWKw7nwU9F3c= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.82.0 h1:WUeT2a+uZjI6kLvwcBaJnGvo7KSQ/9dIFRcxOQdXucc= -go.opentelemetry.io/collector/semconv v0.82.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= +go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -49,20 +49,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= 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.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -71,10 +71,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile index 897991b6..411333c6 100644 --- a/otelcol-influxdb/Dockerfile +++ b/otelcol-influxdb/Dockerfile @@ -7,7 +7,7 @@ RUN \ --mount=type=cache,id=influxdb-observability-gocache,sharing=locked,target=/root/.cache/go-build \ --mount=type=cache,id=influxdb-observability-gomodcache,sharing=locked,target=/go/pkg/mod \ du -cshx /root/.cache/go-build /go/pkg/mod && \ - go install go.opentelemetry.io/collector/cmd/builder@v0.81.0 && \ + go install go.opentelemetry.io/collector/cmd/builder@v0.83.0 && \ du -cshx /root/.cache/go-build /go/pkg/mod COPY . /project diff --git a/otelcol-influxdb/build.yml b/otelcol-influxdb/build.yml index 8c0e4e11..67866d0d 100644 --- a/otelcol-influxdb/build.yml +++ b/otelcol-influxdb/build.yml @@ -2,39 +2,38 @@ dist: name: otelcol-influxdb module: github.com/influxdata/influxdb-observability/otelcol-influxdb description: OpenTelemetry Collector Distribution built for InfluxDB - version: 0.81.0-0.0.0-beta.0 - otelcol_version: 0.81.0 + version: 0.83.0-0.0.0-beta.0 + otelcol_version: 0.83.0 output_path: ./build receivers: -- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.81.0 +- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.83.0 exporters: -- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.0.0-20230710182244-4e3c466b890e +- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0 connectors: -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.81.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.83.0 extensions: -- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.81.0 -- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.81.0 +- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.83.0 +- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.83.0 processors: -- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.81.0 -- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.81.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.81.0 +- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.83.0 +- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.83.0 replaces: - github.com/influxdata/influxdb-observability/common => ../../common diff --git a/tests-integration/go.mod b/tests-integration/go.mod index 8063ed10..6d1d0fea 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -6,21 +6,21 @@ require ( github.com/influxdata/influxdb/v2 v2.6.1 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/influxdata/telegraf v1.27.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.82.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.82.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.82.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.82.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.82.0 - go.opentelemetry.io/collector/component v0.82.0 - go.opentelemetry.io/collector/confmap v0.82.0 - go.opentelemetry.io/collector/consumer v0.82.0 - go.opentelemetry.io/collector/exporter v0.82.0 - go.opentelemetry.io/collector/extension v0.82.0 + go.opentelemetry.io/collector v0.83.0 + go.opentelemetry.io/collector/component v0.83.0 + go.opentelemetry.io/collector/confmap v0.83.0 + go.opentelemetry.io/collector/consumer v0.83.0 + go.opentelemetry.io/collector/exporter v0.83.0 + go.opentelemetry.io/collector/extension v0.83.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/processor v0.82.0 - go.opentelemetry.io/collector/receiver v0.82.0 - go.uber.org/zap v1.24.0 + go.opentelemetry.io/collector/processor v0.83.0 + go.opentelemetry.io/collector/receiver v0.83.0 + go.uber.org/zap v1.25.0 google.golang.org/grpc v1.57.0 ) @@ -76,8 +76,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.82.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.82.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.16.0 // indirect @@ -87,7 +87,7 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect - github.com/shirou/gopsutil/v3 v3.23.6 // indirect + github.com/shirou/gopsutil/v3 v3.23.7 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sleepinggenius2/gosmi v0.4.4 // indirect @@ -99,17 +99,17 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.82.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.82.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.82.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.82.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.82.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.82.0 // indirect - go.opentelemetry.io/collector/config/internal v0.82.0 // indirect - go.opentelemetry.io/collector/connector v0.82.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.82.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.83.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.83.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.83.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.83.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.83.0 // indirect + go.opentelemetry.io/collector/config/internal v0.83.0 // indirect + go.opentelemetry.io/collector/connector v0.83.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/collector/semconv v0.82.0 // indirect + go.opentelemetry.io/collector/semconv v0.83.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect @@ -126,13 +126,12 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect - go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.11.0 // indirect + golang.org/x/crypto v0.12.0 // indirect golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect gonum.org/v1/gonum v0.13.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect diff --git a/tests-integration/go.sum b/tests-integration/go.sum index 28e05c51..50220bb7 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -980,19 +980,19 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.82.0 h1:U+8Jd3wXpWC9MSZavExorGoVWmgnpj33G1vZ+xQ82AM= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.82.0/go.mod h1:4h+iEf92Cy6E2tvMk/V1WR9I30nQqDum0rP4HWN9/8Q= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.82.0 h1:xzz0A7cxxtvraU22ZleikEc32ghZ3GMCDiCevs+37Zw= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.82.0/go.mod h1:eaA8YuyzBP1HikJUGYlS+3cbxndrCIAEYBU/1yMQNQo= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.82.0 h1:UQkYg2ksIEbUibN97SPMITF/1wSRynAn+aD7tC3mQKQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.82.0/go.mod h1:5VGtCES+3CySFeCO8hFzrxVgeMI8L6cINAlqr0vrv/A= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.82.0 h1:0b6glbENAwPdasKKVOgpR/EaZG1sJhsUfXCRiwZ0drU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.82.0 h1:wBX6PvwO5mopN+uuVU1pyfl54OdrrRT+VPRCyl22O1A= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.82.0/go.mod h1:8bbFs0G0deA/M9oRGqUJ5n/+N1wejo/6CSWztEnz3Hc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.82.0 h1:zSQ0EolsXY3F18kFwEpqAkLc5C2/DE0vbFS3QfMpsDc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.82.0/go.mod h1:wbgo9BklRN8M4Mi+76mo9bMVQY2C5gL/rPKwePQL3l0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.82.0 h1:trTU5rgk0/8JKWAstm3ktf6JAINEWqMsyFE+q8aetDs= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.82.0/go.mod h1:QvnXjBjxbgiUVlHOc9M28eQdeSznKKnAuz8BZkTa+uk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0 h1:TRWJBopwTJZALBsKx7IPKd9AxuruuEoOGIjcB1z85JY= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0/go.mod h1:NTT7CuT+v4OpVU/+zP/hosy1tkov/NWqFq2chSiKGVs= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 h1:Kjh+MVsvlV/vmgwnN667ln57kQiz6ZfYxyk+IONS5lA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0/go.mod h1:CMhTUJ14v2P/roC9GrV7fdVS7MCtXwOjw+JprJrfFKM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 h1:pzq9yVMgLzeo8ZsgtjDzsR+B/dt+Fc3FROAu9SV+Qu4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 h1:rwaJhPhZf/4A0exUs4cjALn6jnFU2QAL5cSJ/FwzcsE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 h1:/6X4L5BrCyy5Uz/jnLwkiv9E6VfuJl9EFJztWtkWvps= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0/go.mod h1:Dlxbly9XL8iSnb1bsJtpz5OUVtJ+nVTTqbsfy1itydk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 h1:yEuD/gKHNVMwjT4mRZAeUVCe/VO2tqeb5+aFim5jQJs= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0 h1:UMQgLKATT9yia7l6Y45ZZnVPmZ5iRpAHGfHw9h2DEy0= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0/go.mod h1:6LKpL1Uo7kGflQS4AHJNQts3joX7LQmNmNQRil28PMo= github.com/openconfig/gnmi v0.9.1 h1:hVOdLTaRjdy68oCGJbkf2vrmnUoQ5xbINqBOAMix4xM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1134,8 +1134,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shirou/gopsutil/v3 v3.23.6 h1:5y46WPI9QBKBbK7EEccUPNXpJpNrvPuTD0O2zHEHT08= -github.com/shirou/gopsutil/v3 v3.23.6/go.mod h1:j7QX50DrXYggrpN30W0Mo+I4/8U2UUIQrnrhqUeWrAU= +github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4= +github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4= 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= @@ -1275,48 +1275,48 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.82.0 h1:MaKqWT0R4GCdkZDhYWOQkLfoJj9V7GsMbk1gsAuogaw= -go.opentelemetry.io/collector v0.82.0/go.mod h1:PMmDJkZzC1xpcViHlwMMEVeAnRRl3HYy3nXgD8KJwG0= -go.opentelemetry.io/collector/component v0.82.0 h1:ID9nOGKBf5G0avhuYQlTzmwAyIMvh9B+tlckLE/4qw4= -go.opentelemetry.io/collector/component v0.82.0/go.mod h1:jSdGG4L1Ger6ob6lWpr8jmKC2qqC+XZ/gOgu7GUA5xs= -go.opentelemetry.io/collector/config/configauth v0.82.0 h1:H5xrWyPMotSqajiiH/bay8bpVsT4aq6Vih4OuArXv4Q= -go.opentelemetry.io/collector/config/configauth v0.82.0/go.mod h1:P0ukmBIUk+HP0O7yfUOKRmPmffneAQgmEL9/iTOo1CU= -go.opentelemetry.io/collector/config/configcompression v0.82.0 h1:M6a7eiHdBUB8mIioDhWugJfNm7Sw85cvv/OXyTDhtY0= -go.opentelemetry.io/collector/config/configcompression v0.82.0/go.mod h1:xhHm1sEH7BTECAJo1xn64NMxeIvZGKdVGdSKUUc+YuM= -go.opentelemetry.io/collector/config/confighttp v0.82.0 h1:2LhyqVTd+Bsr8SgsCq6+q731F81uddK9GwvGhwD/Co0= -go.opentelemetry.io/collector/config/confighttp v0.82.0/go.mod h1:OHGx/aJqGJ9z2jaBXvaylwkAuiUwikg1/n+RRDpsfOo= -go.opentelemetry.io/collector/config/confignet v0.82.0 h1:zN9JaFTn7Dth3u5ot6KZJcBZACTEzGqFWYyO5qAlYfo= -go.opentelemetry.io/collector/config/configopaque v0.82.0 h1:0Ma63QTr4AkODzEABZHtgiU5Dig8SItpHOuB28UnVSw= -go.opentelemetry.io/collector/config/configopaque v0.82.0/go.mod h1:pM1oy6gasukw3H6jAvc9Q9OtFaaY2IbfeuwCPAjOgXc= -go.opentelemetry.io/collector/config/configtelemetry v0.82.0 h1:Zln2K4S5gBDcOpBNIzM0cZS5P6cohEYstHngVvIbGBY= -go.opentelemetry.io/collector/config/configtelemetry v0.82.0/go.mod h1:KEYQRiYJdx38iZkvcLKBZWH9fK4NeafxBwGRrRKMgyA= -go.opentelemetry.io/collector/config/configtls v0.82.0 h1:eE/8muTszLlviOGLy5N08BaXLCcYqDW3mKIoKyDDa8o= -go.opentelemetry.io/collector/config/configtls v0.82.0/go.mod h1:unBTmL1bdpkp9mYEDz7N+Ln4yEwh7Ug74I1HgZMplCk= -go.opentelemetry.io/collector/config/internal v0.82.0 h1:JnnDARkXrC3OJDsMfQkBgfI0Np4s+18zvoDqZ4OH0+I= -go.opentelemetry.io/collector/config/internal v0.82.0/go.mod h1:RKcLV1gQxhgwx+6rlPYsvGMq1RZNne3UeOUZkHxJnIg= -go.opentelemetry.io/collector/confmap v0.82.0 h1:s1Rd8jz21DGlLJfED0Py9VaEq2qPWmWwWy5MriDCX+4= -go.opentelemetry.io/collector/confmap v0.82.0/go.mod h1:IS/PoUYHETtxV6+fJammTkCxxa4LEwK2u4Cx/bVCH/s= -go.opentelemetry.io/collector/connector v0.82.0 h1:sCzfcROg0IbmmwoAeLzVfcAs1ZpwlA+UzLzc3xRjOr4= -go.opentelemetry.io/collector/connector v0.82.0/go.mod h1:yXr1degja36+aAdY3qOv66jCXHs5QjiIeoerygLYC44= -go.opentelemetry.io/collector/consumer v0.82.0 h1:vZecylW6bpaphetSTjCLgwXLxSYQ6oe/kzwkx4iF5oE= -go.opentelemetry.io/collector/consumer v0.82.0/go.mod h1:qrhd0i0Gp0RkihcEXb+7Rb584Kal2NmGH1eA4Zg6puA= -go.opentelemetry.io/collector/exporter v0.82.0 h1:BWsx4rWfVwlV+qNuevSMm+2Cv6uGZYYZ9CEFqq0q+F4= -go.opentelemetry.io/collector/exporter v0.82.0/go.mod h1:e3VPpLYVNRaF+G2HuKw6A5hTBMYZ4tgRYYzMusfwFJE= -go.opentelemetry.io/collector/extension v0.82.0 h1:DH4tqrTOz0HmGDJ6FT/jRD2woQf3ugqC6QqSiQdH3wg= -go.opentelemetry.io/collector/extension v0.82.0/go.mod h1:n7d0XTh7fdyorZWTc+gLpJh78FS7GjRqIjUiW1xdhe0= -go.opentelemetry.io/collector/extension/auth v0.82.0 h1:iaxwFslRj6mfzs1wVzbnj+gDU2G98IeXW4tcrq78p5s= -go.opentelemetry.io/collector/extension/auth v0.82.0/go.mod h1:O1xBcb06pKD8g3FadLDvMa1xKZwPGdHQp4CI8vW3RCM= -go.opentelemetry.io/collector/extension/zpagesextension v0.82.0 h1:rZN8OxNy+YBjaDXYGnFoGRPBDruET1lxjVL8hzzgH5k= +go.opentelemetry.io/collector v0.83.0 h1:rKFch1CANepajPwBTvzYj/hKz7RsMyUkPPPNjRCpJ/I= +go.opentelemetry.io/collector v0.83.0/go.mod h1:MNN79VDXXaRP2ZqcDVOfWH0Jl8BbcMttJ3SY/pU6vxo= +go.opentelemetry.io/collector/component v0.83.0 h1:7bMbOHQezVx9RhSLu9KQRBhjXmO+CbOVhBk5uySb0fY= +go.opentelemetry.io/collector/component v0.83.0/go.mod h1:Qy2mIP32UKN1x8rsjJbkgB9obAVu4hRusc1wKNFeV+o= +go.opentelemetry.io/collector/config/configauth v0.83.0 h1:caIkUszP+kTRVx9HW6z7x05CMnzlaBoP2BKyWDIr2ag= +go.opentelemetry.io/collector/config/configauth v0.83.0/go.mod h1:PqSIaQryPWiPVMuxlNPEvTpuvhdRq8ySN9nKlk3YbH4= +go.opentelemetry.io/collector/config/configcompression v0.83.0 h1:WwGfHyGey8JSUsBGUmRHaOzwllrLmsjjo5SZCYfSP14= +go.opentelemetry.io/collector/config/configcompression v0.83.0/go.mod h1:Mi1/3D+qNlRohrVMbBOj6XSHo7YKAKbgWYisNW2Qobc= +go.opentelemetry.io/collector/config/confighttp v0.83.0 h1:yBra00XanzqXL0kLs3Aaas7RLoL50bM/Za8223vwJik= +go.opentelemetry.io/collector/config/confighttp v0.83.0/go.mod h1:Eu2WVZa8cy3F8mlxXIFPgzeAeLnaVc5UZzcEtufrOWs= +go.opentelemetry.io/collector/config/confignet v0.83.0 h1:xaQkMXvId8y7o6ke2qVRZZDqNc315CGkIcZ6LSVxDE0= +go.opentelemetry.io/collector/config/configopaque v0.83.0 h1:nhYguW1zVFnQlaZWhwbXJS4/+WEPdQSEL8kTF/j/zeI= +go.opentelemetry.io/collector/config/configopaque v0.83.0/go.mod h1:Ga1x7xLQXWmwxfW1pPqjI4qT+eNxf9wu2/Mx7O2u01U= +go.opentelemetry.io/collector/config/configtelemetry v0.83.0 h1:Dx+POy68CFsec9JDYd7cxQPULLfSOAG8ma5Jl3ZZ3+Y= +go.opentelemetry.io/collector/config/configtelemetry v0.83.0/go.mod h1:8wZuTKLdcWwdB82Jd07TOHsHKuv8l47T+MUGEsPe4z4= +go.opentelemetry.io/collector/config/configtls v0.83.0 h1:qeAqwvw7qs3fY8wVZzN54E+SNMES7YdATY0ASEbJlUw= +go.opentelemetry.io/collector/config/configtls v0.83.0/go.mod h1:YMf+YSUhPB/LD5pZSyb3wRi7x6vbiMbONXOWFQnJnZ4= +go.opentelemetry.io/collector/config/internal v0.83.0 h1:yQZegCOPl4dWUVkr/fscVFU/AjANT5+Tu5XpKztTTSA= +go.opentelemetry.io/collector/config/internal v0.83.0/go.mod h1:BQs+X52s4BCIshht8qgbT4dqCM5YM2h6RQWln6zWhRA= +go.opentelemetry.io/collector/confmap v0.83.0 h1:eUaiFdhTLkFdNpMi5FLSHSQ6X2FcEHe0KfEUt9ZtVlI= +go.opentelemetry.io/collector/confmap v0.83.0/go.mod h1:ZsmLyJ+4VeO+qz5o1RKadRoY4Db+d8PYwiLCJ3Z5Et8= +go.opentelemetry.io/collector/connector v0.83.0 h1:wUxpqBTjJ9WSgZnosU26ALGYtwPVzEQxQk7w+mKSOs4= +go.opentelemetry.io/collector/connector v0.83.0/go.mod h1:o9xnA7C+2JzYQMSyWIJz/28tc3lGs3JkKLpckpAdzB8= +go.opentelemetry.io/collector/consumer v0.83.0 h1:8wg0UfFxxaGYsTkQGWuf1pE7C/dTvPkkYmBtR6N5BKc= +go.opentelemetry.io/collector/consumer v0.83.0/go.mod h1:YLbmTqvgIOYUlEeWun8wQ4RZ0HaYjsABWKw7nwU9F3c= +go.opentelemetry.io/collector/exporter v0.83.0 h1:1MPrMaCFvEvl291pAE0hTgPb7YybjSak9O5akzXqnXs= +go.opentelemetry.io/collector/exporter v0.83.0/go.mod h1:5XIrrkfRI7Ndt5FnH0CC6It0VxTHRviGv/I350EWGBs= +go.opentelemetry.io/collector/extension v0.83.0 h1:O47qpJTeav6jATvnIUvUrO5KBMqa6ySMA5i+7XXW7GY= +go.opentelemetry.io/collector/extension v0.83.0/go.mod h1:gPfwNimQiscUpaUGC/pUniTn4b5O+8IxHVKHDUkGqSI= +go.opentelemetry.io/collector/extension/auth v0.83.0 h1:H0orp7a7/NZae4/ymnC5JpuvO6GNcGLNz+nEDAw9ciU= +go.opentelemetry.io/collector/extension/auth v0.83.0/go.mod h1:Br0OyLU0p+2xS0UvQRvgWmH0Kv/4kPkNVr9AMzee5GM= +go.opentelemetry.io/collector/extension/zpagesextension v0.83.0 h1:a2Avt+yjaJbHPbiST3I/4GgfxrB3iEpTtgIEGermItw= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 h1:C9o0mbP0MyygqFnKueVQK/v9jef6zvuttmTGlKaqhgw= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/processor v0.82.0 h1:DoqVrrnGYThu/h1sOr6E0hR1Fj5nQT4VT0ptFZcltRk= -go.opentelemetry.io/collector/processor v0.82.0/go.mod h1:B0MtfLWCYNBJ+PXf9k77M2Yn08MKItNB2vuvwhqrtt0= -go.opentelemetry.io/collector/receiver v0.82.0 h1:bc6jc8jmSgc0/C9zqTqqWOGJFVx0AJ53jiToSmQs2SE= -go.opentelemetry.io/collector/receiver v0.82.0/go.mod h1:Uh6BgcTmmrA1Bm/GpKGRY6WwQyPio4yEDsYkUo0A5Gk= -go.opentelemetry.io/collector/semconv v0.82.0 h1:WUeT2a+uZjI6kLvwcBaJnGvo7KSQ/9dIFRcxOQdXucc= -go.opentelemetry.io/collector/semconv v0.82.0/go.mod h1:TlYPtzvsXyHOgr5eATi43qEMqwSmIziivJB2uctKswo= +go.opentelemetry.io/collector/processor v0.83.0 h1:oWMpPzHLkzlPXRIa27UsfsaDSbXaF/0qeiCn3BaesGo= +go.opentelemetry.io/collector/processor v0.83.0/go.mod h1:sLxTTqkIhmNtekO0HebXgVclPpm/xoQ4+g8CbzgYBCM= +go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8ah+7ssCwb8OqNs= +go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= +go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= +go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= @@ -1355,9 +1355,8 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= -go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= 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.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= @@ -1368,8 +1367,8 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1389,8 +1388,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= +golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1488,8 +1487,8 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1607,14 +1606,14 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= +golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1625,8 +1624,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 037e2b3c16a416cf1b3c15ec7f2c71a1a142af1f Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Tue, 22 Aug 2023 12:52:14 -0700 Subject: [PATCH 02/13] fix(otel2influx): handle histogram infinite bucket Closes #143 This adds the `+Inf` bucket to histograms iff the otel Histogram contains the extra bucket. --- common/common.go | 2 +- influx2otel/metrics.go | 7 +- influx2otel/metrics_telegraf_prometheus_v1.go | 5 +- .../metrics_telegraf_prometheus_v1_test.go | 51 ++++++- .../metrics_telegraf_prometheus_v2_test.go | 140 ++++++++++++++++++ otel2influx/metrics_telegraf_prometheus_v1.go | 9 +- .../metrics_telegraf_prometheus_v1_test.go | 3 +- otel2influx/metrics_telegraf_prometheus_v2.go | 26 ++-- .../metrics_telegraf_prometheus_v2_test.go | 19 ++- tests-integration/test_fodder.go | 47 +++--- 10 files changed, 259 insertions(+), 50 deletions(-) diff --git a/common/common.go b/common/common.go index d392aa0f..f8013924 100644 --- a/common/common.go +++ b/common/common.go @@ -31,7 +31,7 @@ const ( MetricHistogramSumFieldKey = "sum" MetricHistogramMinFieldKey = "min" MetricHistogramMaxFieldKey = "max" - MetricHistogramInfFieldKey = "inf" + MetricHistogramInfFieldKey = "+Inf" MetricHistogramBoundKeyV2 = "le" MetricHistogramCountSuffix = "_count" MetricHistogramSumSuffix = "_sum" diff --git a/influx2otel/metrics.go b/influx2otel/metrics.go index e2f18151..3e1e25bc 100644 --- a/influx2otel/metrics.go +++ b/influx2otel/metrics.go @@ -3,6 +3,7 @@ package influx2otel import ( "errors" "fmt" + "math" "sort" "time" @@ -178,7 +179,7 @@ func (b *MetricsBatch) lookupMetric(metricName string, tags map[string]string, v func (b *MetricsBatch) GetMetrics() pmetric.Metrics { metrics := pmetric.NewMetrics() - // Ensure that the extra bucket counts have been added. + // Ensure that infinity histogram buckets exist. for _, resourceMetrics := range b.rmByAttributes { for i := 0; i < resourceMetrics.ScopeMetrics().Len(); i++ { ilMetrics := resourceMetrics.ScopeMetrics().At(i) @@ -187,7 +188,9 @@ func (b *MetricsBatch) GetMetrics() pmetric.Metrics { if metric.Type() == pmetric.MetricTypeHistogram { for k := 0; k < metric.Histogram().DataPoints().Len(); k++ { dataPoint := metric.Histogram().DataPoints().At(k) - if dataPoint.BucketCounts().Len() == dataPoint.ExplicitBounds().Len() { + if dataPoint.ExplicitBounds().Len() > 0 && math.IsInf(dataPoint.ExplicitBounds().At(dataPoint.ExplicitBounds().Len()-1), +1) { + dataPoint.ExplicitBounds().FromRaw(dataPoint.ExplicitBounds().AsRaw()[:dataPoint.ExplicitBounds().Len()-1]) + } else if dataPoint.BucketCounts().Len() == dataPoint.ExplicitBounds().Len() { infBucketCount := dataPoint.Count() for l := 0; l < dataPoint.BucketCounts().Len(); l++ { infBucketCount -= dataPoint.BucketCounts().At(l) diff --git a/influx2otel/metrics_telegraf_prometheus_v1.go b/influx2otel/metrics_telegraf_prometheus_v1.go index 42bf3f67..ed803bf8 100644 --- a/influx2otel/metrics_telegraf_prometheus_v1.go +++ b/influx2otel/metrics_telegraf_prometheus_v1.go @@ -257,9 +257,9 @@ func (b *MetricsBatch) convertSumV1(measurement string, tags map[string]string, func (b *MetricsBatch) convertHistogramV1(measurement string, tags map[string]string, fields map[string]interface{}, ts time.Time) error { var count uint64 - foundCount := false + var foundCount bool var sum float64 - foundSum := false + var foundSum bool var bucketCounts []uint64 var explicitBounds []float64 @@ -299,7 +299,6 @@ func (b *MetricsBatch) convertHistogramV1(measurement string, tags map[string]st return fmt.Errorf("histogram sum field not found") } - bucketCounts = append(bucketCounts, count) sortHistogramBuckets(bucketCounts, explicitBounds) bucketsAreCumulative := true diff --git a/influx2otel/metrics_telegraf_prometheus_v1_test.go b/influx2otel/metrics_telegraf_prometheus_v1_test.go index cbc94a2e..f07d5f20 100644 --- a/influx2otel/metrics_telegraf_prometheus_v1_test.go +++ b/influx2otel/metrics_telegraf_prometheus_v1_test.go @@ -245,6 +245,55 @@ func TestAddPoint_v1_histogram(t *testing.T) { c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger)) require.NoError(t, err) + b := c.NewBatch() + err = b.AddPoint("http_request_duration_seconds", + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + }, + map[string]interface{}{ + "count": float64(144320), + "sum": float64(53423), + "0.05": float64(24054), + "0.1": float64(33444), + "0.2": float64(100392), + "0.5": float64(129389), + "1": float64(133988), + "+Inf": float64(144320), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + expect := pmetric.NewMetrics() + rm := expect.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("container.name", "42") + ilMetrics := rm.ScopeMetrics().AppendEmpty() + ilMetrics.Scope().SetName("My Library") + ilMetrics.Scope().SetVersion("latest") + m := ilMetrics.Metrics().AppendEmpty() + m.SetName("http_request_duration_seconds") + m.SetEmptyHistogram() + m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + dp := m.Histogram().DataPoints().AppendEmpty() + dp.Attributes().PutStr("code", "200") + dp.Attributes().PutStr("method", "post") + dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) + dp.SetCount(144320) + dp.SetSum(53423) + dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) + dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + + assertMetricsEqual(t, expect, b.GetMetrics()) +} + +func TestAddPoint_v1_histogram_missingInfinityBucket(t *testing.T) { + c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger)) + require.NoError(t, err) + b := c.NewBatch() err = b.AddPoint("http_request_duration_seconds", map[string]string{ @@ -439,7 +488,7 @@ func TestAddPoint_v1_untypedSummary(t *testing.T) { dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetCount(2693) dp.SetSum(17560473) - dp.BucketCounts().FromRaw([]uint64{3102, 3272, 4773, 9001, 76656, 2693}) + dp.BucketCounts().FromRaw([]uint64{3102, 170, 1501, 4228, 67655, 2693}) dp.ExplicitBounds().FromRaw([]float64{0.01, 0.05, 0.5, 0.9, 0.99}) assertMetricsEqual(t, expect, b.GetMetrics()) diff --git a/influx2otel/metrics_telegraf_prometheus_v2_test.go b/influx2otel/metrics_telegraf_prometheus_v2_test.go index 3642364d..a6383bb0 100644 --- a/influx2otel/metrics_telegraf_prometheus_v2_test.go +++ b/influx2otel/metrics_telegraf_prometheus_v2_test.go @@ -341,6 +341,146 @@ func TestAddPoint_v2_histogram(t *testing.T) { common.InfluxMetricValueTypeHistogram) require.NoError(t, err) + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "+Inf", + }, + map[string]interface{}{ + "http_request_duration_seconds_bucket": float64(144320), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + expect := pmetric.NewMetrics() + rm := expect.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("container.name", "42") + ilMetrics := rm.ScopeMetrics().AppendEmpty() + ilMetrics.Scope().SetName("My Library") + ilMetrics.Scope().SetVersion("latest") + m := ilMetrics.Metrics().AppendEmpty() + m.SetName("http_request_duration_seconds") + m.SetEmptyHistogram() + m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + dp := m.Histogram().DataPoints().AppendEmpty() + dp.Attributes().PutStr("code", "200") + dp.Attributes().PutStr("method", "post") + dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) + dp.SetCount(144320) + dp.SetSum(53423) + dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) + dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + + assertMetricsEqual(t, expect, b.GetMetrics()) +} + +func TestAddPoint_v2_histogram_missingInfinityBucket(t *testing.T) { + c, err := influx2otel.NewLineProtocolToOtelMetrics(new(common.NoopLogger)) + require.NoError(t, err) + + b := c.NewBatch() + + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + }, + map[string]interface{}{ + "http_request_duration_seconds_count": float64(144320), + "http_request_duration_seconds_sum": float64(53423), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "0.05", + }, + map[string]interface{}{ + "http_request_duration_seconds_bucket": float64(24054), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "0.1", + }, + map[string]interface{}{ + "http_request_duration_seconds_bucket": float64(33444), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "0.2", + }, + map[string]interface{}{ + "http_request_duration_seconds_bucket": float64(100392), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "0.5", + }, + map[string]interface{}{ + "http_request_duration_seconds_bucket": float64(129389), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + + err = b.AddPoint(common.MeasurementPrometheus, + map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "1", + }, + map[string]interface{}{ + "http_request_duration_seconds_bucket": float64(133988), + }, + time.Unix(0, 1395066363000000123).UTC(), + common.InfluxMetricValueTypeHistogram) + require.NoError(t, err) + expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") diff --git a/otel2influx/metrics_telegraf_prometheus_v1.go b/otel2influx/metrics_telegraf_prometheus_v1.go index 030ac48e..f05f6235 100644 --- a/otel2influx/metrics_telegraf_prometheus_v1.go +++ b/otel2influx/metrics_telegraf_prometheus_v1.go @@ -173,13 +173,18 @@ func (c *metricWriterTelegrafPrometheusV1) enqueueHistogram(ctx context.Context, // so accept input if that particular bucket is missing. return fmt.Errorf("invalid metric histogram bucket counts qty %d vs explicit bounds qty %d", bucketCounts.Len(), explicitBounds.Len()) } - for i := 0; i < explicitBounds.Len(); i++ { + for i := 0; i < bucketCounts.Len(); i++ { var bucketCount uint64 for j := 0; j <= i; j++ { bucketCount += bucketCounts.At(j) } - boundFieldKey := strconv.FormatFloat(explicitBounds.At(i), 'f', -1, 64) + var boundFieldKey string + if explicitBounds.Len() > i { + boundFieldKey = strconv.FormatFloat(explicitBounds.At(i), 'f', -1, 64) + } else { + boundFieldKey = common.MetricHistogramInfFieldKey + } fields[boundFieldKey] = float64(bucketCount) } diff --git a/otel2influx/metrics_telegraf_prometheus_v1_test.go b/otel2influx/metrics_telegraf_prometheus_v1_test.go index c4bb1c09..a82d649d 100644 --- a/otel2influx/metrics_telegraf_prometheus_v1_test.go +++ b/otel2influx/metrics_telegraf_prometheus_v1_test.go @@ -286,6 +286,7 @@ func TestWriteMetric_v1_histogram(t *testing.T) { "0.2": float64(100392), "0.5": float64(129389), "1": float64(133988), + "+Inf": float64(144320), "min": float64(0), "max": float64(100), }, @@ -325,7 +326,7 @@ func TestWriteMetric_v1_histogram_missingInfinityBucket(t *testing.T) { dp.SetTimestamp(timestamp) dp.SetCount(144320) dp.SetSum(53423) - dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) + dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) err = c.WriteMetrics(context.Background(), metrics) diff --git a/otel2influx/metrics_telegraf_prometheus_v2.go b/otel2influx/metrics_telegraf_prometheus_v2.go index 824b642c..8571c4b8 100644 --- a/otel2influx/metrics_telegraf_prometheus_v2.go +++ b/otel2influx/metrics_telegraf_prometheus_v2.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "golang.org/x/exp/maps" "github.com/influxdata/influxdb-observability/common" ) @@ -187,26 +188,25 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueHistogram(ctx context.Context, return fmt.Errorf("invalid metric histogram bucket counts qty %d vs explicit bounds qty %d", bucketCounts.Len(), explicitBounds.Len()) } - for i := 0; i < explicitBounds.Len(); i++ { - t := make(map[string]string, len(tags)+1) - for k, v := range tags { - t[k] = v - } - f := make(map[string]interface{}, len(fields)+1) - for k, v := range fields { - f[k] = v - } + for i := 0; i < bucketCounts.Len(); i++ { + tags := maps.Clone(tags) + fields := maps.Clone(fields) var bucketCount uint64 for j := 0; j <= i; j++ { bucketCount += bucketCounts.At(j) } - boundTagValue := strconv.FormatFloat(explicitBounds.At(i), 'f', -1, 64) - t[common.MetricHistogramBoundKeyV2] = boundTagValue - f[measurement+common.MetricHistogramBucketSuffix] = float64(bucketCount) + var boundTagValue string + if explicitBounds.Len() > i { + boundTagValue = strconv.FormatFloat(explicitBounds.At(i), 'f', -1, 64) + } else { + boundTagValue = common.MetricHistogramInfFieldKey + } + tags[common.MetricHistogramBoundKeyV2] = boundTagValue + fields[measurement+common.MetricHistogramBucketSuffix] = float64(bucketCount) - if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, t, f, ts, common.InfluxMetricValueTypeHistogram); err != nil { + if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeHistogram); err != nil { return fmt.Errorf("failed to write point for histogram: %w", err) } } diff --git a/otel2influx/metrics_telegraf_prometheus_v2_test.go b/otel2influx/metrics_telegraf_prometheus_v2_test.go index 40740b52..850f7bf6 100644 --- a/otel2influx/metrics_telegraf_prometheus_v2_test.go +++ b/otel2influx/metrics_telegraf_prometheus_v2_test.go @@ -369,6 +369,23 @@ func TestWriteMetric_v2_histogram(t *testing.T) { ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeHistogram, }, + { + measurement: "prometheus", + tags: map[string]string{ + "node": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", + "le": "+Inf", + }, + fields: map[string]interface{}{ + common.AttributeStartTimeUnixNano: int64(startTimestamp), + "http_request_duration_seconds_bucket": float64(144320), + }, + ts: timestamp.AsTime().UTC(), + vType: common.InfluxMetricValueTypeHistogram, + }, } assert.Equal(t, expected, w.points) @@ -402,7 +419,7 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { dp.SetTimestamp(timestamp) dp.SetCount(144320) dp.SetSum(53423) - dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) + dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) err = c.WriteMetrics(context.Background(), metrics) diff --git a/tests-integration/test_fodder.go b/tests-integration/test_fodder.go index 0c53bca4..c65b0c2d 100644 --- a/tests-integration/test_fodder.go +++ b/tests-integration/test_fodder.go @@ -7,21 +7,25 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" ) -var ( - metricTests []struct { - otel pmetric.Metrics - lp string - } +type metricTest struct { + otel pmetric.Metrics + lp string +} - traceTests []struct { - otel ptrace.Traces - lp string - } +type traceTest struct { + otel ptrace.Traces + lp string +} - logTests []struct { - otel plog.Logs - lp string - } +type logTest struct { + otel plog.Logs + lp string +} + +var ( + metricTests []metricTest + traceTests []traceTest + logTests []logTest ) func init() { @@ -63,14 +67,11 @@ func init() { dp.SetTimestamp(pcommon.Timestamp(1622848686000000000)) dp.SetDoubleValue(3) - metricTests = append(metricTests, struct { - otel pmetric.Metrics - lp string - }{ + metricTests = append(metricTests, metricTest{ otel: metrics, lp: ` cpu_temp,foo=bar gauge=87.332 1622848686000000000 -http_request_duration_seconds,region=eu count=144320,sum=53423,0.05=24054,0.1=33444,0.2=100392,0.5=129389,1=133988 1622848686000000000 +http_request_duration_seconds,region=eu count=144320,sum=53423,0.05=24054,0.1=33444,0.2=100392,0.5=129389,1=133988,+Inf=144320 1622848686000000000 http_requests_total,code=200,method=post counter=1027 1622848686000000000 http_requests_total,code=400,method=post counter=3 1622848686000000000 `, @@ -118,10 +119,7 @@ http_requests_total,code=400,method=post counter=3 1622848686000000000 span.SetStartTimestamp(pcommon.Timestamp(1622848000000000010)) span.SetEndTimestamp(pcommon.Timestamp(1622848000000000012)) - traceTests = append(traceTests, struct { - otel ptrace.Traces - lp string - }{ + traceTests = append(traceTests, traceTest{ otel: traces, lp: ` spans,span_id=0000000000000003,trace_id=00000000000000020000000000000001 duration_nano=100000000000i,end_time_unix_nano=1622848100000000000i,span.kind="Internal",attributes="{\"k\":true}",dropped_attributes_count=7u,dropped_events_count=13u,dropped_links_count=17u,span.name="cpu_temp" 1622848000000000000 @@ -147,10 +145,7 @@ spans,span_id=0000000000000005,trace_id=00000000000000020000000000000002 duratio log.SetTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1}) log.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 3}) - logTests = append(logTests, struct { - otel plog.Logs - lp string - }{ + logTests = append(logTests, logTest{ otel: logs, lp: ` logs,span_id=0000000000000003,trace_id=00000000000000020000000000000001 body="something-happened",k=true,dropped_attributes_count=5u,severity_number=9i,severity_text="info" 1622848686000000000 From e9cf60a55440220f3b92847f1439cb9abe7c04e7 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Tue, 22 Aug 2023 16:41:19 -0700 Subject: [PATCH 03/13] fix(otel2influx): configurable logs dimensions --- otel2influx/logs.go | 88 ++++++++++++---- otel2influx/traces.go | 2 +- tests-integration/go.mod | 8 +- tests-integration/go.sum | 124 +++++++++++++---------- tests-integration/helper_otelcol_test.go | 9 +- tests-integration/otel2influx_test.go | 15 +-- tests-integration/test_fodder.go | 2 +- 7 files changed, 162 insertions(+), 86 deletions(-) diff --git a/otel2influx/logs.go b/otel2influx/logs.go index e1c57fda..b8e54d58 100644 --- a/otel2influx/logs.go +++ b/otel2influx/logs.go @@ -3,12 +3,16 @@ package otel2influx import ( "context" "encoding/hex" + "encoding/json" "errors" "fmt" + "strings" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" + semconv "go.opentelemetry.io/collector/semconv/v1.16.0" + "golang.org/x/exp/maps" "github.com/influxdata/influxdb-observability/common" ) @@ -16,24 +20,57 @@ import ( type OtelLogsToLineProtocolConfig struct { Logger common.Logger Writer InfluxWriter + // LogRecordDimensions are log record attributes to be used as line protocol tags. + // These are always included as tags, if available: + // - trace ID + // - span ID + // The default values: + // - service.name + // Other common attributes can be found here: + // - https://github.com/open-telemetry/opentelemetry-collector/tree/main/semconv + // When using InfluxDB for both logs and traces, be certain that LogRecordDimensions + // matches the tracing SpanDimensions value. + LogRecordDimensions []string } func DefaultOtelLogsToLineProtocolConfig() *OtelLogsToLineProtocolConfig { return &OtelLogsToLineProtocolConfig{ Logger: new(common.NoopLogger), Writer: new(NoopInfluxWriter), + LogRecordDimensions: []string{ + semconv.AttributeServiceName, + }, } } type OtelLogsToLineProtocol struct { logger common.Logger writer InfluxWriter + + logRecordDimensions map[string]struct{} } func NewOtelLogsToLineProtocol(config *OtelLogsToLineProtocolConfig) (*OtelLogsToLineProtocol, error) { + logRecordDimensions := make(map[string]struct{}, len(config.LogRecordDimensions)) + { + duplicateDimensions := make(map[string]struct{}) + for _, k := range config.LogRecordDimensions { + if _, found := logRecordDimensions[k]; found { + duplicateDimensions[k] = struct{}{} + } else { + logRecordDimensions[k] = struct{}{} + } + } + if len(duplicateDimensions) > 0 { + return nil, fmt.Errorf("duplicate record dimension(s) configured: %s", + strings.Join(maps.Keys(duplicateDimensions), ",")) + } + + } return &OtelLogsToLineProtocol{ - logger: config.Logger, - writer: config.Writer, + logger: config.Logger, + writer: config.Writer, + logRecordDimensions: logRecordDimensions, }, nil } @@ -54,7 +91,7 @@ func (c *OtelLogsToLineProtocol) WriteLogs(ctx context.Context, ld plog.Logs) er return batch.WriteBatch(ctx) } -func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, logRecord plog.LogRecord, batch InfluxWriterBatch) error { +func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, logRecord plog.LogRecord, batch InfluxWriterBatch) error { ts := logRecord.Timestamp().AsTime() if ts.IsZero() { // This is a valid condition in OpenTelemetry, but not in InfluxDB. @@ -64,12 +101,9 @@ func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource } measurement := common.MeasurementLogs - tags := make(map[string]string) + tags := make(map[string]string, len(c.logRecordDimensions)+2) fields := make(map[string]interface{}) - // TODO handle logRecord.Flags() - tags = ResourceToTags(c.logger, resource, tags) - tags = InstrumentationScopeToTags(instrumentationLibrary, tags) if traceID := logRecord.TraceID(); !traceID.IsEmpty() { tags[common.AttributeTraceID] = hex.EncodeToString(traceID[:]) @@ -92,18 +126,38 @@ func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource } droppedAttributesCount := uint64(logRecord.DroppedAttributesCount()) - logRecord.Attributes().Range(func(k string, v pcommon.Value) bool { - if k == "" { - droppedAttributesCount++ - c.logger.Debug("log record attribute key is empty") - } else if v, err := AttributeValueToInfluxFieldValue(v); err != nil { - droppedAttributesCount++ - c.logger.Debug("invalid log record attribute value", err) + attributesField := make(map[string]any) + + for _, attributes := range []pcommon.Map{resource.Attributes(), instrumentationScope.Attributes(), logRecord.Attributes()} { + attributes.Range(func(k string, v pcommon.Value) bool { + if _, found := c.logRecordDimensions[k]; found { + if _, found = tags[k]; found { + c.logger.Debug("dimension %s already exists as a tag", k) + attributesField[k] = v.AsRaw() + } + tags[k] = v.AsString() + } else { + attributesField[k] = v.AsRaw() + } + return true + }) + } + if len(attributesField) > 0 { + marshalledAttributes, err := json.Marshal(attributesField) + if err != nil { + c.logger.Debug("failed to marshal attributes to JSON", err) + droppedAttributesCount += uint64(logRecord.Attributes().Len()) } else { - fields[k] = v + fields[common.AttributeAttributes] = string(marshalledAttributes) } - return true - }) + } + for k := range tags { + if _, found := fields[k]; found { + c.logger.Debug("tag and field keys conflict; field will be dropped", "tag key", k) + droppedAttributesCount++ + delete(fields, k) + } + } if droppedAttributesCount > 0 { fields[common.AttributeDroppedAttributesCount] = droppedAttributesCount } diff --git a/otel2influx/traces.go b/otel2influx/traces.go index d8b5ccc6..8c8c580b 100644 --- a/otel2influx/traces.go +++ b/otel2influx/traces.go @@ -64,7 +64,7 @@ func NewOtelTracesToLineProtocol(config *OtelTracesToLineProtocolConfig) (*OtelT } } if len(duplicateDimensions) > 0 { - return nil, fmt.Errorf("duplicate dimension(s) configured: %s", + return nil, fmt.Errorf("duplicate span dimension(s) configured: %s", strings.Join(maps.Keys(duplicateDimensions), ",")) } } diff --git a/tests-integration/go.mod b/tests-integration/go.mod index 6d1d0fea..078f4bc3 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -48,6 +48,7 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v5 v5.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -94,6 +95,7 @@ require ( github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect + github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect @@ -133,8 +135,8 @@ require ( golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect gonum.org/v1/gonum v0.13.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect @@ -144,4 +146,6 @@ replace ( github.com/influxdata/influxdb-observability/common => ../common github.com/influxdata/influxdb-observability/influx2otel => ../influx2otel github.com/influxdata/influxdb-observability/otel2influx => ../otel2influx + github.com/influxdata/telegraf => ../../telegraf + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter => ../../opentelemetry-collector-contrib/exporter/influxdbexporter ) diff --git a/tests-integration/go.sum b/tests-integration/go.sum index 50220bb7..2a2733c1 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -19,7 +19,7 @@ cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKP cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA= +cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -28,17 +28,17 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigquery v1.52.0 h1:JKLNdxI0N+TIUWD6t9KN646X27N5dQWq9dZbbTWZ8hc= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= -cloud.google.com/go/compute v1.19.3 h1:DcTwsFgGev/wV5+q8o2fzgcHOaac+DKGC91ZlvpsQds= +cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= -cloud.google.com/go/monitoring v1.14.0 h1:duMLMV61WSPUSC93WIocFQMG7P7Byjmo73oLDO++Srs= +cloud.google.com/go/monitoring v1.15.1 h1:65JhLMd+JiYnXr6j5Z63dUYCuOg770p8a/VC+gil/58= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/pubsub v1.30.1 h1:RdzTlwhswvROjPIoTfnSJ9tEp0LY2S5ATX90anOw7E8= +cloud.google.com/go/pubsub v1.33.0 h1:6SPCPvWav64tj0sVX/+npCBKhUi/UjJehy9op/V3p2g= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= @@ -50,6 +50,7 @@ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= collectd.org v0.5.0 h1:y4uFSAuOmeVhG3GCRa3/oH+ysePfO/+eGJNfd0Qa3d8= contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= +dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= @@ -91,7 +92,7 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU= +github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8= github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkMqLPymWEppkm7vgPQY2XsHoEkaMQ0AdZY= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= @@ -103,10 +104,12 @@ github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvK github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g= github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= +github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Mellanox/rdmamap v1.1.0 h1:A/W1wAXw+6vm58f3VklrIylgV+eDJlPVIMaIKuxgUT4= github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -134,13 +137,13 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/aliyun/alibaba-cloud-sdk-go v1.62.389 h1:tIe+4hAop1taPiLEek1cF17epiA+nlSyr0JT8/kiWqQ= +github.com/aliyun/alibaba-cloud-sdk-go v1.62.470 h1:IIXCoSiSDM90npQ1X/lU2Nh2KdYZFSbSSmujvyYQA/g= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= -github.com/antchfx/jsonquery v1.3.1 h1:kh3599hMLpygvcxoENcj99eCvnS++JjRX10LjNYhK58= -github.com/antchfx/xmlquery v1.3.15 h1:aJConNMi1sMha5G8YJoAIF5P+H+qG1L73bSItWHo8Tw= -github.com/antchfx/xpath v1.2.4 h1:dW1HB/JxKvGtJ9WyVGJ0sIoEcqftV3SqIstujI+B9XY= +github.com/antchfx/jsonquery v1.3.3 h1:zjZpbnZhYng3uOAbIfdNq81A9mMEeuDJeYIpeKpZ4es= +github.com/antchfx/xmlquery v1.3.17 h1:d0qWjPp/D+vtRw7ivCwT5ApH/3CkQU8JOeo3245PpTk= +github.com/antchfx/xpath v1.2.5-0.20230505064641-588960cceeac h1:Et7H7mEPWuivbFEXi3dWa8hobnvF380TS2mq7JmgjEI= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18= github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= @@ -174,42 +177,43 @@ github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/ github.com/aws/aws-sdk-go v1.38.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= -github.com/aws/aws-sdk-go-v2 v1.18.1 h1:+tefE750oAb7ZQGzla6bLkOwfcQCEtC5y2RqoqCeqKo= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.10 h1:dK82zF6kkPeCo8J1e+tGx4JdvDIQzj7ygIoLg8WMuGs= +github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.18.27 h1:Az9uLwmssTE6OGTpsFqOnaGpLnKDqNYOJzWuC6UAYzA= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= -github.com/aws/aws-sdk-go-v2/credentials v1.13.26 h1:qmU+yhKmOCyujmuPY7tf5MxR/RKyZrOPO3V4DobiTUk= +github.com/aws/aws-sdk-go-v2/credentials v1.13.32 h1:lIH1eKPcCY1ylR4B6PkBGRWMHO3aVenOKJHWiS4/G2w= github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.2.0 h1:8kvinmbIDObqsWegKP0JjeanYPiA4GUVpAtciNWE+jw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= -github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.4 h1:LxK/bitrAr4lnh9LnIS6i7zWbCOdMsfzKFBI6LUCS0I= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70 h1:4bh28MeeXoBFTjb0JjQ5sVatzlf5xA1DziV8mZed9v4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.34 h1:A5UqQEmPaCFpedKouS4v+dHCTUo2sKqhoKO9U5kxyWo= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.28 h1:srIVS45eQuewqz6fKKu6ZGXaq6FuFg5NzgQBAM6g8Y4= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 h1:LWA+3kDM8ly001vJ1X1waCuLJdtTl48gwkPKWy9sosI= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 h1:wscW+pnn3J1OYnanMnza5ZVYXLX4cKk5rAvUAl4Qu+c= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.26.2 h1:PWGu2JhCb/XJlJ7SSFJq76pxk4xWsN76nZxh7TzMHx0= github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.20.9 h1:sXs+JjIwgKA27t+5O8YgXl0cmZpEmctyDVO5y6cMdqA= -github.com/aws/aws-sdk-go-v2/service/dynamodb v1.17.3 h1:2oB4ikNEMLaPtu6lbNFJyTSayBILvrOfa2VfOffcuvU= +github.com/aws/aws-sdk-go-v2/service/dynamodb v1.20.0 h1:ov790XKhwAziEXcl6WrjsbyWkGpboK7Cmikpe5gAzMw= github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.4.0 h1:QbFWJr2SAyVYvyoOHvJU6sCGLnqNT94ZbWElJMEI1JY= +github.com/aws/aws-sdk-go-v2/service/ec2 v1.80.1 h1:o40tJMQOFygAv7mYJ59txtepwH76V8KUWapOlnDdQ3c= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.11 h1:y2+VQzC6Zh2ojtV2LoC0MNwHWc6qXv/j2vrQtlftkdA= github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.29 h1:zZSLP3v3riMOP14H7b4XP0uyfREDQOYv2cqIrvTXDNQ= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.28 h1:/D994rtMQd1jQ2OY+7tvUlMlrv1L1c7Xtma/FhkbVtY= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= -github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.28 h1:bkRyG4a929RCnpVSTvLM2j/T4ls015ZhhYApbmYs15s= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 h1:dBL3StFxHtpBzJJ/mNEsjXVgfO+7jR0dAIEwLqMapEA= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.14 h1:oSw0SQN9cKeYvCUYfPul7bH11b8E9I9BnoVUme3iSaU= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2 h1:PkQN8Fl89d97R4JfmLozCX3RyJq4r9XMurIqpW59gRM= github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0 h1:ya7fmrN2fE7s1P2gaPbNg5MTkERVWfsH8ToP1YC4Z9o= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= -github.com/aws/aws-sdk-go-v2/service/sso v1.12.12 h1:nneMBM2p79PGWBQovYO/6Xnc2ryRMw3InnDJq1FHkSY= -github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.12 h1:2qTR7IFk7/0IN/adSFhYu9Xthr0zVFTgBrmPldILn80= +github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= +github.com/aws/aws-sdk-go-v2/service/ssooidc v1.15.2 h1:OJELEgyaT2kmaBGZ+myyZbTTLobfe3ox3FSh5eYK9Qs= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= -github.com/aws/aws-sdk-go-v2/service/sts v1.19.2 h1:XFJ2Z6sNUUcAz9poj+245DMkrHE4h2j5I9/xD50RHfE= +github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.17.2 h1:PlsApCYTMqiDmaCDikifXGYqQ53QWQ5UAOEZIevfcL8= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.13.5 h1:hgz0X/DX0dGqTYpGALqXJoRKRj5oQ7150i5FdTePzO8= +github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= github.com/awslabs/kinesis-aggregation/go v0.0.0-20210630091500-54e17340d32f h1:Pf0BjJDga7C98f0vhw+Ip5EaiE07S3lTKpIYPNS0nMo= github.com/benbjohnson/clock v1.3.3 h1:g+rSsSaAzhHJYcIQE78hJ3AhyjjtQvleKDjlhdBnIhc= github.com/benbjohnson/clock v1.3.3/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -260,7 +264,7 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE github.com/compose-spec/compose-go v1.16.0 h1:HYk4uYWXgArHh6NG+WE4yGYayOXw+hjqJ+eJxpjWWjk= github.com/compose-spec/compose-go v1.16.0/go.mod h1:3yngGBGfls6FHGQsg4B1z6gz8ej9SOvmAJtxCwgbcnc= github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns= +github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o= github.com/coocood/freecache v1.2.3 h1:lcBwpZrwBZRZyLk/8EMyQVXRiFl663cCuMOrjCALeto= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -272,6 +276,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/couchbase/go-couchbase v0.1.1 h1:ClFXELcKj/ojyoTYbsY34QUrrYCBi/1G749sXSCkdhk= github.com/couchbase/gomemcached v0.1.3 h1:HIc5qMYNbuhB7zNaiEtj61DCYkquAwrQlf64q7JzdEY= github.com/couchbase/goutils v0.1.0 h1:0WLlKJilu7IBm98T8nS9+J36lBFVLRUSIUtyD/uWpAE= +github.com/cpuguy83/dockercfg v0.3.1 h1:/FpZ+JaygUR/lZP2NlFI2DVfrOEMAIKP5wWEJdoYe9E= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -296,13 +301,12 @@ github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyG github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/docker v20.10.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v23.0.4+incompatible h1:Kd3Bh9V/rO+XpTP/BLqM+gx8z7+Yb0AA2Ibj+nNo4ek= +github.com/docker/docker v24.0.5+incompatible h1:WmgcE4fxyI6EEXxBRxsHnZXrO1pQ3smi0k/jho4HLeY= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/doclambda/protobufquery v0.0.0-20220727165953-0da287796ee9 h1:677nbAF3nq56BEZ2R/VMl0wROQqJo4vJ/ZWuzm+vsUU= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -315,7 +319,7 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 h1:8yY/I9ndfrgrXUbOGObLHKBR4Fl3nZXwM2c7OYTT8hM= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/eclipse/paho.golang v0.10.0 h1:oUGPjRwWcZQRgDD9wVDV7y7i7yBSxts3vcvcNJo8B4Q= +github.com/eclipse/paho.golang v0.11.0 h1:6Avu5dkkCfcB61/y1vx+XrPQ0oAl4TPYtY0uw3HbQdM= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= @@ -354,6 +358,7 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fxamacker/cbor v1.5.1 h1:XjQWBgdmQyqimslUh5r4tUGmoqzHmBFQOImkWGi2awg= github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= @@ -373,7 +378,7 @@ github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap v3.0.2+incompatible h1:kD5HQcAzlQ7yrhfn+h+MSABeAy/jAJhvIJ/QDllP44g= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= -github.com/go-ldap/ldap/v3 v3.4.4 h1:qPjipEpt+qDa6SI/h1fzuGWoRUY+qqQ9sOZq67/PYUs= +github.com/go-ldap/ldap/v3 v3.4.5 h1:ekEKmaDrpvR2yf5Nc/DClsGG9lAmdDixe44mLzlW5r8= 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-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= @@ -526,9 +531,12 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= +github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE= +github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +github.com/golang/geo v0.0.0-20190916061304-5b978397cfec h1:lJwO/92dFXWeXOZdoGXgptLmNLwynMSHUmU6besqtiw= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -626,11 +634,11 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gopcua/opcua v0.4.0 h1:Pr0PMFViNOzvkcvmzP3yTKqtLFVL1OUgav3tDj+hpqQ= github.com/gophercloud/gophercloud v0.16.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4= -github.com/gophercloud/gophercloud v1.2.0 h1:1oXyj4g54KBg/kFtCdMM6jtxSzeIyg8wv4z1HoGPp1E= +github.com/gophercloud/gophercloud v1.5.0 h1:cDN6XFCLKiiqvYpjQLq9AiM7RDRbIC9450WpPH+yvXo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= @@ -703,7 +711,7 @@ github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/packer-plugin-sdk v0.3.1 h1:Gr/mnihsdUcPfGiruFL93BQkiFh3EFPwyxxTWkwvRsQ= +github.com/hashicorp/packer-plugin-sdk v0.3.2 h1:4Kqq7B8CRDMbfZmkloyz11t1hfqazJuBbW8ZFo4QlN4= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= @@ -715,7 +723,7 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKe github.com/hetznercloud/hcloud-go v1.24.0/go.mod h1:3YmyK8yaZZ48syie6xpm3dt26rtB6s65AisBHylXYFA= github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= +github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -746,8 +754,6 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tail v1.0.1-0.20210707231403-b283181d1fa7 h1:0rQOs1VHLVFpAAOIR0mJEvVOIaMYFgYdreeVbgI9sII= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/influxdata/telegraf v1.27.2 h1:uFW0tAH7qDrveIQQYkVPD8BYDmCXxXw9S7FrKC7ya78= -github.com/influxdata/telegraf v1.27.2/go.mod h1:yd/g3pxDPyW/S1DzRzJpY1hc1rVq3CaXrhioqGJVYSs= github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 h1:vvyMtD5LTJc1W9sQKjDkAWdcg0478CszSdzlHtiAXCY= github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod h1:zApaNFpP/bTpQItGZNNUMISDMDAnTXu9UqJ4yT3ocz8= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= @@ -888,11 +894,11 @@ github.com/mdlayher/genetlink v1.2.0 h1:4yrIkRV5Wfk1WfpWTcoOlGmsWgQj3OtQN9ZsbrE+ github.com/mdlayher/netlink v1.6.0 h1:rOHX5yl7qnlpiVkFWoqccueppMtXzeziFjWAjLg6sz0= github.com/mdlayher/socket v0.2.3 h1:XZA2X2TjdOwNoNPVPclRCURoX/hokBY8nkTmRZFEheM= github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81TI5Es90b2t/MwX5KqY= -github.com/microsoft/go-mssqldb v1.3.1-0.20230630170514-78ad89164253 h1:HQabsuUUheYGgMt+ATZecIpgDbWfmCZ+Qg4wCmNPsUg= +github.com/microsoft/go-mssqldb v1.5.0 h1:CgENxkwtOBNj3Jg6T1X209y2blCfTTcwuOlznd2k9fk= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.51 h1:0+Xg7vObnhrz/4ZCZcZh7zPXlmU0aveS2HDBd0m0qSo= +github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo= github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= @@ -926,7 +932,7 @@ github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= -github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f h1:J/7hjLaHLD7epG0m6TBMGmp4NQ+ibBYLfeyJWdAIFLA= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -966,6 +972,7 @@ github.com/newrelic/newrelic-telemetry-sdk-go v0.8.1 h1:6OX5VXMuj2salqNBc41eXKz6 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE= +github.com/nwaples/tacplus v0.0.3 h1:i3v/BUWWrbKq00BzFDrgcPksUF4HwAWvS8Zk63ezYXg= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= @@ -980,8 +987,6 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0 h1:TRWJBopwTJZALBsKx7IPKd9AxuruuEoOGIjcB1z85JY= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0/go.mod h1:NTT7CuT+v4OpVU/+zP/hosy1tkov/NWqFq2chSiKGVs= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 h1:Kjh+MVsvlV/vmgwnN667ln57kQiz6ZfYxyk+IONS5lA= github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0/go.mod h1:CMhTUJ14v2P/roC9GrV7fdVS7MCtXwOjw+JprJrfFKM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 h1:pzq9yVMgLzeo8ZsgtjDzsR+B/dt+Fc3FROAu9SV+Qu4= @@ -993,13 +998,13 @@ github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0 h1:UMQgLKATT9yia7l6Y45ZZnVPmZ5iRpAHGfHw9h2DEy0= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0/go.mod h1:6LKpL1Uo7kGflQS4AHJNQts3joX7LQmNmNQRil28PMo= -github.com/openconfig/gnmi v0.9.1 h1:hVOdLTaRjdy68oCGJbkf2vrmnUoQ5xbINqBOAMix4xM= +github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYBTS5Y4x/Cgeo1E0= github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= -github.com/opensearch-project/opensearch-go/v2 v2.2.0 h1:6RicCBiqboSVtLMjSiKgVQIsND4I3sxELg9uwWe/TKM= +github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= @@ -1047,7 +1052,7 @@ github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSg github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI= github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus-community/pro-bing v0.2.0 h1:hyK7yPFndU3LCDwEQJwPQUCjNkp1DGP/VxyzrWfXZUU= +github.com/prometheus-community/pro-bing v0.3.0 h1:SFT6gHqXwbItEDJhTkzPWVqU6CLEtqEfNAPp47RUON4= github.com/prometheus/alertmanager v0.21.0/go.mod h1:h7tJ81NA0VLWvWEayi1QltevFkLF3KxmC/malTcT8Go= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= @@ -1110,6 +1115,7 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1 github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/riemann/riemann-go-client v0.5.1-0.20211206220514-f58f10cdce16 h1:bGXoxRwUpPTCaQ86DRE+3wqE9vh3aH8W0HH5L/ygOFM= github.com/robbiet480/go.nut v0.0.0-20220219091450-bd8f121e1fa1 h1:YmFqprZILGlF/X3tvMA4Rwn3ySxyE3hGUajBHkkaZbM= +github.com/robinson/gos7 v0.0.0-20230421131203-d20ac6ca08cd h1:UhVHgo6tdrKiuVqxTd63ja0B9YihC7D3z8hfEye6Vqo= 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.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -1167,6 +1173,7 @@ github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= 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/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= @@ -1175,6 +1182,8 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn 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/srebhan/cborquery v0.0.0-20230626165538-38be85b82316 h1:HVv8JjpX24FuI59aET1uInn0ItuEiyj8CZMuR9Uw+lE= +github.com/srebhan/protobufquery v0.0.0-20230803132024-ae4c0d878e55 h1:ksmbrLbJAm+8yxB7fJ245usD0b1v9JHBJrWF+WqGyjs= github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1199,8 +1208,10 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/testcontainers/testcontainers-go v0.18.0 h1:8RXrcIQv5xX/uBOSmZd297gzvA7F0yuRA37/918o7Yg= -github.com/thomasklein94/packer-plugin-libvirt v0.3.4 h1:K+NkHFcZuiUTp4ZiDdBhWRMZiSMdsXwGuzyg4THKDAU= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU= +github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= +github.com/testcontainers/testcontainers-go v0.22.0 h1:hOK4NzNu82VZcKEB1aP9LO1xYssVFMvlfeuDW9JMmV0= +github.com/thomasklein94/packer-plugin-libvirt v0.5.0 h1:aj2HLHZZM/ClGLIwVp9rrgh+2TOU/w4EiaZHAwCpOgs= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -1263,7 +1274,7 @@ go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.11.6 h1:XM7G6PjiGAO5betLF13BIa5TlLUUE3uJ/2Ox3Lz1K+o= +go.mongodb.org/mongo-driver v1.12.1 h1:nLkghSU8fQNaK7oUmDhQFsnrtcoNy7Z6LVFKsEecqgE= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -1351,6 +1362,7 @@ go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLk go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1504,7 +1516,7 @@ golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.9.0 h1:BPpt2kU7oMRq3kCHAA1tbSEshXRw1LpG2ztgDwrzuAs= +golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= 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= @@ -1740,7 +1752,7 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.42.0/go.mod h1:+Oj4s6ch2SEGtPjGqfUfZonBH0GjQH89gTeKKAEGZKI= -google.golang.org/api v0.129.0 h1:2XbdjjNfFPXQyufzQVwPf1RRnHH8Den2pfNE2jw7L8w= +google.golang.org/api v0.134.0 h1:ktL4Goua+UBgoP1eL1/60LwZJqa1sIzkLmvoR3hR6Gw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1795,11 +1807,11 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210312152112-fc591d9ea70f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= -google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU= +google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 h1:Z8qdAF9GFsmcUuWQ5KVYIpP3PCKydn/YKORnghIalu4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1901,9 +1913,9 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.3.0 h1:2LdYUZ7CIxnYgskbUZfY7FPggmqnh6shBqfWa8Tn3XU= k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU= -k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo= +k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg= +k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA= k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -1924,7 +1936,7 @@ modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= -modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM= +modernc.org/sqlite v1.24.0 h1:EsClRIWHGhLTCX44p+Ri/JLD+vFGo0QGjasg2/F9TlI= modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/tests-integration/helper_otelcol_test.go b/tests-integration/helper_otelcol_test.go index 2f4c48df..d3f9fccb 100644 --- a/tests-integration/helper_otelcol_test.go +++ b/tests-integration/helper_otelcol_test.go @@ -32,7 +32,7 @@ import ( "go.uber.org/zap" ) -func setupOtelcolInfluxDBExporter(t *testing.T) (*httptest.Server, *mockReceiverFactory, func(*testing.T)) { +func setupOtelcolInfluxDBExporter(t *testing.T) (*httptest.Server, *mockReceiverFactory, func(*testing.T), error) { t.Helper() const otelcolConfigTemplate = ` @@ -43,6 +43,7 @@ exporters: influxdb: endpoint: ENDPOINT_DESTINATION span_dimensions: SPAN_DIMENSIONS + log_record_dimensions: LOG_RECORD_DIMENSIONS metrics_schema: METRICS_SCHEMA org: myorg bucket: mybucket @@ -73,6 +74,7 @@ service: mockDestinationEndpoint := mockDestination.URL configString := strings.ReplaceAll(otelcolConfigTemplate, "ENDPOINT_DESTINATION", mockDestinationEndpoint) configString = strings.ReplaceAll(configString, "SPAN_DIMENSIONS", "\n - service.name\n - span.name") + configString = strings.ReplaceAll(configString, "LOG_RECORD_DIMENSIONS", "\n - service.name") configString = strings.ReplaceAll(configString, "METRICS_SCHEMA", "telegraf-prometheus-v1") configString = strings.ReplaceAll(configString, "ADDRESS_HEALTH_CHECK", otelcolHealthCheckAddress) t.Setenv("test-env", configString) @@ -125,6 +127,7 @@ service: var runErr error go func() { runErr = collector.Run(context.Background()) + require.NoError(t, err) close(done) }() t.Cleanup(collector.Shutdown) @@ -148,12 +151,12 @@ service: time.Sleep(10 * time.Millisecond) select { case <-done: - return nil, nil, nil + return nil, nil, nil, runErr default: } } - return mockDestination, mockReceiverFactory, func(t *testing.T) { collector.Shutdown(); <-done; assert.NoError(t, runErr) } + return mockDestination, mockReceiverFactory, func(t *testing.T) { collector.Shutdown(); <-done; assert.NoError(t, runErr) }, nil } var ( diff --git a/tests-integration/otel2influx_test.go b/tests-integration/otel2influx_test.go index bfeaee8c..122ca911 100644 --- a/tests-integration/otel2influx_test.go +++ b/tests-integration/otel2influx_test.go @@ -22,12 +22,13 @@ func TestOtel2Influx(t *testing.T) { for i, mt := range metricTests { t.Run(fmt.Sprint(i), func(t *testing.T) { t.Run("otelcol", func(t *testing.T) { - mockDestination, mockReceiverFactory, closeOtelcol := setupOtelcolInfluxDBExporter(t) + mockDestination, mockReceiverFactory, closeOtelcol, err := setupOtelcolInfluxDBExporter(t) + require.NoError(t, err) t.Cleanup(mockDestination.Close) clone := pmetric.NewMetrics() mt.otel.CopyTo(clone) - err := mockReceiverFactory.nextMetricsConsumer.ConsumeMetrics(context.Background(), clone) + err = mockReceiverFactory.nextMetricsConsumer.ConsumeMetrics(context.Background(), clone) require.NoError(t, err) got := mockReceiverFactory.lineprotocol(t) @@ -65,12 +66,13 @@ func TestOtel2Influx(t *testing.T) { for i, tt := range traceTests { t.Run(fmt.Sprint(i), func(t *testing.T) { t.Run("otelcol", func(t *testing.T) { - mockDestination, mockReceiverFactory, closeOtelcol := setupOtelcolInfluxDBExporter(t) + mockDestination, mockReceiverFactory, closeOtelcol, err := setupOtelcolInfluxDBExporter(t) + require.NoError(t, err) t.Cleanup(mockDestination.Close) clone := ptrace.NewTraces() tt.otel.CopyTo(clone) - err := mockReceiverFactory.nextTracesConsumer.ConsumeTraces(context.Background(), clone) + err = mockReceiverFactory.nextTracesConsumer.ConsumeTraces(context.Background(), clone) require.NoError(t, err) got := mockReceiverFactory.lineprotocol(t) @@ -102,12 +104,13 @@ func TestOtel2Influx(t *testing.T) { for i, lt := range logTests { t.Run(fmt.Sprint(i), func(t *testing.T) { t.Run("otelcol", func(t *testing.T) { - mockDestination, mockReceiverFactory, closeOtelcol := setupOtelcolInfluxDBExporter(t) + mockDestination, mockReceiverFactory, closeOtelcol, err := setupOtelcolInfluxDBExporter(t) + require.NoError(t, err) t.Cleanup(mockDestination.Close) clone := plog.NewLogs() lt.otel.CopyTo(clone) - err := mockReceiverFactory.nextLogsConsumer.ConsumeLogs(context.Background(), clone) + err = mockReceiverFactory.nextLogsConsumer.ConsumeLogs(context.Background(), clone) require.NoError(t, err) got := mockReceiverFactory.lineprotocol(t) diff --git a/tests-integration/test_fodder.go b/tests-integration/test_fodder.go index c65b0c2d..51fe8abc 100644 --- a/tests-integration/test_fodder.go +++ b/tests-integration/test_fodder.go @@ -148,7 +148,7 @@ spans,span_id=0000000000000005,trace_id=00000000000000020000000000000002 duratio logTests = append(logTests, logTest{ otel: logs, lp: ` -logs,span_id=0000000000000003,trace_id=00000000000000020000000000000001 body="something-happened",k=true,dropped_attributes_count=5u,severity_number=9i,severity_text="info" 1622848686000000000 +logs,span_id=0000000000000003,trace_id=00000000000000020000000000000001 body="something-happened",attributes="{\"k\":true}",dropped_attributes_count=5u,severity_number=9i,severity_text="info" 1622848686000000000 `, }) } From 823620b4fb70162837afa5bcae4961578b9ca340 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Tue, 22 Aug 2023 16:57:33 -0700 Subject: [PATCH 04/13] chore: add missing otel v0.83.0 updates --- .github/workflows/ci.yml | 2 +- demo/docker-compose.yml | 2 +- run-checks.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce9b5b39..b9e4939f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,6 @@ jobs: - name: build run: > - go install go.opentelemetry.io/collector/cmd/builder@v0.81.0 && + go install go.opentelemetry.io/collector/cmd/builder@v0.83.0 && cd otelcol-influxdb && builder --config build.yml diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index 79743614..f250eb54 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -46,7 +46,7 @@ services: JAEGER_AGENT_PORT: 6831 otelcol-influxdb: - image: otel/opentelemetry-collector-contrib:0.81.0 + image: otel/opentelemetry-collector-contrib:0.83.0 command: [ "--config", "/config.yml" ] stop_grace_period: 10s volumes: diff --git a/run-checks.sh b/run-checks.sh index 020c4159..530f7052 100755 --- a/run-checks.sh +++ b/run-checks.sh @@ -18,7 +18,7 @@ if ! hash staticcheck; then fi if ! hash builder; then echo "installing the opentelemetry collector builder" - if ! go install go.opentelemetry.io/collector/cmd/builder@v0.81.0; then + if ! go install go.opentelemetry.io/collector/cmd/builder@v0.83.0; then echo "failed to install the opentelemetry collector builder" exit 1 fi From a4eb3f95b71abcf38ff65ab5253f02d8b78bb54d Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Wed, 30 Aug 2023 13:37:58 -0700 Subject: [PATCH 05/13] fix: otelcol-influxdb missing InfluxDB exporter --- otelcol-influxdb/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/otelcol-influxdb/build.yml b/otelcol-influxdb/build.yml index 67866d0d..399ee0d4 100644 --- a/otelcol-influxdb/build.yml +++ b/otelcol-influxdb/build.yml @@ -15,6 +15,7 @@ receivers: exporters: - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0 connectors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.83.0 From e1a13fd478fed8a8ba3de1dac24b0946dc775e36 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Wed, 30 Aug 2023 13:44:36 -0700 Subject: [PATCH 06/13] chore: update OpenTelemetry to v0.84.0 --- .github/workflows/ci.yml | 2 +- common/go.mod | 2 +- common/go.sum | 4 +- demo/docker-compose.yml | 2 +- influx2otel/go.mod | 6 +- influx2otel/go.sum | 14 ++-- jaeger-influxdb/go.mod | 2 +- jaeger-influxdb/go.sum | 4 +- otel2influx/go.mod | 4 +- otel2influx/go.sum | 10 +-- otelcol-influxdb/Dockerfile | 2 +- otelcol-influxdb/build.yml | 44 ++++++------- run-checks.sh | 2 +- tests-integration/go.mod | 58 +++++++++-------- tests-integration/go.sum | 123 +++++++++++++++++++----------------- 15 files changed, 143 insertions(+), 136 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9e4939f..2da9d174 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,6 @@ jobs: - name: build run: > - go install go.opentelemetry.io/collector/cmd/builder@v0.83.0 && + go install go.opentelemetry.io/collector/cmd/builder@v0.84.0 && cd otelcol-influxdb && builder --config build.yml diff --git a/common/go.mod b/common/go.mod index 152c127c..39e5668b 100644 --- a/common/go.mod +++ b/common/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.83.0 + go.opentelemetry.io/collector/semconv v0.84.0 ) require ( diff --git a/common/go.sum b/common/go.sum index 004bfe68..f1a6528e 100644 --- a/common/go.sum +++ b/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= -go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= +go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index f250eb54..2964f1a8 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -46,7 +46,7 @@ services: JAEGER_AGENT_PORT: 6831 otelcol-influxdb: - image: otel/opentelemetry-collector-contrib:0.83.0 + image: otel/opentelemetry-collector-contrib:0.84.0 command: [ "--config", "/config.yml" ] stop_grace_period: 10s volumes: diff --git a/influx2otel/go.mod b/influx2otel/go.mod index e3e6f410..f7d904bd 100644 --- a/influx2otel/go.mod +++ b/influx2otel/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/influxdata/influxdb-observability/common v0.5.5 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.83.0 + go.opentelemetry.io/collector/semconv v0.84.0 ) require ( diff --git a/influx2otel/go.sum b/influx2otel/go.sum index 947669e1..e1add9cd 100644 --- a/influx2otel/go.sum +++ b/influx2otel/go.sum @@ -22,11 +22,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 h1:rwaJhPhZf/4A0exUs4cjALn6jnFU2QAL5cSJ/FwzcsE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 h1:/6X4L5BrCyy5Uz/jnLwkiv9E6VfuJl9EFJztWtkWvps= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0/go.mod h1:Dlxbly9XL8iSnb1bsJtpz5OUVtJ+nVTTqbsfy1itydk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 h1:yEuD/gKHNVMwjT4mRZAeUVCe/VO2tqeb5+aFim5jQJs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.84.0 h1:EMdLjuWUpbkbYQ/lEg+qZk3lGEG2iPiU+t6g7g/J/5s= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 h1:NXzx/YViPbapdfI0RZ2RJk4XgKU099Ci9rGBsZ/div8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0/go.mod h1:t7+PIcvZwI9599uzwRVpJbJBUbOLBmvs0cIVse8djaA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 h1:Zuk1i/92HvV5cI6dtsG/VWSKwaLGh17q9a26qP9DBbo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -38,8 +38,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= -go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= +go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index 6c0c103f..53b52316 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -14,7 +14,7 @@ require ( github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.83.0 + go.opentelemetry.io/collector/semconv v0.84.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.24.0 google.golang.org/grpc v1.56.2 diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index 6f137a41..2bf0bf1d 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -290,8 +290,8 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= -go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= +go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= 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/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= diff --git a/otel2influx/go.mod b/otel2influx/go.mod index 2f19d401..d12ec878 100644 --- a/otel2influx/go.mod +++ b/otel2influx/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( github.com/influxdata/influxdb-observability/common v0.5.5 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.83.0 + go.opentelemetry.io/collector/consumer v0.84.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.83.0 + go.opentelemetry.io/collector/semconv v0.84.0 go.uber.org/multierr v1.11.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 ) diff --git a/otel2influx/go.sum b/otel2influx/go.sum index ce836cf4..3d3f0ae5 100644 --- a/otel2influx/go.sum +++ b/otel2influx/go.sum @@ -29,13 +29,13 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.83.0 h1:rKFch1CANepajPwBTvzYj/hKz7RsMyUkPPPNjRCpJ/I= -go.opentelemetry.io/collector/consumer v0.83.0 h1:8wg0UfFxxaGYsTkQGWuf1pE7C/dTvPkkYmBtR6N5BKc= -go.opentelemetry.io/collector/consumer v0.83.0/go.mod h1:YLbmTqvgIOYUlEeWun8wQ4RZ0HaYjsABWKw7nwU9F3c= +go.opentelemetry.io/collector v0.84.0 h1:zzsegdPlDR0iJufPsHTJhXkv9q2kbpTTTI6nTyya2wA= +go.opentelemetry.io/collector/consumer v0.84.0 h1:sz8mXIdPACJArlRyFNXA1SScVoo954IU1qp9V78VUxc= +go.opentelemetry.io/collector/consumer v0.84.0/go.mod h1:Mu+KeuorwHHWd6iGxU7DMAhgsHZmmzmQgf3sSWkugmM= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= -go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= +go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile index 411333c6..30dbffad 100644 --- a/otelcol-influxdb/Dockerfile +++ b/otelcol-influxdb/Dockerfile @@ -7,7 +7,7 @@ RUN \ --mount=type=cache,id=influxdb-observability-gocache,sharing=locked,target=/root/.cache/go-build \ --mount=type=cache,id=influxdb-observability-gomodcache,sharing=locked,target=/go/pkg/mod \ du -cshx /root/.cache/go-build /go/pkg/mod && \ - go install go.opentelemetry.io/collector/cmd/builder@v0.83.0 && \ + go install go.opentelemetry.io/collector/cmd/builder@v0.84.0 && \ du -cshx /root/.cache/go-build /go/pkg/mod COPY . /project diff --git a/otelcol-influxdb/build.yml b/otelcol-influxdb/build.yml index 399ee0d4..5a822319 100644 --- a/otelcol-influxdb/build.yml +++ b/otelcol-influxdb/build.yml @@ -2,39 +2,39 @@ dist: name: otelcol-influxdb module: github.com/influxdata/influxdb-observability/otelcol-influxdb description: OpenTelemetry Collector Distribution built for InfluxDB - version: 0.83.0-0.0.0-beta.0 - otelcol_version: 0.83.0 + version: 0.84.0-0.0.0-beta.0 + otelcol_version: 0.84.0 output_path: ./build receivers: -- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.83.0 +- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.84.0 exporters: -- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0 +- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.84.0 connectors: -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.83.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.84.0 extensions: -- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.83.0 -- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.83.0 +- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.84.0 +- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.84.0 processors: -- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.83.0 -- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.83.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.83.0 +- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.84.0 +- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.84.0 replaces: - github.com/influxdata/influxdb-observability/common => ../../common diff --git a/run-checks.sh b/run-checks.sh index 530f7052..328d8979 100755 --- a/run-checks.sh +++ b/run-checks.sh @@ -18,7 +18,7 @@ if ! hash staticcheck; then fi if ! hash builder; then echo "installing the opentelemetry collector builder" - if ! go install go.opentelemetry.io/collector/cmd/builder@v0.83.0; then + if ! go install go.opentelemetry.io/collector/cmd/builder@v0.84.0; then echo "failed to install the opentelemetry collector builder" exit 1 fi diff --git a/tests-integration/go.mod b/tests-integration/go.mod index 078f4bc3..c3af95c3 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -6,20 +6,20 @@ require ( github.com/influxdata/influxdb/v2 v2.6.1 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/influxdata/telegraf v1.27.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.83.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.84.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.84.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.83.0 - go.opentelemetry.io/collector/component v0.83.0 - go.opentelemetry.io/collector/confmap v0.83.0 - go.opentelemetry.io/collector/consumer v0.83.0 - go.opentelemetry.io/collector/exporter v0.83.0 - go.opentelemetry.io/collector/extension v0.83.0 + go.opentelemetry.io/collector v0.84.0 + go.opentelemetry.io/collector/component v0.84.0 + go.opentelemetry.io/collector/confmap v0.84.0 + go.opentelemetry.io/collector/consumer v0.84.0 + go.opentelemetry.io/collector/exporter v0.84.0 + go.opentelemetry.io/collector/extension v0.84.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/processor v0.83.0 - go.opentelemetry.io/collector/receiver v0.83.0 + go.opentelemetry.io/collector/processor v0.84.0 + go.opentelemetry.io/collector/receiver v0.84.0 go.uber.org/zap v1.25.0 google.golang.org/grpc v1.57.0 ) @@ -53,7 +53,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/cel-go v0.14.1-0.20230424164844-d39523c445fc // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.3.1 // indirect github.com/gosnmp/gosnmp v1.35.1-0.20230602062452-f30602b8dad6 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -61,7 +61,6 @@ require ( github.com/influxdata/influxdb-observability/influx2otel v0.5.5 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.5.5 // indirect github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 // indirect - github.com/jaegertracing/jaeger v1.47.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect github.com/klauspost/pgzip v1.2.6 // indirect @@ -77,8 +76,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.16.0 // indirect @@ -101,17 +100,17 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.83.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.83.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.83.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.83.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.83.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.83.0 // indirect - go.opentelemetry.io/collector/config/internal v0.83.0 // indirect - go.opentelemetry.io/collector/connector v0.83.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.83.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.84.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.84.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.84.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.84.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.84.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.84.0 // indirect + go.opentelemetry.io/collector/config/internal v0.84.0 // indirect + go.opentelemetry.io/collector/connector v0.84.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.84.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/collector/semconv v0.83.0 // indirect + go.opentelemetry.io/collector/semconv v0.84.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect go.opentelemetry.io/otel v1.16.0 // indirect @@ -120,6 +119,9 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect @@ -130,11 +132,11 @@ require ( go.opentelemetry.io/proto/otlp v0.19.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.12.0 // indirect - golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect + golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect - gonum.org/v1/gonum v0.13.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/tests-integration/go.sum b/tests-integration/go.sum index 2a2733c1..c6ff27a3 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -629,8 +629,8 @@ github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= +github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.2.5 h1:UR4rDjcgpgEnqpIEvkiqTYKBCKLNmlge2eVjoZfySzM= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= @@ -702,7 +702,7 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -769,7 +769,6 @@ github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= github.com/jaegertracing/jaeger v1.47.0 h1:XXxTMO+GxX930gxKWsg90rFr6RswkCRIW0AgWFnTYsg= -github.com/jaegertracing/jaeger v1.47.0/go.mod h1:mHU/OHFML51CijQql4+rLfgPOcIb9MhxOMn+RKQwrJc= github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a h1:JxcWget6X/VfBMKxPIc28Jel37LGREut2fpV+ObkwJ0= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -987,17 +986,17 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0 h1:Kjh+MVsvlV/vmgwnN667ln57kQiz6ZfYxyk+IONS5lA= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.83.0/go.mod h1:CMhTUJ14v2P/roC9GrV7fdVS7MCtXwOjw+JprJrfFKM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0 h1:pzq9yVMgLzeo8ZsgtjDzsR+B/dt+Fc3FROAu9SV+Qu4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.83.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.83.0 h1:rwaJhPhZf/4A0exUs4cjALn6jnFU2QAL5cSJ/FwzcsE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0 h1:/6X4L5BrCyy5Uz/jnLwkiv9E6VfuJl9EFJztWtkWvps= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.83.0/go.mod h1:Dlxbly9XL8iSnb1bsJtpz5OUVtJ+nVTTqbsfy1itydk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0 h1:yEuD/gKHNVMwjT4mRZAeUVCe/VO2tqeb5+aFim5jQJs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.83.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0 h1:UMQgLKATT9yia7l6Y45ZZnVPmZ5iRpAHGfHw9h2DEy0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.83.0/go.mod h1:6LKpL1Uo7kGflQS4AHJNQts3joX7LQmNmNQRil28PMo= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0 h1:9G7QLkloZCu4Kz+YddCokyyHWoJwFH5iKMF2P5+hmFM= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0/go.mod h1:HlqBRg9x9ZSaL4rnaC5OeFMlQBHgj/IjgxzF3n021yk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0 h1:Z6mmJnj4t47FLifxesZsuGN9mZRCT6pUY5Y5g8SWJkw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.84.0 h1:EMdLjuWUpbkbYQ/lEg+qZk3lGEG2iPiU+t6g7g/J/5s= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 h1:NXzx/YViPbapdfI0RZ2RJk4XgKU099Ci9rGBsZ/div8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0/go.mod h1:t7+PIcvZwI9599uzwRVpJbJBUbOLBmvs0cIVse8djaA= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 h1:Zuk1i/92HvV5cI6dtsG/VWSKwaLGh17q9a26qP9DBbo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.84.0 h1:uetVWFWQM4Se1zIfgrNhHcCBqN6nt89Ts8Rb4axbqlc= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.84.0/go.mod h1:an1T53ly6lhlwFRX5oQhvZr7GzkTzL6FGfAMeuerkKI= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1032,8 +1031,8 @@ github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHu github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= +github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= @@ -1286,48 +1285,48 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.83.0 h1:rKFch1CANepajPwBTvzYj/hKz7RsMyUkPPPNjRCpJ/I= -go.opentelemetry.io/collector v0.83.0/go.mod h1:MNN79VDXXaRP2ZqcDVOfWH0Jl8BbcMttJ3SY/pU6vxo= -go.opentelemetry.io/collector/component v0.83.0 h1:7bMbOHQezVx9RhSLu9KQRBhjXmO+CbOVhBk5uySb0fY= -go.opentelemetry.io/collector/component v0.83.0/go.mod h1:Qy2mIP32UKN1x8rsjJbkgB9obAVu4hRusc1wKNFeV+o= -go.opentelemetry.io/collector/config/configauth v0.83.0 h1:caIkUszP+kTRVx9HW6z7x05CMnzlaBoP2BKyWDIr2ag= -go.opentelemetry.io/collector/config/configauth v0.83.0/go.mod h1:PqSIaQryPWiPVMuxlNPEvTpuvhdRq8ySN9nKlk3YbH4= -go.opentelemetry.io/collector/config/configcompression v0.83.0 h1:WwGfHyGey8JSUsBGUmRHaOzwllrLmsjjo5SZCYfSP14= -go.opentelemetry.io/collector/config/configcompression v0.83.0/go.mod h1:Mi1/3D+qNlRohrVMbBOj6XSHo7YKAKbgWYisNW2Qobc= -go.opentelemetry.io/collector/config/confighttp v0.83.0 h1:yBra00XanzqXL0kLs3Aaas7RLoL50bM/Za8223vwJik= -go.opentelemetry.io/collector/config/confighttp v0.83.0/go.mod h1:Eu2WVZa8cy3F8mlxXIFPgzeAeLnaVc5UZzcEtufrOWs= -go.opentelemetry.io/collector/config/confignet v0.83.0 h1:xaQkMXvId8y7o6ke2qVRZZDqNc315CGkIcZ6LSVxDE0= -go.opentelemetry.io/collector/config/configopaque v0.83.0 h1:nhYguW1zVFnQlaZWhwbXJS4/+WEPdQSEL8kTF/j/zeI= -go.opentelemetry.io/collector/config/configopaque v0.83.0/go.mod h1:Ga1x7xLQXWmwxfW1pPqjI4qT+eNxf9wu2/Mx7O2u01U= -go.opentelemetry.io/collector/config/configtelemetry v0.83.0 h1:Dx+POy68CFsec9JDYd7cxQPULLfSOAG8ma5Jl3ZZ3+Y= -go.opentelemetry.io/collector/config/configtelemetry v0.83.0/go.mod h1:8wZuTKLdcWwdB82Jd07TOHsHKuv8l47T+MUGEsPe4z4= -go.opentelemetry.io/collector/config/configtls v0.83.0 h1:qeAqwvw7qs3fY8wVZzN54E+SNMES7YdATY0ASEbJlUw= -go.opentelemetry.io/collector/config/configtls v0.83.0/go.mod h1:YMf+YSUhPB/LD5pZSyb3wRi7x6vbiMbONXOWFQnJnZ4= -go.opentelemetry.io/collector/config/internal v0.83.0 h1:yQZegCOPl4dWUVkr/fscVFU/AjANT5+Tu5XpKztTTSA= -go.opentelemetry.io/collector/config/internal v0.83.0/go.mod h1:BQs+X52s4BCIshht8qgbT4dqCM5YM2h6RQWln6zWhRA= -go.opentelemetry.io/collector/confmap v0.83.0 h1:eUaiFdhTLkFdNpMi5FLSHSQ6X2FcEHe0KfEUt9ZtVlI= -go.opentelemetry.io/collector/confmap v0.83.0/go.mod h1:ZsmLyJ+4VeO+qz5o1RKadRoY4Db+d8PYwiLCJ3Z5Et8= -go.opentelemetry.io/collector/connector v0.83.0 h1:wUxpqBTjJ9WSgZnosU26ALGYtwPVzEQxQk7w+mKSOs4= -go.opentelemetry.io/collector/connector v0.83.0/go.mod h1:o9xnA7C+2JzYQMSyWIJz/28tc3lGs3JkKLpckpAdzB8= -go.opentelemetry.io/collector/consumer v0.83.0 h1:8wg0UfFxxaGYsTkQGWuf1pE7C/dTvPkkYmBtR6N5BKc= -go.opentelemetry.io/collector/consumer v0.83.0/go.mod h1:YLbmTqvgIOYUlEeWun8wQ4RZ0HaYjsABWKw7nwU9F3c= -go.opentelemetry.io/collector/exporter v0.83.0 h1:1MPrMaCFvEvl291pAE0hTgPb7YybjSak9O5akzXqnXs= -go.opentelemetry.io/collector/exporter v0.83.0/go.mod h1:5XIrrkfRI7Ndt5FnH0CC6It0VxTHRviGv/I350EWGBs= -go.opentelemetry.io/collector/extension v0.83.0 h1:O47qpJTeav6jATvnIUvUrO5KBMqa6ySMA5i+7XXW7GY= -go.opentelemetry.io/collector/extension v0.83.0/go.mod h1:gPfwNimQiscUpaUGC/pUniTn4b5O+8IxHVKHDUkGqSI= -go.opentelemetry.io/collector/extension/auth v0.83.0 h1:H0orp7a7/NZae4/ymnC5JpuvO6GNcGLNz+nEDAw9ciU= -go.opentelemetry.io/collector/extension/auth v0.83.0/go.mod h1:Br0OyLU0p+2xS0UvQRvgWmH0Kv/4kPkNVr9AMzee5GM= -go.opentelemetry.io/collector/extension/zpagesextension v0.83.0 h1:a2Avt+yjaJbHPbiST3I/4GgfxrB3iEpTtgIEGermItw= +go.opentelemetry.io/collector v0.84.0 h1:zzsegdPlDR0iJufPsHTJhXkv9q2kbpTTTI6nTyya2wA= +go.opentelemetry.io/collector v0.84.0/go.mod h1:+cv/zxludfiiDuK3z+5eXkxAJhkCCcy8Chtvv0nOlr0= +go.opentelemetry.io/collector/component v0.84.0 h1:bh4Is5Z7TjuyF7Mab0rSNh2q3y15fImdNDRXqrqGlbA= +go.opentelemetry.io/collector/component v0.84.0/go.mod h1:uXteRaacYXXYhzeCJe5ClLz5gLzleXWz01IZ730w7FA= +go.opentelemetry.io/collector/config/configauth v0.84.0 h1:N2cnOZYJ3DKg4NF28qLqrDj5Arl8IFt2rK3voDImTUU= +go.opentelemetry.io/collector/config/configauth v0.84.0/go.mod h1:8Uoq8FyFLhlELIHApKwGa9mhhTtQKGAfKDcBAw1aM8M= +go.opentelemetry.io/collector/config/configcompression v0.84.0 h1:NyyBsDlZDLKY6/+Ki2T5muQII6bq4ZGNMHTz9XKLskI= +go.opentelemetry.io/collector/config/configcompression v0.84.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= +go.opentelemetry.io/collector/config/confighttp v0.84.0 h1:SQK89DAe4VSACnMN79opyzEZa8DaN206nNsQbjbeu60= +go.opentelemetry.io/collector/config/confighttp v0.84.0/go.mod h1:lC4RRRZSAqDbppfKKtATQ8nZtC4wYowvpkXwYhnHkFY= +go.opentelemetry.io/collector/config/confignet v0.84.0 h1:AGaAdhKgV/lxNxHL/RqqpKjVGuIPSO8whTZyBbP3KK0= +go.opentelemetry.io/collector/config/configopaque v0.84.0 h1:EjALh+TaICWGcHAwTV87niSgWoI3fTQ3h6ureyo8ksw= +go.opentelemetry.io/collector/config/configopaque v0.84.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= +go.opentelemetry.io/collector/config/configtelemetry v0.84.0 h1:pnZiYtppJN6SlzJNcrkA8R+Ur63e33qMO260m8JbK18= +go.opentelemetry.io/collector/config/configtelemetry v0.84.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= +go.opentelemetry.io/collector/config/configtls v0.84.0 h1:0rE1cdCLBx98nm6UgHnWFbytY0leZi/dr5bJ+i6Zup0= +go.opentelemetry.io/collector/config/configtls v0.84.0/go.mod h1:7zgWZBbH1+ZZLxNzDS+Kz0Em9dAXdlYmRqjXTWxZK2o= +go.opentelemetry.io/collector/config/internal v0.84.0 h1:LX1gO0q3+/y8JeRCOnYuMiF73gLZ7CwMSiov8Cqmumw= +go.opentelemetry.io/collector/config/internal v0.84.0/go.mod h1:XN8Y+Vhq/RqxGry7CGKwhMXJptUrmWTHdC6ZeI+Uy9E= +go.opentelemetry.io/collector/confmap v0.84.0 h1:fS62yIRrsTQwe1gyuEc8TQM0yUNfSAzPVi0A1665ZpQ= +go.opentelemetry.io/collector/confmap v0.84.0/go.mod h1:/SNHqYkLagF0TjBjQyCy2Gt3ZF6hTK8VKbaan/ZHuJs= +go.opentelemetry.io/collector/connector v0.84.0 h1:glvKR5FCHX/KuXKrItzVhSNaP3/n19LHrewaaFaRnWI= +go.opentelemetry.io/collector/connector v0.84.0/go.mod h1:VzBR1lHPntgGZkTYry35xyEtJLeHB8nQ/pcEeSt54H0= +go.opentelemetry.io/collector/consumer v0.84.0 h1:sz8mXIdPACJArlRyFNXA1SScVoo954IU1qp9V78VUxc= +go.opentelemetry.io/collector/consumer v0.84.0/go.mod h1:Mu+KeuorwHHWd6iGxU7DMAhgsHZmmzmQgf3sSWkugmM= +go.opentelemetry.io/collector/exporter v0.84.0 h1:OWvHJghs7/R6Qwr2fh7HrgEqsIUbCgLddLQsmqN95kM= +go.opentelemetry.io/collector/exporter v0.84.0/go.mod h1:Bz7MTaVosTIz6ZISszKYLDOewjathUJuVgT5W4Ee/wU= +go.opentelemetry.io/collector/extension v0.84.0 h1:HN4otmncTE/eaeRcvBGTf0ApcX+dIQWsnShs6bgiKYA= +go.opentelemetry.io/collector/extension v0.84.0/go.mod h1:FoUzonXMAjVbFuSLM06F1260iVcbnMLMAEQk/xBfN1Y= +go.opentelemetry.io/collector/extension/auth v0.84.0 h1:e6IgIzLFdtTBImOC2qtH64PP/D/U6it3azMrAQ3/22I= +go.opentelemetry.io/collector/extension/auth v0.84.0/go.mod h1:eYm6kN05PyJrNjousma3CXiwzBsI582tlKjF9AUxnpQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.84.0 h1:huytVHKFVKDQBnLvy5tL/AUmzE3ydOwPClOZq1iZp50= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 h1:C9o0mbP0MyygqFnKueVQK/v9jef6zvuttmTGlKaqhgw= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/processor v0.83.0 h1:oWMpPzHLkzlPXRIa27UsfsaDSbXaF/0qeiCn3BaesGo= -go.opentelemetry.io/collector/processor v0.83.0/go.mod h1:sLxTTqkIhmNtekO0HebXgVclPpm/xoQ4+g8CbzgYBCM= -go.opentelemetry.io/collector/receiver v0.83.0 h1:T2LI6BGNGMGBN8DLWUy7KyFXVaQR8ah+7ssCwb8OqNs= -go.opentelemetry.io/collector/receiver v0.83.0/go.mod h1:yEo8Mv57a53Psd2BvUbP/he5ZtdrwHezeLUCTUtf6PA= -go.opentelemetry.io/collector/semconv v0.83.0 h1:zfBJaGiC7XI8dLD/8QIyKre98RHcq3DaG1g1B+U/Dow= -go.opentelemetry.io/collector/semconv v0.83.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/processor v0.84.0 h1:6VM5HLdkroeqNZ/jvjxA4nsgweJ87FDMsnNnzVBHpcY= +go.opentelemetry.io/collector/processor v0.84.0/go.mod h1:KWgBNQuA6wmmRqJwfvPaRybK2Di9X8nE2fraGuVLNJo= +go.opentelemetry.io/collector/receiver v0.84.0 h1:5bN0A18UMAVu9AsFv5AYDgzEFEJ/nFaD1OK2rk7Ygy0= +go.opentelemetry.io/collector/receiver v0.84.0/go.mod h1:QvjpfmMUA4tW59QJBagoNEbRT5JGYZN333GAOuWIRr4= +go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= +go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= @@ -1345,6 +1344,12 @@ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 h1:rm+ go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0/go.mod h1:sWFbI3jJ+6JdjOVepA5blpv/TJ20Hw+26561iMbWcwU= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 h1:IZXpCEtI7BbX01DRQEWTGDkvjMB6hEhiEZXS+eg2YqY= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0/go.mod h1:xY111jIZtWb+pUUgT4UiiSonAaY2cD2Ts5zvuKLki3o= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 h1:iqjq9LAB8aK++sKVcELezzn655JnBNdsDhghU4G/So8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 h1:fl2WmyenEf6LYYlfHAtCUEDyGcpwJNqD4dHGO7PVm4w= @@ -1368,7 +1373,7 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= 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.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= @@ -1415,8 +1420,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME= -golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= +golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e h1:qyrTQ++p1afMkO4DPEeLGq/3oTsdlvdH4vqZUBWzUKM= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -1725,8 +1730,8 @@ golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211230205640-daad0b7ba671 h1:tJAYx7pB gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= -gonum.org/v1/gonum v0.13.0 h1:a0T3bh+7fhRyqeNbiC3qVHYmkiQgit3wnNan/2c0HMM= -gonum.org/v1/gonum v0.13.0/go.mod h1:/WPYRckkfWrhWefxyYTfrTtQR0KH4iyHNuzxqXAKyAU= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= From 9c9f872aaba44fc2dd93e96eb0a2db0d8d5319af Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Thu, 31 Aug 2023 14:19:12 -0700 Subject: [PATCH 07/13] feat: implement converstion for Exemplars and Flags Closes #266 For each metric table "foo" in v1 schema, another metric table "foo_exemplar" is created. Also added conversion for flags (logs and metrics) and observed time (logs). With the change, I also reviewed most of the otel2influx code, looking for other missing otel model properties, and other small refactors. --- common/common.go | 9 +- influx2otel/metrics.go | 20 +- influx2otel/metrics_statsd_schema_test.go | 40 +-- influx2otel/metrics_telegraf_prometheus_v1.go | 67 +++-- .../metrics_telegraf_prometheus_v1_test.go | 94 ++++--- .../metrics_telegraf_prometheus_v2_test.go | 72 +++--- influx2otel/metrics_unknown_schema_test.go | 12 +- otel2influx/common.go | 158 +----------- otel2influx/logs.go | 39 ++- otel2influx/metrics.go | 15 +- otel2influx/metrics_otel_v1.go | 23 +- otel2influx/metrics_telegraf_prometheus_v1.go | 135 +++++++--- .../metrics_telegraf_prometheus_v1_test.go | 205 +++++++++------- otel2influx/metrics_telegraf_prometheus_v2.go | 204 +++++++++------- .../metrics_telegraf_prometheus_v2_test.go | 231 +++++++++--------- otel2influx/traces.go | 75 ++---- tests-integration/test_fodder.go | 23 +- 17 files changed, 721 insertions(+), 701 deletions(-) diff --git a/common/common.go b/common/common.go index f8013924..1d742354 100644 --- a/common/common.go +++ b/common/common.go @@ -43,13 +43,17 @@ const ( MetricSummaryQuantileKeyV2 = "quantile" MetricSummaryCountSuffix = "_count" MetricSummarySumSuffix = "_sum" + MetricExemplarSuffix = "_exemplar" // These attribute key names are influenced by the proto message keys. // https://github.com/open-telemetry/opentelemetry-proto/blob/abbf7b7b49a5342d0d6c0e86e91d713bbedb6580/opentelemetry/proto/trace/v1/trace.proto // https://github.com/open-telemetry/opentelemetry-proto/blob/abbf7b7b49a5342d0d6c0e86e91d713bbedb6580/opentelemetry/proto/metrics/v1/metrics.proto // https://github.com/open-telemetry/opentelemetry-proto/blob/abbf7b7b49a5342d0d6c0e86e91d713bbedb6580/opentelemetry/proto/logs/v1/logs.proto - AttributeTime = "time" - AttributeStartTimeUnixNano = "start_time_unix_nano" + AttributeTime = "time" + AttributeStartTimeUnixNano = "start_time_unix_nano" + AttributeObservedTimeUnixNano = "observed_time_unix_nano" + // string formatted RFC3339, used by the otel statsd input plugin + AttributeStartTimeStatsd = "start_time" AttributeTraceID = "trace_id" AttributeSpanID = "span_id" AttributeTraceState = "trace_state" @@ -67,4 +71,5 @@ const ( AttributeSeverityNumber = "severity_number" AttributeSeverityText = "severity_text" AttributeBody = "body" + AttributeFlags = "flags" ) diff --git a/influx2otel/metrics.go b/influx2otel/metrics.go index 3e1e25bc..7c37cf97 100644 --- a/influx2otel/metrics.go +++ b/influx2otel/metrics.go @@ -92,7 +92,7 @@ func (b *MetricsBatch) lookupMetric(metricName string, tags map[string]string, v rAttributes.PutStr(k, v) case k == "temporality" && v == "delta": isDelta = true - case k == "start_time": + case k == common.AttributeStartTimeStatsd: default: mAttributes.PutStr(k, v) } @@ -112,10 +112,10 @@ func (b *MetricsBatch) lookupMetric(metricName string, tags map[string]string, v ilmKey := ilName + ":" + ilVersion if _, found := b.ilmByRMAttributesAndIL[rKey][ilmKey]; !found { - ilMetrics := resourceMetrics.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName(ilName) - ilMetrics.Scope().SetVersion(ilVersion) - b.ilmByRMAttributesAndIL[rKey][ilmKey] = ilMetrics + isMetrics := resourceMetrics.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName(ilName) + isMetrics.Scope().SetVersion(ilVersion) + b.ilmByRMAttributesAndIL[rKey][ilmKey] = isMetrics b.metricByRMIL[rKey][ilmKey] = make(map[string]pmetric.Metric) } @@ -182,9 +182,9 @@ func (b *MetricsBatch) GetMetrics() pmetric.Metrics { // Ensure that infinity histogram buckets exist. for _, resourceMetrics := range b.rmByAttributes { for i := 0; i < resourceMetrics.ScopeMetrics().Len(); i++ { - ilMetrics := resourceMetrics.ScopeMetrics().At(i) - for j := 0; j < ilMetrics.Metrics().Len(); j++ { - metric := ilMetrics.Metrics().At(j) + isMetrics := resourceMetrics.ScopeMetrics().At(i) + for j := 0; j < isMetrics.Metrics().Len(); j++ { + metric := isMetrics.Metrics().At(j) if metric.Type() == pmetric.MetricTypeHistogram { for k := 0; k < metric.Histogram().DataPoints().Len(); k++ { dataPoint := metric.Histogram().DataPoints().At(k) @@ -217,7 +217,7 @@ func (b *MetricsBatch) addPointWithUnknownSchema(measurement string, tags map[st } for k, v := range fields { - if k == "start_time" { + if k == common.AttributeStartTimeStatsd { continue } var floatValue *float64 @@ -245,7 +245,7 @@ func (b *MetricsBatch) addPointWithUnknownSchema(measurement string, tags map[st dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) // set start_time, if exists and is RFC3339 // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) diff --git a/influx2otel/metrics_statsd_schema_test.go b/influx2otel/metrics_statsd_schema_test.go index db6c6fe4..d1ac9796 100644 --- a/influx2otel/metrics_statsd_schema_test.go +++ b/influx2otel/metrics_statsd_schema_test.go @@ -38,8 +38,8 @@ func TestStatsdTimingSchema(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_count") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -48,7 +48,7 @@ func TestStatsdTimingSchema(t *testing.T) { dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(10) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_lower") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -57,7 +57,7 @@ func TestStatsdTimingSchema(t *testing.T) { dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(10) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_mean") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -66,7 +66,7 @@ func TestStatsdTimingSchema(t *testing.T) { dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(10) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_median") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -75,7 +75,7 @@ func TestStatsdTimingSchema(t *testing.T) { dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(10) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_stddev") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -84,7 +84,7 @@ func TestStatsdTimingSchema(t *testing.T) { dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(10) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_sum") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -93,7 +93,7 @@ func TestStatsdTimingSchema(t *testing.T) { dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(100) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("test_service_stage_metrics_biz_success_v4_upper") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -126,8 +126,8 @@ func TestStatsCounter(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("gorets_value") m.SetEmptySum() m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -163,8 +163,8 @@ func TestStatsDeltaCounter(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("gorets_value") m.SetEmptySum() m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) @@ -199,8 +199,8 @@ func TestStatsGauge(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("gaugor_value") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -235,8 +235,8 @@ func TestStatsdSetsSchema(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("uniques_value") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -262,8 +262,8 @@ func TestDeltaTemporalityStatsdCounter(t *testing.T) { "temporality": "delta", }, map[string]interface{}{ - "value": int64(10), - "start_time": "2023-04-13T22:34:00.000535129+03:00", + "value": int64(10), + common.AttributeStartTimeStatsd: "2023-04-13T22:34:00.000535129+03:00", }, time.Unix(0, 1395066363000000123), common.InfluxMetricValueTypeSum) @@ -271,8 +271,8 @@ func TestDeltaTemporalityStatsdCounter(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("gorets_value") m.SetEmptySum() m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityDelta) diff --git a/influx2otel/metrics_telegraf_prometheus_v1.go b/influx2otel/metrics_telegraf_prometheus_v1.go index ed803bf8..f8f1232b 100644 --- a/influx2otel/metrics_telegraf_prometheus_v1.go +++ b/influx2otel/metrics_telegraf_prometheus_v1.go @@ -87,15 +87,18 @@ func (b *MetricsBatch) convertGaugeV1(measurement string, tags map[string]string dataPoint := metric.Gauge().DataPoints().AppendEmpty() attributes.CopyTo(dataPoint.Attributes()) dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - // set start_time, if exists and is RFC3339 - // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) } } } + if flagsObj, ok := fields[common.AttributeFlags]; ok { + if flagsUint64, ok := flagsObj.(uint64); ok { + dataPoint.SetFlags(pmetric.DataPointFlags(flagsUint64)) + } + } if floatValue != nil { dataPoint.SetDoubleValue(*floatValue) @@ -111,9 +114,7 @@ func (b *MetricsBatch) convertGaugeV1(measurement string, tags map[string]string var floatValue *float64 var intValue *int64 - // start_time is a metadata field about the metric, - // provided by statsd plugin. - if k == "start_time" { + if k == common.AttributeStartTimeStatsd || k == common.AttributeFlags { continue } switch typedValue := fieldValue.(type) { @@ -137,15 +138,18 @@ func (b *MetricsBatch) convertGaugeV1(measurement string, tags map[string]string dataPoint := metric.Gauge().DataPoints().AppendEmpty() attributes.CopyTo(dataPoint.Attributes()) dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - // set start_time, if exists and is RFC3339 - // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) } } } + if flagsObj, ok := fields[common.AttributeFlags]; ok { + if flagsUint64, ok := flagsObj.(uint64); ok { + dataPoint.SetFlags(pmetric.DataPointFlags(flagsUint64)) + } + } if floatValue != nil { dataPoint.SetDoubleValue(*floatValue) @@ -182,15 +186,18 @@ func (b *MetricsBatch) convertSumV1(measurement string, tags map[string]string, dataPoint := metric.Sum().DataPoints().AppendEmpty() attributes.CopyTo(dataPoint.Attributes()) dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - // set start_time, if exists and is RFC3339 - // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) } } } + if flagsObj, ok := fields[common.AttributeFlags]; ok { + if flagsUint64, ok := flagsObj.(uint64); ok { + dataPoint.SetFlags(pmetric.DataPointFlags(flagsUint64)) + } + } if floatValue != nil { dataPoint.SetDoubleValue(*floatValue) @@ -204,9 +211,7 @@ func (b *MetricsBatch) convertSumV1(measurement string, tags map[string]string, } for k, fieldValue := range fields { - // start_time is a metadata field about the metric, - // provided by statsd plugin. - if k == "start_time" { + if k == common.AttributeStartTimeStatsd || k == common.AttributeFlags { continue } @@ -233,15 +238,18 @@ func (b *MetricsBatch) convertSumV1(measurement string, tags map[string]string, dataPoint := metric.Sum().DataPoints().AppendEmpty() attributes.CopyTo(dataPoint.Attributes()) dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - // set start_time, if exists and is RFC3339 - // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) } } } + if flagsObj, ok := fields[common.AttributeFlags]; ok { + if flagsUint64, ok := flagsObj.(uint64); ok { + dataPoint.SetFlags(pmetric.DataPointFlags(flagsUint64)) + } + } if floatValue != nil { dataPoint.SetDoubleValue(*floatValue) @@ -287,7 +295,7 @@ func (b *MetricsBatch) convertHistogramV1(measurement string, tags map[string]st bucketCounts = append(bucketCounts, uint64(vBucketCount)) } - } else if k == "start_time" { + } else if k == common.AttributeStartTimeStatsd || k == common.AttributeFlags { } else { b.logger.Debug("skipping unrecognized histogram field", "field", k, "value", vi) } @@ -322,15 +330,18 @@ func (b *MetricsBatch) convertHistogramV1(measurement string, tags map[string]st dataPoint := metric.Histogram().DataPoints().AppendEmpty() attributes.CopyTo(dataPoint.Attributes()) dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - // set start_time, if exists and is RFC3339 - // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) } } } + if flagsObj, ok := fields[common.AttributeFlags]; ok { + if flagsUint64, ok := flagsObj.(uint64); ok { + dataPoint.SetFlags(pmetric.DataPointFlags(flagsUint64)) + } + } dataPoint.SetCount(count) dataPoint.SetSum(sum) @@ -371,8 +382,7 @@ func (b *MetricsBatch) convertSummaryV1(measurement string, tags map[string]stri valueAtQuantile.SetValue(value) } - } else if k == "start_time" { - + } else if k == common.AttributeStartTimeStatsd || k == common.AttributeFlags { } else { b.logger.Debug("skipping unrecognized summary field", "field", k, "value", vi) } @@ -391,15 +401,18 @@ func (b *MetricsBatch) convertSummaryV1(measurement string, tags map[string]stri dataPoint := metric.Summary().DataPoints().AppendEmpty() attributes.CopyTo(dataPoint.Attributes()) dataPoint.SetTimestamp(pcommon.NewTimestampFromTime(ts)) - // set start_time, if exists and is RFC3339 - // used by statsd input plugin - if startTimeObj, ok := fields["start_time"]; ok { + if startTimeObj, ok := fields[common.AttributeStartTimeStatsd]; ok { if startTimeStr, ok := startTimeObj.(string); ok { if t, err := time.Parse(time.RFC3339, startTimeStr); err == nil { dataPoint.SetStartTimestamp(pcommon.NewTimestampFromTime(t)) } } } + if flagsObj, ok := fields[common.AttributeFlags]; ok { + if flagsUint64, ok := flagsObj.(uint64); ok { + dataPoint.SetFlags(pmetric.DataPointFlags(flagsUint64)) + } + } dataPoint.SetCount(count) dataPoint.SetSum(sum) diff --git a/influx2otel/metrics_telegraf_prometheus_v1_test.go b/influx2otel/metrics_telegraf_prometheus_v1_test.go index f07d5f20..52054abd 100644 --- a/influx2otel/metrics_telegraf_prometheus_v1_test.go +++ b/influx2otel/metrics_telegraf_prometheus_v1_test.go @@ -27,6 +27,7 @@ func TestAddPoint_v1_gauge(t *testing.T) { }, map[string]interface{}{ "gauge": float64(23.9), + "flags": uint64(1), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeGauge) @@ -49,20 +50,22 @@ func TestAddPoint_v1_gauge(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutStr("engine_id", "0") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(23.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutStr("engine_id", "1") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(11.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -81,6 +84,7 @@ func TestAddPoint_v1_untypedGauge(t *testing.T) { }, map[string]interface{}{ "gauge": float64(23.9), + "flags": uint64(1), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeUntyped) @@ -103,20 +107,22 @@ func TestAddPoint_v1_untypedGauge(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutStr("engine_id", "0") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(23.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutStr("engine_id", "1") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(11.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -136,6 +142,7 @@ func TestAddPoint_v1_sum(t *testing.T) { }, map[string]interface{}{ "counter": float64(1027), + "flags": uint64(1), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeSum) @@ -159,10 +166,10 @@ func TestAddPoint_v1_sum(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_requests_total") m.SetEmptySum() m.Sum().SetIsMonotonic(true) @@ -172,11 +179,13 @@ func TestAddPoint_v1_sum(t *testing.T) { dp.Attributes().PutStr("method", "post") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(1027) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutStr("code", "400") dp.Attributes().PutStr("method", "post") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(3) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -196,6 +205,7 @@ func TestAddPoint_v1_untypedSum(t *testing.T) { }, map[string]interface{}{ "counter": float64(1027), + "flags": uint64(0), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeUntyped) @@ -219,10 +229,10 @@ func TestAddPoint_v1_untypedSum(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_requests_total") m.SetEmptySum() m.Sum().SetIsMonotonic(true) @@ -232,11 +242,13 @@ func TestAddPoint_v1_untypedSum(t *testing.T) { dp.Attributes().PutStr("method", "post") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(1027) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) dp = m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutStr("code", "400") dp.Attributes().PutStr("method", "post") dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetDoubleValue(3) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -263,6 +275,7 @@ func TestAddPoint_v1_histogram(t *testing.T) { "0.5": float64(129389), "1": float64(133988), "+Inf": float64(144320), + "flags": uint64(1), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeHistogram) @@ -271,10 +284,10 @@ func TestAddPoint_v1_histogram(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -286,6 +299,7 @@ func TestAddPoint_v1_histogram(t *testing.T) { dp.SetSum(53423) dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -311,6 +325,7 @@ func TestAddPoint_v1_histogram_missingInfinityBucket(t *testing.T) { "0.2": float64(100392), "0.5": float64(129389), "1": float64(133988), + "flags": uint64(0), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeHistogram) @@ -319,10 +334,10 @@ func TestAddPoint_v1_histogram_missingInfinityBucket(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -334,6 +349,7 @@ func TestAddPoint_v1_histogram_missingInfinityBucket(t *testing.T) { dp.SetSum(53423) dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -359,6 +375,7 @@ func TestAddPoint_v1_untypedHistogram(t *testing.T) { "0.2": float64(100392), "0.5": float64(129389), "1": float64(133988), + "flags": uint64(1), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeUntyped) @@ -367,10 +384,10 @@ func TestAddPoint_v1_untypedHistogram(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -382,6 +399,7 @@ func TestAddPoint_v1_untypedHistogram(t *testing.T) { dp.SetSum(53423) dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) assertMetricsEqual(t, expect, b.GetMetrics()) } @@ -407,6 +425,7 @@ func TestAddPoint_v1_summary(t *testing.T) { "0.5": float64(4773), "0.9": float64(9001), "0.99": float64(76656), + "flags": uint64(1), }, time.Unix(0, 1395066363000000123), common.InfluxMetricValueTypeSummary) @@ -415,10 +434,10 @@ func TestAddPoint_v1_summary(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("rpc_duration_seconds") m.SetEmptySummary() dp := m.Summary().DataPoints().AppendEmpty() @@ -427,6 +446,7 @@ func TestAddPoint_v1_summary(t *testing.T) { dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Unix(0, 1395066363000000123))) dp.SetCount(2693) dp.SetSum(17560473) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) qv := dp.QuantileValues().AppendEmpty() qv.SetQuantile(0.01) qv.SetValue(3102) @@ -467,6 +487,7 @@ func TestAddPoint_v1_untypedSummary(t *testing.T) { "0.5": float64(4773), "0.9": float64(9001), "0.99": float64(76656), + "flags": uint64(0), }, time.Unix(0, 1395066363000000123).UTC(), common.InfluxMetricValueTypeUntyped) @@ -475,10 +496,10 @@ func TestAddPoint_v1_untypedSummary(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("rpc_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -490,6 +511,7 @@ func TestAddPoint_v1_untypedSummary(t *testing.T) { dp.SetSum(17560473) dp.BucketCounts().FromRaw([]uint64{3102, 170, 1501, 4228, 67655, 2693}) dp.ExplicitBounds().FromRaw([]float64{0.01, 0.05, 0.5, 0.9, 0.99}) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) assertMetricsEqual(t, expect, b.GetMetrics()) } diff --git a/influx2otel/metrics_telegraf_prometheus_v2_test.go b/influx2otel/metrics_telegraf_prometheus_v2_test.go index a6383bb0..6768d269 100644 --- a/influx2otel/metrics_telegraf_prometheus_v2_test.go +++ b/influx2otel/metrics_telegraf_prometheus_v2_test.go @@ -49,10 +49,10 @@ func TestAddPoint_v2_gauge(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -103,10 +103,10 @@ func TestAddPoint_v2_untypedGauge(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -159,10 +159,10 @@ func TestAddPoint_v2_sum(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_requests_total") m.SetEmptySum() m.Sum().SetIsMonotonic(true) @@ -219,10 +219,10 @@ func TestAddPoint_v2_untypedSum(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_requests_total") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -360,10 +360,10 @@ func TestAddPoint_v2_histogram(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -484,10 +484,10 @@ func TestAddPoint_v2_histogram_missingInfinityBucket(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -608,10 +608,10 @@ func TestAddPoint_v2_untypedHistogram(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -732,10 +732,10 @@ func TestAddPoint_v2_summary(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("rpc_duration_seconds") m.SetEmptySummary() dp := m.Summary().DataPoints().AppendEmpty() @@ -868,10 +868,10 @@ func TestAddPoint_v2_untypedSummary(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("rpc_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) diff --git a/influx2otel/metrics_unknown_schema_test.go b/influx2otel/metrics_unknown_schema_test.go index 8c17f49a..9f5456d8 100644 --- a/influx2otel/metrics_unknown_schema_test.go +++ b/influx2otel/metrics_unknown_schema_test.go @@ -38,10 +38,10 @@ func TestUnknownSchema(t *testing.T) { expect := pmetric.NewMetrics() rm := expect.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cpu_usage_user") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() @@ -49,7 +49,7 @@ func TestUnknownSchema(t *testing.T) { dp.Attributes().PutStr("host", "777348dc6343") dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(0.10090817356207936) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("cpu_usage_system") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() @@ -57,7 +57,7 @@ func TestUnknownSchema(t *testing.T) { dp.Attributes().PutStr("host", "777348dc6343") dp.SetTimestamp(pcommon.Timestamp(1395066363000000123)) dp.SetDoubleValue(0.3027245206862381) - m = ilMetrics.Metrics().AppendEmpty() + m = isMetrics.Metrics().AppendEmpty() m.SetName("cpu_some_int_key") m.SetEmptyGauge() dp = m.Gauge().DataPoints().AppendEmpty() diff --git a/otel2influx/common.go b/otel2influx/common.go index 66839d22..fe9b8bdb 100644 --- a/otel2influx/common.go +++ b/otel2influx/common.go @@ -1,168 +1,32 @@ package otel2influx import ( - "encoding/json" - "fmt" - "strconv" - "go.opentelemetry.io/collector/pdata/pcommon" semconv "go.opentelemetry.io/collector/semconv/v1.16.0" - - "github.com/influxdata/influxdb-observability/common" ) -func ResourceToTags(logger common.Logger, resource pcommon.Resource, tags map[string]string) (tagsAgain map[string]string) { +func ResourceToTags(resource pcommon.Resource, tags map[string]string) map[string]string { resource.Attributes().Range(func(k string, v pcommon.Value) bool { - if k == "" { - logger.Debug("resource attribute key is empty") - } else if v, err := AttributeValueToInfluxTagValue(v); err != nil { - logger.Debug("invalid resource attribute value", "key", k, err) - } else { - tags[k] = v + if k != "" { + tags[k] = v.AsString() } return true }) return tags } -func InstrumentationScopeToTags(instrumentationLibrary pcommon.InstrumentationScope, tags map[string]string) (tagsAgain map[string]string) { - if instrumentationLibrary.Name() != "" { - tags[semconv.OtelLibraryName] = instrumentationLibrary.Name() +func InstrumentationScopeToTags(instrumentationScope pcommon.InstrumentationScope, tags map[string]string) map[string]string { + if instrumentationScope.Name() != "" { + tags[semconv.OtelLibraryName] = instrumentationScope.Name() } - if instrumentationLibrary.Version() != "" { - tags[semconv.OtelLibraryVersion] = instrumentationLibrary.Version() - } - return tags -} - -func AttributeValueToInfluxTagValue(value pcommon.Value) (string, error) { - switch value.Type() { - case pcommon.ValueTypeStr: - return value.Str(), nil - case pcommon.ValueTypeInt: - return strconv.FormatInt(value.Int(), 10), nil - case pcommon.ValueTypeDouble: - return strconv.FormatFloat(value.Double(), 'f', -1, 64), nil - case pcommon.ValueTypeBool: - return strconv.FormatBool(value.Bool()), nil - case pcommon.ValueTypeMap: - if jsonBytes, err := json.Marshal(otlpKeyValueListToMap(value.Map())); err != nil { - return "", err - } else { - return string(jsonBytes), nil - } - case pcommon.ValueTypeSlice: - if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.Slice())); err != nil { - return "", err - } else { - return string(jsonBytes), nil - } - case pcommon.ValueTypeEmpty: - return "", nil - default: - return "", fmt.Errorf("unknown value type %d", value.Type()) + if instrumentationScope.Version() != "" { + tags[semconv.OtelLibraryVersion] = instrumentationScope.Version() } -} - -func AttributeValueToInfluxFieldValue(value pcommon.Value) (interface{}, error) { - switch value.Type() { - case pcommon.ValueTypeStr: - return value.Str(), nil - case pcommon.ValueTypeInt: - return value.Int(), nil - case pcommon.ValueTypeDouble: - return value.Double(), nil - case pcommon.ValueTypeBool: - return value.Bool(), nil - case pcommon.ValueTypeMap: - if jsonBytes, err := json.Marshal(otlpKeyValueListToMap(value.Map())); err != nil { - return nil, err - } else { - return string(jsonBytes), nil - } - case pcommon.ValueTypeSlice: - if jsonBytes, err := json.Marshal(otlpArrayToSlice(value.Slice())); err != nil { - return nil, err - } else { - return string(jsonBytes), nil - } - case pcommon.ValueTypeEmpty: - return nil, nil - default: - return nil, fmt.Errorf("unknown value type %v", value) - } -} - -func otlpKeyValueListToMap(kvList pcommon.Map) map[string]interface{} { - m := make(map[string]interface{}, kvList.Len()) - kvList.Range(func(k string, v pcommon.Value) bool { - switch v.Type() { - case pcommon.ValueTypeStr: - m[k] = v.Str() - case pcommon.ValueTypeInt: - m[k] = v.Int() - case pcommon.ValueTypeDouble: - m[k] = v.Double() - case pcommon.ValueTypeBool: - m[k] = v.Bool() - case pcommon.ValueTypeMap: - m[k] = otlpKeyValueListToMap(v.Map()) - case pcommon.ValueTypeSlice: - m[k] = otlpArrayToSlice(v.Slice()) - case pcommon.ValueTypeEmpty: - m[k] = nil - default: - m[k] = fmt.Sprintf(" %v", v) + instrumentationScope.Attributes().Range(func(k string, v pcommon.Value) bool { + if k != "" { + tags[k] = v.AsString() } return true }) - return m -} - -func otlpArrayToSlice(arr pcommon.Slice) []interface{} { - s := make([]interface{}, 0, arr.Len()) - for i := 0; i < arr.Len(); i++ { - v := arr.At(i) - switch v.Type() { - case pcommon.ValueTypeStr: - s = append(s, v.Str()) - case pcommon.ValueTypeInt: - s = append(s, v.Int()) - case pcommon.ValueTypeDouble: - s = append(s, v.Double()) - case pcommon.ValueTypeBool: - s = append(s, v.Bool()) - case pcommon.ValueTypeEmpty: - s = append(s, nil) - default: - s = append(s, fmt.Sprintf(" %v", v)) - } - } - return s -} - -func convertResourceTags(resource pcommon.Resource) map[string]string { - tags := make(map[string]string, resource.Attributes().Len()) - resource.Attributes().Range(func(k string, v pcommon.Value) bool { - tags[k] = v.AsString() - return true - }) return tags } - -func convertScopeFields(is pcommon.InstrumentationScope) map[string]any { - fields := is.Attributes().AsRaw() - if name := is.Name(); name != "" { - fields[semconv.AttributeTelemetrySDKName] = name - } - if version := is.Version(); version != "" { - fields[semconv.AttributeTelemetrySDKVersion] = version - } - return fields -} - -type basicDataPoint interface { - Timestamp() pcommon.Timestamp - StartTimestamp() pcommon.Timestamp - Attributes() pcommon.Map -} diff --git a/otel2influx/logs.go b/otel2influx/logs.go index b8e54d58..f69ea71e 100644 --- a/otel2influx/logs.go +++ b/otel2influx/logs.go @@ -2,11 +2,10 @@ package otel2influx import ( "context" - "encoding/hex" "encoding/json" - "errors" "fmt" "strings" + "time" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/pdata/pcommon" @@ -97,19 +96,20 @@ func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource // This is a valid condition in OpenTelemetry, but not in InfluxDB. // From otel proto field Logrecord.time_unix_name: // "Value of 0 indicates unknown or missing timestamp." - return errors.New("log record has no time stamp") + ts = time.Now() } - measurement := common.MeasurementLogs tags := make(map[string]string, len(c.logRecordDimensions)+2) fields := make(map[string]interface{}) - // TODO handle logRecord.Flags() - if traceID := logRecord.TraceID(); !traceID.IsEmpty() { - tags[common.AttributeTraceID] = hex.EncodeToString(traceID[:]) - if spanID := logRecord.SpanID(); !spanID.IsEmpty() { - tags[common.AttributeSpanID] = hex.EncodeToString(spanID[:]) - } + fields[common.AttributeFlags] = uint64(logRecord.Flags()) + if ots := logRecord.ObservedTimestamp().AsTime(); !ots.IsZero() && !ots.Equal(time.Unix(0, 0)) { + fields[common.AttributeObservedTimeUnixNano] = ots.UnixNano() + } + + if traceID, spanID := logRecord.TraceID(), logRecord.SpanID(); !traceID.IsEmpty() && !spanID.IsEmpty() { + tags[common.AttributeTraceID] = traceID.String() + tags[common.AttributeSpanID] = spanID.String() } if severityNumber := logRecord.SeverityNumber(); severityNumber != plog.SeverityNumberUnspecified { @@ -118,23 +118,16 @@ func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource if severityText := logRecord.SeverityText(); severityText != "" { fields[common.AttributeSeverityText] = severityText } - if v, err := AttributeValueToInfluxFieldValue(logRecord.Body()); err != nil { - c.logger.Debug("invalid log record body", err) - fields[common.AttributeBody] = nil - } else { - fields[common.AttributeBody] = v - } + fields[common.AttributeBody] = logRecord.Body().AsString() droppedAttributesCount := uint64(logRecord.DroppedAttributesCount()) attributesField := make(map[string]any) - for _, attributes := range []pcommon.Map{resource.Attributes(), instrumentationScope.Attributes(), logRecord.Attributes()} { attributes.Range(func(k string, v pcommon.Value) bool { + if k == "" { + return true + } if _, found := c.logRecordDimensions[k]; found { - if _, found = tags[k]; found { - c.logger.Debug("dimension %s already exists as a tag", k) - attributesField[k] = v.AsRaw() - } tags[k] = v.AsString() } else { attributesField[k] = v.AsRaw() @@ -153,7 +146,7 @@ func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource } for k := range tags { if _, found := fields[k]; found { - c.logger.Debug("tag and field keys conflict; field will be dropped", "tag key", k) + c.logger.Debug("tag and field keys conflict; field will be dropped", "key", k) droppedAttributesCount++ delete(fields, k) } @@ -162,7 +155,7 @@ func (c *OtelLogsToLineProtocol) enqueueLogRecord(ctx context.Context, resource fields[common.AttributeDroppedAttributesCount] = droppedAttributesCount } - if err := batch.EnqueuePoint(ctx, measurement, tags, fields, ts, common.InfluxMetricValueTypeUntyped); err != nil { + if err := batch.EnqueuePoint(ctx, common.MeasurementLogs, tags, fields, ts, common.InfluxMetricValueTypeUntyped); err != nil { return fmt.Errorf("failed to write point for int gauge: %w", err) } diff --git a/otel2influx/metrics.go b/otel2influx/metrics.go index f42ef224..93e01de5 100644 --- a/otel2influx/metrics.go +++ b/otel2influx/metrics.go @@ -63,10 +63,10 @@ func (c *OtelMetricsToLineProtocol) WriteMetrics(ctx context.Context, md pmetric for i := 0; i < md.ResourceMetrics().Len(); i++ { resourceMetrics := md.ResourceMetrics().At(i) for j := 0; j < resourceMetrics.ScopeMetrics().Len(); j++ { - ilMetrics := resourceMetrics.ScopeMetrics().At(j) - for k := 0; k < ilMetrics.Metrics().Len(); k++ { - metric := ilMetrics.Metrics().At(k) - if err := c.mw.enqueueMetric(ctx, resourceMetrics.Resource(), ilMetrics.Scope(), metric, batch); err != nil { + isMetrics := resourceMetrics.ScopeMetrics().At(j) + for k := 0; k < isMetrics.Metrics().Len(); k++ { + metric := isMetrics.Metrics().At(k) + if err := c.mw.enqueueMetric(ctx, resourceMetrics.Resource(), isMetrics.Scope(), metric, batch); err != nil { return consumererror.NewPermanent(fmt.Errorf("failed to convert OTLP metric to line protocol: %w", err)) } } @@ -74,3 +74,10 @@ func (c *OtelMetricsToLineProtocol) WriteMetrics(ctx context.Context, md pmetric } return batch.WriteBatch(ctx) } + +type basicDataPoint interface { + Timestamp() pcommon.Timestamp + StartTimestamp() pcommon.Timestamp + Attributes() pcommon.Map + Flags() pmetric.DataPointFlags +} diff --git a/otel2influx/metrics_otel_v1.go b/otel2influx/metrics_otel_v1.go index c71664e4..3114a06a 100644 --- a/otel2influx/metrics_otel_v1.go +++ b/otel2influx/metrics_otel_v1.go @@ -38,16 +38,17 @@ func (m *metricWriterOtelV1) enqueueMetric(ctx context.Context, resource pcommon // TODO metric description measurementName := fmt.Sprintf("%s_%s_%s", pm.Name(), pm.Unit(), strings.ToLower(pm.Type().String())) - resourceTags := convertResourceTags(resource) - scopeFields := convertScopeFields(is) + tags := make(map[string]string) + tags = ResourceToTags(resource, tags) + tags = InstrumentationScopeToTags(is, tags) switch pm.Type() { // case pmetric.MetricTypeGauge: // return m.writeGauge(ctx, resource, is, pm.Name(), pm.Gauge(), batch) case pmetric.MetricTypeSum: - m.enqueueSum(ctx, measurementName, resourceTags, scopeFields, pm, batch) + m.enqueueSum(ctx, measurementName, tags, pm, batch) case pmetric.MetricTypeHistogram: - m.enqueueHistogram(ctx, measurementName, resourceTags, scopeFields, pm, batch) + m.enqueueHistogram(ctx, measurementName, tags, pm, batch) default: err = fmt.Errorf("unrecognized metric type %q", pm.Type()) } @@ -66,7 +67,7 @@ func formatFieldKeyMetricSumOtelV1(temporality string, monotonic bool, dataPoint return fmt.Sprintf("value_%s_%s_%s", strings.ToLower(temporality), monotonicity, strings.ToLower(dataPointValueType)) } -func (m *metricWriterOtelV1) enqueueSum(ctx context.Context, measurementName string, resourceTags map[string]string, scopeFields map[string]interface{}, pm pmetric.Metric, batch InfluxWriterBatch) { +func (m *metricWriterOtelV1) enqueueSum(ctx context.Context, measurementName string, resourceTags map[string]string, pm pmetric.Metric, batch InfluxWriterBatch) { temporality := pm.Sum().AggregationTemporality().String() monotonic := pm.Sum().IsMonotonic() @@ -87,13 +88,10 @@ func (m *metricWriterOtelV1) enqueueSum(ctx context.Context, measurementName str // TODO datapoint flags dataPoint := pm.Sum().DataPoints().At(i) - fields := make(map[string]interface{}, len(scopeFields)+3) + fields := make(map[string]interface{}, 3) if dataPoint.StartTimestamp() != 0 { fields[common.AttributeStartTimeUnixNano] = int64(dataPoint.StartTimestamp()) } - for k, v := range scopeFields { - fields[k] = v - } valueFieldKey, value := buildValue(dataPoint) fields[valueFieldKey] = value @@ -113,7 +111,7 @@ func (m *metricWriterOtelV1) enqueueSum(ctx context.Context, measurementName str } } -func (m *metricWriterOtelV1) enqueueHistogram(ctx context.Context, measurementName string, resourceTags map[string]string, scopeFields map[string]interface{}, pm pmetric.Metric, batch InfluxWriterBatch) { +func (m *metricWriterOtelV1) enqueueHistogram(ctx context.Context, measurementName string, resourceTags map[string]string, pm pmetric.Metric, batch InfluxWriterBatch) { temporality := strings.ToLower(pm.Histogram().AggregationTemporality().String()) for i := 0; i < pm.Histogram().DataPoints().Len(); i++ { @@ -130,13 +128,10 @@ func (m *metricWriterOtelV1) enqueueHistogram(ctx context.Context, measurementNa panic(fmt.Sprintf("invalid metric histogram bucket counts qty %d vs explicit bounds qty %d", bucketCounts.Len(), explicitBounds.Len())) } - fields := make(map[string]interface{}, len(scopeFields)+explicitBounds.Len()+6) + fields := make(map[string]interface{}, explicitBounds.Len()+6) if dataPoint.StartTimestamp() != 0 { fields[common.AttributeStartTimeUnixNano] = int64(dataPoint.StartTimestamp()) } - for k, v := range scopeFields { - fields[k] = v - } for i := 0; i < explicitBounds.Len(); i++ { boundStr := strconv.FormatFloat(explicitBounds.At(i), 'f', -1, 64) k := fmt.Sprintf("%s_%s", temporality, boundStr) diff --git a/otel2influx/metrics_telegraf_prometheus_v1.go b/otel2influx/metrics_telegraf_prometheus_v1.go index f05f6235..e9ba29f4 100644 --- a/otel2influx/metrics_telegraf_prometheus_v1.go +++ b/otel2influx/metrics_telegraf_prometheus_v1.go @@ -9,6 +9,7 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + "golang.org/x/exp/maps" "github.com/influxdata/influxdb-observability/common" ) @@ -17,61 +18,57 @@ type metricWriterTelegrafPrometheusV1 struct { logger common.Logger } -func (c *metricWriterTelegrafPrometheusV1) enqueueMetric(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, metric pmetric.Metric, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV1) enqueueMetric(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, metric pmetric.Metric, batch InfluxWriterBatch) error { // Ignore metric.Description() and metric.Unit() . switch metric.Type() { case pmetric.MetricTypeGauge: - return c.enqueueGauge(ctx, resource, instrumentationLibrary, metric.Name(), metric.Gauge(), batch) + return c.enqueueGauge(ctx, resource, instrumentationScope, metric.Name(), metric.Gauge(), batch) case pmetric.MetricTypeSum: - if metric.Sum().IsMonotonic() { - return c.enqueueSum(ctx, resource, instrumentationLibrary, metric.Name(), metric.Sum(), batch) + if metric.Sum().IsMonotonic() && metric.Sum().AggregationTemporality() == pmetric.AggregationTemporalityCumulative { + return c.enqueueCounterFromSum(ctx, resource, instrumentationScope, metric.Name(), metric.Sum(), batch) } - return c.enqueueGaugeFromSum(ctx, resource, instrumentationLibrary, metric.Name(), metric.Sum(), batch) + return c.enqueueGaugeFromSum(ctx, resource, instrumentationScope, metric.Name(), metric.Sum(), batch) case pmetric.MetricTypeHistogram: - return c.enqueueHistogram(ctx, resource, instrumentationLibrary, metric.Name(), metric.Histogram(), batch) + return c.enqueueHistogram(ctx, resource, instrumentationScope, metric.Name(), metric.Histogram(), batch) case pmetric.MetricTypeSummary: - return c.enqueueSummary(ctx, resource, instrumentationLibrary, metric.Name(), metric.Summary(), batch) + return c.enqueueSummary(ctx, resource, instrumentationScope, metric.Name(), metric.Summary(), batch) + case pmetric.MetricTypeEmpty: + return nil default: return fmt.Errorf("unknown metric type %q", metric.Type()) } } -func (c *metricWriterTelegrafPrometheusV1) initMetricTagsAndTimestamp(resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, dataPoint basicDataPoint) (tags map[string]string, fields map[string]interface{}, ts time.Time, err error) { - ts = dataPoint.Timestamp().AsTime() +func (c *metricWriterTelegrafPrometheusV1) initMetricTagsAndTimestamp(dataPoint basicDataPoint, tags map[string]string) (map[string]string, map[string]interface{}, time.Time, error) { + ts := dataPoint.Timestamp().AsTime() if ts.IsZero() { - err = errors.New("metric has no timestamp") - return + return nil, nil, time.Time{}, errors.New("metric has no timestamp") } - tags = make(map[string]string) - fields = make(map[string]interface{}) + fields := make(map[string]interface{}) if dataPoint.StartTimestamp() != 0 { fields[common.AttributeStartTimeUnixNano] = int64(dataPoint.StartTimestamp()) } + fields[common.AttributeFlags] = uint64(dataPoint.Flags()) + tags = maps.Clone(tags) dataPoint.Attributes().Range(func(k string, v pcommon.Value) bool { - if k == "" { - c.logger.Debug("metric attribute key is empty") - } else { + if k != "" { tags[k] = v.AsString() } return true }) - if err != nil { - err = fmt.Errorf("failed to convert attribute value to string: %w", err) - return - } - - tags = ResourceToTags(c.logger, resource, tags) - tags = InstrumentationScopeToTags(instrumentationLibrary, tags) - return + return tags, fields, ts, nil } -func (c *metricWriterTelegrafPrometheusV1) enqueueGauge(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, gauge pmetric.Gauge, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV1) enqueueGauge(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, gauge pmetric.Gauge, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < gauge.DataPoints().Len(); i++ { dataPoint := gauge.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -90,15 +87,23 @@ func (c *metricWriterTelegrafPrometheusV1) enqueueGauge(ctx context.Context, res if err = batch.EnqueuePoint(ctx, measurement, tags, fields, ts, common.InfluxMetricValueTypeGauge); err != nil { return fmt.Errorf("failed to write point for gauge: %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV1) enqueueGaugeFromSum(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV1) enqueueGaugeFromSum(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < sum.DataPoints().Len(); i++ { dataPoint := sum.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -117,15 +122,23 @@ func (c *metricWriterTelegrafPrometheusV1) enqueueGaugeFromSum(ctx context.Conte if err = batch.EnqueuePoint(ctx, measurement, tags, fields, ts, common.InfluxMetricValueTypeGauge); err != nil { return fmt.Errorf("failed to write point for sum (as gauge): %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV1) enqueueSum(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV1) enqueueCounterFromSum(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < sum.DataPoints().Len(); i++ { dataPoint := sum.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -144,27 +157,38 @@ func (c *metricWriterTelegrafPrometheusV1) enqueueSum(ctx context.Context, resou if err = batch.EnqueuePoint(ctx, measurement, tags, fields, ts, common.InfluxMetricValueTypeSum); err != nil { return fmt.Errorf("failed to write point for sum: %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV1) enqueueHistogram(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, histogram pmetric.Histogram, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV1) enqueueHistogram(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, histogram pmetric.Histogram, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < histogram.DataPoints().Len(); i++ { dataPoint := histogram.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } fields[common.MetricHistogramCountFieldKey] = float64(dataPoint.Count()) - fields[common.MetricHistogramSumFieldKey] = dataPoint.Sum() + if dataPoint.HasSum() { + fields[common.MetricHistogramSumFieldKey] = dataPoint.Sum() + } if dataPoint.HasMin() { fields[common.MetricHistogramMinFieldKey] = dataPoint.Min() } if dataPoint.HasMax() { fields[common.MetricHistogramMaxFieldKey] = dataPoint.Max() } + bucketCounts, explicitBounds := dataPoint.BucketCounts(), dataPoint.ExplicitBounds() if bucketCounts.Len() > 0 && bucketCounts.Len() != explicitBounds.Len() && @@ -191,15 +215,23 @@ func (c *metricWriterTelegrafPrometheusV1) enqueueHistogram(ctx context.Context, if err = batch.EnqueuePoint(ctx, measurement, tags, fields, ts, common.InfluxMetricValueTypeHistogram); err != nil { return fmt.Errorf("failed to write point for histogram: %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV1) enqueueSummary(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, summary pmetric.Summary, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV1) enqueueSummary(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, summary pmetric.Summary, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < summary.DataPoints().Len(); i++ { dataPoint := summary.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -219,3 +251,36 @@ func (c *metricWriterTelegrafPrometheusV1) enqueueSummary(ctx context.Context, r return nil } + +func (c *metricWriterTelegrafPrometheusV1) enqueueExemplars(ctx context.Context, batch InfluxWriterBatch, measurement string, exemplars pmetric.ExemplarSlice) error { + for j := 0; j < exemplars.Len(); j++ { + exemplar := exemplars.At(j) + var fields map[string]interface{} + switch exemplar.ValueType() { + case pmetric.ExemplarValueTypeEmpty: + continue + case pmetric.ExemplarValueTypeDouble: + fields = map[string]interface{}{common.MetricGaugeFieldKey: exemplar.DoubleValue()} + case pmetric.ExemplarValueTypeInt: + fields = map[string]interface{}{common.MetricGaugeFieldKey: exemplar.IntValue()} + default: + return fmt.Errorf("unsupported exemplar value type %d", exemplar.ValueType()) + } + if exemplar.TraceID().IsEmpty() || exemplar.SpanID().IsEmpty() { + continue + } + + tags := make(map[string]string, exemplar.FilteredAttributes().Len()+2) + exemplar.FilteredAttributes().Range(func(k string, v pcommon.Value) bool { + tags[k] = v.AsString() + return true + }) + tags[common.AttributeTraceID] = exemplar.TraceID().String() + tags[common.AttributeSpanID] = exemplar.SpanID().String() + + if err := batch.EnqueuePoint(ctx, measurement+common.MetricExemplarSuffix, tags, fields, exemplar.Timestamp().AsTime(), common.InfluxMetricValueTypeUntyped); err != nil { + return fmt.Errorf("failed to write point for exemplar: %w", err) + } + } + return nil +} diff --git a/otel2influx/metrics_telegraf_prometheus_v1_test.go b/otel2influx/metrics_telegraf_prometheus_v1_test.go index a82d649d..954fb0fc 100644 --- a/otel2influx/metrics_telegraf_prometheus_v1_test.go +++ b/otel2influx/metrics_telegraf_prometheus_v1_test.go @@ -25,10 +25,10 @@ func TestWriteMetric_v1_gauge(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetDescription("Age in seconds of the current cache") m.SetEmptyGauge() @@ -37,6 +37,7 @@ func TestWriteMetric_v1_gauge(t *testing.T) { dp.SetStartTimestamp(startTimestamp) dp.SetTimestamp(timestamp) dp.SetDoubleValue(23.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutInt("engine_id", 1) dp.SetStartTimestamp(startTimestamp) @@ -58,6 +59,7 @@ func TestWriteMetric_v1_gauge(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "gauge": float64(23.9), + "flags": uint64(1), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -73,6 +75,7 @@ func TestWriteMetric_v1_gauge(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "gauge": float64(11.9), + "flags": uint64(0), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -85,7 +88,22 @@ func TestWriteMetric_v1_gauge(t *testing.T) { var temporalities = [2]pmetric.AggregationTemporality{pmetric.AggregationTemporalityCumulative, pmetric.AggregationTemporalityDelta} func TestWriteMetric_v1_gaugeFromSum(t *testing.T) { - for _, temporality := range temporalities { + for _, tm := range []struct { + temporality pmetric.AggregationTemporality + monotonic bool + }{{ + temporality: pmetric.AggregationTemporalityCumulative, + monotonic: false, + }, { + temporality: pmetric.AggregationTemporalityDelta, + monotonic: true, + }, { + temporality: pmetric.AggregationTemporalityDelta, + monotonic: false, + }} { + temporality := tm.temporality + monotonic := tm.monotonic + w := new(MockInfluxWriter) cfg := otel2influx.DefaultOtelMetricsToLineProtocolConfig() cfg.Writer = w @@ -96,20 +114,21 @@ func TestWriteMetric_v1_gaugeFromSum(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetDescription("Age in seconds of the current cache") m.SetEmptySum() - m.Sum().SetIsMonotonic(false) + m.Sum().SetIsMonotonic(monotonic) m.Sum().SetAggregationTemporality(temporality) dp := m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutInt("engine_id", 0) dp.SetStartTimestamp(startTimestamp) dp.SetTimestamp(timestamp) dp.SetDoubleValue(23.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutInt("engine_id", 1) dp.SetStartTimestamp(startTimestamp) @@ -131,6 +150,7 @@ func TestWriteMetric_v1_gaugeFromSum(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "gauge": float64(23.9), + "flags": uint64(1), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -146,6 +166,7 @@ func TestWriteMetric_v1_gaugeFromSum(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "gauge": float64(11.9), + "flags": uint64(0), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -157,79 +178,80 @@ func TestWriteMetric_v1_gaugeFromSum(t *testing.T) { } func TestWriteMetric_v1_sum(t *testing.T) { - for _, temporality := range temporalities { - w := new(MockInfluxWriter) - cfg := otel2influx.DefaultOtelMetricsToLineProtocolConfig() - cfg.Writer = w - cfg.Schema = common.MetricsSchemaTelegrafPrometheusV1 - c, err := otel2influx.NewOtelMetricsToLineProtocol(cfg) - require.NoError(t, err) + w := new(MockInfluxWriter) + cfg := otel2influx.DefaultOtelMetricsToLineProtocolConfig() + cfg.Writer = w + cfg.Schema = common.MetricsSchemaTelegrafPrometheusV1 + c, err := otel2influx.NewOtelMetricsToLineProtocol(cfg) + require.NoError(t, err) - metrics := pmetric.NewMetrics() - rm := metrics.ResourceMetrics().AppendEmpty() - rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() - m.SetName("http_requests_total") - m.SetDescription("The total number of HTTP requests") - m.SetEmptySum() - m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(temporality) - dp := m.Sum().DataPoints().AppendEmpty() - dp.Attributes().PutInt("code", 200) - dp.Attributes().PutStr("method", "post") - dp.SetStartTimestamp(startTimestamp) - dp.SetTimestamp(timestamp) - dp.SetDoubleValue(1027) - dp = m.Sum().DataPoints().AppendEmpty() - dp.Attributes().PutInt("code", 400) - dp.Attributes().PutStr("method", "post") - dp.SetStartTimestamp(startTimestamp) - dp.SetTimestamp(timestamp) - dp.SetDoubleValue(3) + metrics := pmetric.NewMetrics() + rm := metrics.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("container.name", "42") + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() + m.SetName("http_requests_total") + m.SetDescription("The total number of HTTP requests") + m.SetEmptySum() + m.Sum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + dp := m.Sum().DataPoints().AppendEmpty() + dp.Attributes().PutInt("code", 200) + dp.Attributes().PutStr("method", "post") + dp.SetStartTimestamp(startTimestamp) + dp.SetTimestamp(timestamp) + dp.SetDoubleValue(1027) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) + dp = m.Sum().DataPoints().AppendEmpty() + dp.Attributes().PutInt("code", 400) + dp.Attributes().PutStr("method", "post") + dp.SetStartTimestamp(startTimestamp) + dp.SetTimestamp(timestamp) + dp.SetDoubleValue(3) - err = c.WriteMetrics(context.Background(), metrics) - require.NoError(t, err) + err = c.WriteMetrics(context.Background(), metrics) + require.NoError(t, err) - expected := []mockPoint{ - { - measurement: "http_requests_total", - tags: map[string]string{ - "container.name": "42", - "otel.library.name": "My Library", - "otel.library.version": "latest", - "method": "post", - "code": "200", - }, - fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "counter": float64(1027), - }, - ts: time.Unix(0, 1395066363000000123).UTC(), - vType: common.InfluxMetricValueTypeSum, + expected := []mockPoint{ + { + measurement: "http_requests_total", + tags: map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", }, - { - measurement: "http_requests_total", - tags: map[string]string{ - "container.name": "42", - "otel.library.name": "My Library", - "otel.library.version": "latest", - "method": "post", - "code": "400", - }, - fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "counter": float64(3), - }, - ts: time.Unix(0, 1395066363000000123).UTC(), - vType: common.InfluxMetricValueTypeSum, + fields: map[string]interface{}{ + common.AttributeStartTimeUnixNano: int64(startTimestamp), + "counter": float64(1027), + "flags": uint64(1), }, - } - - assert.Equal(t, expected, w.points) + ts: time.Unix(0, 1395066363000000123).UTC(), + vType: common.InfluxMetricValueTypeSum, + }, + { + measurement: "http_requests_total", + tags: map[string]string{ + "container.name": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "400", + }, + fields: map[string]interface{}{ + common.AttributeStartTimeUnixNano: int64(startTimestamp), + "counter": float64(3), + "flags": uint64(0), + }, + ts: time.Unix(0, 1395066363000000123).UTC(), + vType: common.InfluxMetricValueTypeSum, + }, } + + assert.Equal(t, expected, w.points) } func TestWriteMetric_v1_histogram(t *testing.T) { @@ -244,10 +266,10 @@ func TestWriteMetric_v1_histogram(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.SetDescription("A histogram of the request duration") @@ -263,6 +285,7 @@ func TestWriteMetric_v1_histogram(t *testing.T) { dp.SetMax(100) dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) err = c.WriteMetrics(context.Background(), metrics) require.NoError(t, err) @@ -289,6 +312,7 @@ func TestWriteMetric_v1_histogram(t *testing.T) { "+Inf": float64(144320), "min": float64(0), "max": float64(100), + "flags": uint64(1), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeHistogram, @@ -311,10 +335,10 @@ func TestWriteMetric_v1_histogram_missingInfinityBucket(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.SetDescription("A histogram of the request duration") @@ -351,6 +375,7 @@ func TestWriteMetric_v1_histogram_missingInfinityBucket(t *testing.T) { "0.2": float64(100392), "0.5": float64(129389), "1": float64(133988), + "flags": uint64(0), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeHistogram, @@ -372,10 +397,10 @@ func TestWriteMetric_v1_summary(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("container.name", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("rpc_duration_seconds") m.SetEmptySummary() m.SetDescription("A summary of the RPC duration in seconds") @@ -386,6 +411,7 @@ func TestWriteMetric_v1_summary(t *testing.T) { dp.SetTimestamp(timestamp) dp.SetCount(2693) dp.SetSum(17560473) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) qv := dp.QuantileValues().AppendEmpty() qv.SetQuantile(0.01) qv.SetValue(3102) @@ -424,6 +450,7 @@ func TestWriteMetric_v1_summary(t *testing.T) { "0.5": float64(4773), "0.9": float64(9001), "0.99": float64(76656), + "flags": uint64(1), }, ts: time.Unix(0, 1395066363000000123).UTC(), vType: common.InfluxMetricValueTypeSummary, diff --git a/otel2influx/metrics_telegraf_prometheus_v2.go b/otel2influx/metrics_telegraf_prometheus_v2.go index 8571c4b8..2ff47dc1 100644 --- a/otel2influx/metrics_telegraf_prometheus_v2.go +++ b/otel2influx/metrics_telegraf_prometheus_v2.go @@ -18,61 +18,57 @@ type metricWriterTelegrafPrometheusV2 struct { logger common.Logger } -func (c *metricWriterTelegrafPrometheusV2) enqueueMetric(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, metric pmetric.Metric, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV2) enqueueMetric(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, metric pmetric.Metric, batch InfluxWriterBatch) error { // Ignore metric.Description() and metric.Unit() . switch metric.Type() { case pmetric.MetricTypeGauge: - return c.enqueueGauge(ctx, resource, instrumentationLibrary, metric.Name(), metric.Gauge(), batch) + return c.enqueueGauge(ctx, resource, instrumentationScope, metric.Name(), metric.Gauge(), batch) case pmetric.MetricTypeSum: - if metric.Sum().IsMonotonic() { - return c.enqueueSum(ctx, resource, instrumentationLibrary, metric.Name(), metric.Sum(), batch) + if metric.Sum().IsMonotonic() && metric.Sum().AggregationTemporality() == pmetric.AggregationTemporalityCumulative { + return c.enqueueCounterFromSum(ctx, resource, instrumentationScope, metric.Name(), metric.Sum(), batch) } - return c.enqueueGaugeFromSum(ctx, resource, instrumentationLibrary, metric.Name(), metric.Sum(), batch) + return c.enqueueGaugeFromSum(ctx, resource, instrumentationScope, metric.Name(), metric.Sum(), batch) case pmetric.MetricTypeHistogram: - return c.enqueueHistogram(ctx, resource, instrumentationLibrary, metric.Name(), metric.Histogram(), batch) + return c.enqueueHistogram(ctx, resource, instrumentationScope, metric.Name(), metric.Histogram(), batch) case pmetric.MetricTypeSummary: - return c.enqueueSummary(ctx, resource, instrumentationLibrary, metric.Name(), metric.Summary(), batch) + return c.enqueueSummary(ctx, resource, instrumentationScope, metric.Name(), metric.Summary(), batch) + case pmetric.MetricTypeEmpty: + return nil default: return fmt.Errorf("unknown metric type %q", metric.Type()) } } -func (c *metricWriterTelegrafPrometheusV2) initMetricTagsAndTimestamp(resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, dataPoint basicDataPoint) (tags map[string]string, fields map[string]interface{}, ts time.Time, err error) { - ts = dataPoint.Timestamp().AsTime() +func (c *metricWriterTelegrafPrometheusV2) initMetricTagsAndTimestamp(dataPoint basicDataPoint, tags map[string]string) (map[string]string, map[string]interface{}, time.Time, error) { + ts := dataPoint.Timestamp().AsTime() if ts.IsZero() { - err = errors.New("metric has no timestamp") - return + return nil, nil, time.Time{}, errors.New("metric has no timestamp") } - tags = make(map[string]string) - fields = make(map[string]interface{}) + fields := make(map[string]interface{}) if dataPoint.StartTimestamp() != 0 { fields[common.AttributeStartTimeUnixNano] = int64(dataPoint.StartTimestamp()) } + fields[common.AttributeFlags] = uint64(dataPoint.Flags()) + tags = maps.Clone(tags) dataPoint.Attributes().Range(func(k string, v pcommon.Value) bool { - if k == "" { - c.logger.Debug("metric attribute key is empty") - } else { + if k != "" { tags[k] = v.AsString() } return true }) - if err != nil { - err = fmt.Errorf("failed to convert attribute value to string: %w", err) - return - } - - tags = ResourceToTags(c.logger, resource, tags) - tags = InstrumentationScopeToTags(instrumentationLibrary, tags) - return + return tags, fields, ts, nil } -func (c *metricWriterTelegrafPrometheusV2) enqueueGauge(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, gauge pmetric.Gauge, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV2) enqueueGauge(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, gauge pmetric.Gauge, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < gauge.DataPoints().Len(); i++ { dataPoint := gauge.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -91,16 +87,23 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueGauge(ctx context.Context, res if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeGauge); err != nil { return fmt.Errorf("failed to write point for gauge: %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV2) enqueueGaugeFromSum(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV2) enqueueGaugeFromSum(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) for i := 0; i < sum.DataPoints().Len(); i++ { dataPoint := sum.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -119,15 +122,23 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueGaugeFromSum(ctx context.Conte if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeGauge); err != nil { return fmt.Errorf("failed to write point for sum (as gauge): %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV2) enqueueSum(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV2) enqueueCounterFromSum(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, sum pmetric.Sum, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < sum.DataPoints().Len(); i++ { dataPoint := sum.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } @@ -146,37 +157,39 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueSum(ctx context.Context, resou if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeSum); err != nil { return fmt.Errorf("failed to write point for sum: %w", err) } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV2) enqueueHistogram(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, histogram pmetric.Histogram, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV2) enqueueHistogram(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, histogram pmetric.Histogram, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < histogram.DataPoints().Len(); i++ { dataPoint := histogram.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } - { - f := make(map[string]interface{}, len(fields)+2) - for k, v := range fields { - f[k] = v - } - - f[measurement+common.MetricHistogramCountSuffix] = float64(dataPoint.Count()) - f[measurement+common.MetricHistogramSumSuffix] = dataPoint.Sum() - if dataPoint.HasMin() { - f[measurement+common.MetricHistogramMinSuffix] = dataPoint.Min() - } - if dataPoint.HasMax() { - f[measurement+common.MetricHistogramMaxSuffix] = dataPoint.Max() - } - - if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, f, ts, common.InfluxMetricValueTypeHistogram); err != nil { - return fmt.Errorf("failed to write point for histogram: %w", err) - } + fields[measurement+common.MetricHistogramCountSuffix] = float64(dataPoint.Count()) + if dataPoint.HasSum() { + fields[measurement+common.MetricHistogramSumSuffix] = dataPoint.Sum() + } + if dataPoint.HasMin() { + fields[measurement+common.MetricHistogramMinSuffix] = dataPoint.Min() + } + if dataPoint.HasMax() { + fields[measurement+common.MetricHistogramMaxSuffix] = dataPoint.Max() + } + if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeHistogram); err != nil { + return fmt.Errorf("failed to write point for histogram: %w", err) } bucketCounts, explicitBounds := dataPoint.BucketCounts(), dataPoint.ExplicitBounds() @@ -187,19 +200,18 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueHistogram(ctx context.Context, // so accept input if that particular bucket is missing. return fmt.Errorf("invalid metric histogram bucket counts qty %d vs explicit bounds qty %d", bucketCounts.Len(), explicitBounds.Len()) } - - for i := 0; i < bucketCounts.Len(); i++ { + for j := 0; j < bucketCounts.Len(); j++ { tags := maps.Clone(tags) - fields := maps.Clone(fields) + fields := make(map[string]interface{}) var bucketCount uint64 - for j := 0; j <= i; j++ { - bucketCount += bucketCounts.At(j) + for k := 0; k <= j; k++ { + bucketCount += bucketCounts.At(k) } var boundTagValue string - if explicitBounds.Len() > i { - boundTagValue = strconv.FormatFloat(explicitBounds.At(i), 'f', -1, 64) + if explicitBounds.Len() > j { + boundTagValue = strconv.FormatFloat(explicitBounds.At(j), 'f', -1, 64) } else { boundTagValue = common.MetricHistogramInfFieldKey } @@ -210,49 +222,44 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueHistogram(ctx context.Context, return fmt.Errorf("failed to write point for histogram: %w", err) } } + + err = c.enqueueExemplars(ctx, batch, measurement, dataPoint.Exemplars()) + if err != nil { + return err + } } return nil } -func (c *metricWriterTelegrafPrometheusV2) enqueueSummary(ctx context.Context, resource pcommon.Resource, instrumentationLibrary pcommon.InstrumentationScope, measurement string, summary pmetric.Summary, batch InfluxWriterBatch) error { +func (c *metricWriterTelegrafPrometheusV2) enqueueSummary(ctx context.Context, resource pcommon.Resource, instrumentationScope pcommon.InstrumentationScope, measurement string, summary pmetric.Summary, batch InfluxWriterBatch) error { + tags := ResourceToTags(resource, make(map[string]string)) + tags = InstrumentationScopeToTags(instrumentationScope, tags) + for i := 0; i < summary.DataPoints().Len(); i++ { dataPoint := summary.DataPoints().At(i) - tags, fields, ts, err := c.initMetricTagsAndTimestamp(resource, instrumentationLibrary, dataPoint) + tags, fields, ts, err := c.initMetricTagsAndTimestamp(dataPoint, tags) if err != nil { return err } - { - f := make(map[string]interface{}, len(fields)+2) - for k, v := range fields { - f[k] = v - } - - f[measurement+common.MetricSummaryCountSuffix] = float64(dataPoint.Count()) - f[measurement+common.MetricSummarySumSuffix] = dataPoint.Sum() + fields[measurement+common.MetricSummaryCountSuffix] = float64(dataPoint.Count()) + fields[measurement+common.MetricSummarySumSuffix] = dataPoint.Sum() - if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, f, ts, common.InfluxMetricValueTypeSummary); err != nil { - return fmt.Errorf("failed to write point for summary: %w", err) - } + if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeSummary); err != nil { + return fmt.Errorf("failed to write point for summary: %w", err) } for j := 0; j < dataPoint.QuantileValues().Len(); j++ { - valueAtQuantile := dataPoint.QuantileValues().At(j) - t := make(map[string]string, len(tags)+1) - for k, v := range tags { - t[k] = v - } - f := make(map[string]interface{}, len(fields)+1) - for k, v := range fields { - f[k] = v - } + tags := maps.Clone(tags) + fields := make(map[string]interface{}) + valueAtQuantile := dataPoint.QuantileValues().At(j) quantileTagValue := strconv.FormatFloat(valueAtQuantile.Quantile(), 'f', -1, 64) - t[common.MetricSummaryQuantileKeyV2] = quantileTagValue - f[measurement] = float64(valueAtQuantile.Value()) + tags[common.MetricSummaryQuantileKeyV2] = quantileTagValue + fields[measurement] = float64(valueAtQuantile.Value()) - if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, t, f, ts, common.InfluxMetricValueTypeSummary); err != nil { + if err = batch.EnqueuePoint(ctx, common.MeasurementPrometheus, tags, fields, ts, common.InfluxMetricValueTypeSummary); err != nil { return fmt.Errorf("failed to write point for summary: %w", err) } } @@ -260,3 +267,36 @@ func (c *metricWriterTelegrafPrometheusV2) enqueueSummary(ctx context.Context, r return nil } + +func (c *metricWriterTelegrafPrometheusV2) enqueueExemplars(ctx context.Context, batch InfluxWriterBatch, measurement string, exemplars pmetric.ExemplarSlice) error { + for j := 0; j < exemplars.Len(); j++ { + exemplar := exemplars.At(j) + var fields map[string]interface{} + switch exemplar.ValueType() { + case pmetric.ExemplarValueTypeEmpty: + continue + case pmetric.ExemplarValueTypeDouble: + fields = map[string]interface{}{common.MetricGaugeFieldKey: exemplar.DoubleValue()} + case pmetric.ExemplarValueTypeInt: + fields = map[string]interface{}{common.MetricGaugeFieldKey: exemplar.IntValue()} + default: + return fmt.Errorf("unsupported exemplar value type %d", exemplar.ValueType()) + } + if exemplar.TraceID().IsEmpty() || exemplar.SpanID().IsEmpty() { + continue + } + + tags := make(map[string]string, exemplar.FilteredAttributes().Len()+2) + exemplar.FilteredAttributes().Range(func(k string, v pcommon.Value) bool { + tags[k] = v.AsString() + return true + }) + tags[common.AttributeTraceID] = exemplar.TraceID().String() + tags[common.AttributeSpanID] = exemplar.SpanID().String() + + if err := batch.EnqueuePoint(ctx, measurement+common.MetricExemplarSuffix, tags, fields, exemplar.Timestamp().AsTime(), common.InfluxMetricValueTypeUntyped); err != nil { + return fmt.Errorf("failed to write point for exemplar: %w", err) + } + } + return nil +} diff --git a/otel2influx/metrics_telegraf_prometheus_v2_test.go b/otel2influx/metrics_telegraf_prometheus_v2_test.go index 850f7bf6..05158ff5 100644 --- a/otel2influx/metrics_telegraf_prometheus_v2_test.go +++ b/otel2influx/metrics_telegraf_prometheus_v2_test.go @@ -24,10 +24,10 @@ func TestWriteMetric_v2_gauge(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("node", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetDescription("Age in seconds of the current cache") m.SetEmptyGauge() @@ -36,6 +36,7 @@ func TestWriteMetric_v2_gauge(t *testing.T) { dp.SetStartTimestamp(startTimestamp) dp.SetTimestamp(timestamp) dp.SetDoubleValue(23.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutInt("engine_id", 1) dp.SetStartTimestamp(startTimestamp) @@ -57,6 +58,7 @@ func TestWriteMetric_v2_gauge(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "cache_age_seconds": float64(23.9), + "flags": uint64(1), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -72,6 +74,7 @@ func TestWriteMetric_v2_gauge(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "cache_age_seconds": float64(11.9), + "flags": uint64(0), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -82,7 +85,22 @@ func TestWriteMetric_v2_gauge(t *testing.T) { } func TestWriteMetric_v2_gaugeFromSum(t *testing.T) { - for _, temporality := range temporalities { + for _, tm := range []struct { + temporality pmetric.AggregationTemporality + monotonic bool + }{{ + temporality: pmetric.AggregationTemporalityCumulative, + monotonic: false, + }, { + temporality: pmetric.AggregationTemporalityDelta, + monotonic: true, + }, { + temporality: pmetric.AggregationTemporalityDelta, + monotonic: false, + }} { + temporality := tm.temporality + monotonic := tm.monotonic + w := new(MockInfluxWriter) cfg := otel2influx.DefaultOtelMetricsToLineProtocolConfig() cfg.Writer = w @@ -93,20 +111,21 @@ func TestWriteMetric_v2_gaugeFromSum(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("node", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("cache_age_seconds") m.SetDescription("Age in seconds of the current cache") m.SetEmptySum() - m.Sum().SetIsMonotonic(false) + m.Sum().SetIsMonotonic(monotonic) m.Sum().SetAggregationTemporality(temporality) dp := m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutInt("engine_id", 0) dp.SetStartTimestamp(startTimestamp) dp.SetTimestamp(timestamp) dp.SetDoubleValue(23.9) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutInt("engine_id", 1) dp.SetStartTimestamp(startTimestamp) @@ -128,6 +147,7 @@ func TestWriteMetric_v2_gaugeFromSum(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "cache_age_seconds": float64(23.9), + "flags": uint64(1), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -143,6 +163,7 @@ func TestWriteMetric_v2_gaugeFromSum(t *testing.T) { fields: map[string]interface{}{ common.AttributeStartTimeUnixNano: int64(startTimestamp), "cache_age_seconds": float64(11.9), + "flags": uint64(0), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeGauge, @@ -154,79 +175,80 @@ func TestWriteMetric_v2_gaugeFromSum(t *testing.T) { } func TestWriteMetric_v2_sum(t *testing.T) { - for _, temporality := range temporalities { - w := new(MockInfluxWriter) - cfg := otel2influx.DefaultOtelMetricsToLineProtocolConfig() - cfg.Writer = w - cfg.Schema = common.MetricsSchemaTelegrafPrometheusV2 - c, err := otel2influx.NewOtelMetricsToLineProtocol(cfg) - require.NoError(t, err) + w := new(MockInfluxWriter) + cfg := otel2influx.DefaultOtelMetricsToLineProtocolConfig() + cfg.Writer = w + cfg.Schema = common.MetricsSchemaTelegrafPrometheusV2 + c, err := otel2influx.NewOtelMetricsToLineProtocol(cfg) + require.NoError(t, err) - metrics := pmetric.NewMetrics() - rm := metrics.ResourceMetrics().AppendEmpty() - rm.Resource().Attributes().PutStr("node", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() - m.SetName("http_requests_total") - m.SetDescription("The total number of HTTP requests") - m.SetEmptySum() - m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(temporality) - dp := m.Sum().DataPoints().AppendEmpty() - dp.Attributes().PutInt("code", 200) - dp.Attributes().PutStr("method", "post") - dp.SetStartTimestamp(startTimestamp) - dp.SetTimestamp(timestamp) - dp.SetDoubleValue(1027) - dp = m.Sum().DataPoints().AppendEmpty() - dp.Attributes().PutInt("code", 400) - dp.Attributes().PutStr("method", "post") - dp.SetStartTimestamp(startTimestamp) - dp.SetTimestamp(timestamp) - dp.SetDoubleValue(3) + metrics := pmetric.NewMetrics() + rm := metrics.ResourceMetrics().AppendEmpty() + rm.Resource().Attributes().PutStr("node", "42") + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() + m.SetName("http_requests_total") + m.SetDescription("The total number of HTTP requests") + m.SetEmptySum() + m.Sum().SetIsMonotonic(true) + m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) + dp := m.Sum().DataPoints().AppendEmpty() + dp.Attributes().PutInt("code", 200) + dp.Attributes().PutStr("method", "post") + dp.SetStartTimestamp(startTimestamp) + dp.SetTimestamp(timestamp) + dp.SetDoubleValue(1027) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) + dp = m.Sum().DataPoints().AppendEmpty() + dp.Attributes().PutInt("code", 400) + dp.Attributes().PutStr("method", "post") + dp.SetStartTimestamp(startTimestamp) + dp.SetTimestamp(timestamp) + dp.SetDoubleValue(3) - err = c.WriteMetrics(context.Background(), metrics) - require.NoError(t, err) + err = c.WriteMetrics(context.Background(), metrics) + require.NoError(t, err) - expected := []mockPoint{ - { - measurement: "prometheus", - tags: map[string]string{ - "node": "42", - "otel.library.name": "My Library", - "otel.library.version": "latest", - "method": "post", - "code": "200", - }, - fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "http_requests_total": float64(1027), - }, - ts: timestamp.AsTime().UTC(), - vType: common.InfluxMetricValueTypeSum, + expected := []mockPoint{ + { + measurement: "prometheus", + tags: map[string]string{ + "node": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "200", }, - { - measurement: "prometheus", - tags: map[string]string{ - "node": "42", - "otel.library.name": "My Library", - "otel.library.version": "latest", - "method": "post", - "code": "400", - }, - fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "http_requests_total": float64(3), - }, - ts: timestamp.AsTime().UTC(), - vType: common.InfluxMetricValueTypeSum, + fields: map[string]interface{}{ + common.AttributeStartTimeUnixNano: int64(startTimestamp), + "http_requests_total": float64(1027), + "flags": uint64(1), }, - } - - assert.EqualValues(t, expected, w.points) + ts: timestamp.AsTime().UTC(), + vType: common.InfluxMetricValueTypeSum, + }, + { + measurement: "prometheus", + tags: map[string]string{ + "node": "42", + "otel.library.name": "My Library", + "otel.library.version": "latest", + "method": "post", + "code": "400", + }, + fields: map[string]interface{}{ + common.AttributeStartTimeUnixNano: int64(startTimestamp), + "http_requests_total": float64(3), + "flags": uint64(0), + }, + ts: timestamp.AsTime().UTC(), + vType: common.InfluxMetricValueTypeSum, + }, } + + assert.EqualValues(t, expected, w.points) } func TestWriteMetric_v2_histogram(t *testing.T) { @@ -241,10 +263,10 @@ func TestWriteMetric_v2_histogram(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("node", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.SetDescription("A histogram of the request duration") @@ -260,6 +282,7 @@ func TestWriteMetric_v2_histogram(t *testing.T) { dp.SetMax(100) dp.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) dp.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) err = c.WriteMetrics(context.Background(), metrics) require.NoError(t, err) @@ -280,6 +303,7 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "http_request_duration_seconds_sum": float64(53423), "http_request_duration_seconds_min": float64(0), "http_request_duration_seconds_max": float64(100), + "flags": uint64(1), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeHistogram, @@ -295,7 +319,6 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "le": "0.05", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(24054), }, ts: timestamp.AsTime().UTC(), @@ -312,7 +335,6 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "le": "0.1", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(33444), }, ts: timestamp.AsTime().UTC(), @@ -329,7 +351,6 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "le": "0.2", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(100392), }, ts: timestamp.AsTime().UTC(), @@ -346,7 +367,6 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "le": "0.5", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(129389), }, ts: timestamp.AsTime().UTC(), @@ -363,7 +383,6 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "le": "1", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(133988), }, ts: timestamp.AsTime().UTC(), @@ -380,7 +399,6 @@ func TestWriteMetric_v2_histogram(t *testing.T) { "le": "+Inf", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(144320), }, ts: timestamp.AsTime().UTC(), @@ -404,10 +422,10 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("node", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.SetDescription("A histogram of the request duration") @@ -439,6 +457,7 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_count": float64(144320), "http_request_duration_seconds_sum": float64(53423), + "flags": uint64(0), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeHistogram, @@ -454,7 +473,6 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { "le": "0.05", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(24054), }, ts: timestamp.AsTime().UTC(), @@ -471,7 +489,6 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { "le": "0.1", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(33444), }, ts: timestamp.AsTime().UTC(), @@ -488,7 +505,6 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { "le": "0.2", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(100392), }, ts: timestamp.AsTime().UTC(), @@ -505,7 +521,6 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { "le": "0.5", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(129389), }, ts: timestamp.AsTime().UTC(), @@ -522,7 +537,6 @@ func TestWriteMetric_v2_histogram_missingInfinityBucket(t *testing.T) { "le": "1", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), "http_request_duration_seconds_bucket": float64(133988), }, ts: timestamp.AsTime().UTC(), @@ -545,10 +559,10 @@ func TestWriteMetric_v2_summary(t *testing.T) { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() rm.Resource().Attributes().PutStr("node", "42") - ilMetrics := rm.ScopeMetrics().AppendEmpty() - ilMetrics.Scope().SetName("My Library") - ilMetrics.Scope().SetVersion("latest") - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + isMetrics.Scope().SetName("My Library") + isMetrics.Scope().SetVersion("latest") + m := isMetrics.Metrics().AppendEmpty() m.SetName("rpc_duration_seconds") m.SetEmptySummary() m.SetDescription("A summary of the RPC duration in seconds") @@ -559,6 +573,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { dp.SetTimestamp(timestamp) dp.SetCount(2693) dp.SetSum(17560473) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) qv := dp.QuantileValues().AppendEmpty() qv.SetQuantile(0.01) qv.SetValue(3102) @@ -592,6 +607,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { common.AttributeStartTimeUnixNano: int64(startTimestamp), "rpc_duration_seconds_count": float64(2693), "rpc_duration_seconds_sum": float64(17560473), + "flags": uint64(1), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeSummary, @@ -607,8 +623,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { "quantile": "0.01", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "rpc_duration_seconds": float64(3102), + "rpc_duration_seconds": float64(3102), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeSummary, @@ -624,8 +639,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { "quantile": "0.05", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "rpc_duration_seconds": float64(3272), + "rpc_duration_seconds": float64(3272), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeSummary, @@ -641,8 +655,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { "quantile": "0.5", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "rpc_duration_seconds": float64(4773), + "rpc_duration_seconds": float64(4773), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeSummary, @@ -658,8 +671,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { "quantile": "0.9", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "rpc_duration_seconds": float64(9001), + "rpc_duration_seconds": float64(9001), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeSummary, @@ -675,8 +687,7 @@ func TestWriteMetric_v2_summary(t *testing.T) { "quantile": "0.99", }, fields: map[string]interface{}{ - common.AttributeStartTimeUnixNano: int64(startTimestamp), - "rpc_duration_seconds": float64(76656), + "rpc_duration_seconds": float64(76656), }, ts: timestamp.AsTime().UTC(), vType: common.InfluxMetricValueTypeSummary, diff --git a/otel2influx/traces.go b/otel2influx/traces.go index 8c8c580b..29b3e796 100644 --- a/otel2influx/traces.go +++ b/otel2influx/traces.go @@ -2,7 +2,6 @@ package otel2influx import ( "context" - "encoding/hex" "encoding/json" "errors" "fmt" @@ -155,7 +154,7 @@ func (c *OtelTracesToLineProtocol) enqueueSpan(ctx context.Context, span ptrace. fields[common.AttributeTraceState] = traceState } if parentSpanID := span.ParentSpanID(); !parentSpanID.IsEmpty() { - fields[common.AttributeParentSpanID] = hex.EncodeToString(parentSpanID[:]) + fields[common.AttributeParentSpanID] = parentSpanID.String() } if name := span.Name(); name != "" { fields[common.AttributeSpanName] = name @@ -209,12 +208,12 @@ func (c *OtelTracesToLineProtocol) enqueueSpan(ctx context.Context, span ptrace. fields[semconv.OtelStatusDescription] = message } - tags[common.AttributeTraceID] = hex.EncodeToString(traceID[:]) - tags[common.AttributeSpanID] = hex.EncodeToString(spanID[:]) + tags[common.AttributeTraceID] = traceID.String() + tags[common.AttributeSpanID] = spanID.String() for k := range tags { if _, found := fields[k]; found { - c.logger.Debug("tag and field keys conflict; field will be dropped", "tag key", k) + c.logger.Debug("tag and field keys conflict; field will be dropped", "key", k) droppedAttributesCount++ delete(fields, k) } @@ -236,36 +235,23 @@ func (c *OtelTracesToLineProtocol) enqueueSpanEvent(ctx context.Context, traceID fields[semconv.AttributeEventName] = name } - droppedAttributesCount := uint64(spanEvent.DroppedAttributesCount()) - attributes := make(map[string]interface{}, spanEvent.Attributes().Len()) - spanEvent.Attributes().Range(func(k string, v pcommon.Value) bool { - if k == "" { - droppedAttributesCount++ - c.logger.Debug("span event attribute key is empty") - } else if v, err := AttributeValueToInfluxFieldValue(v); err != nil { - droppedAttributesCount++ - c.logger.Debug("invalid span event attribute value", err) - } else { - attributes[k] = v - } - return true - }) - if len(attributes) > 0 { - marshalledAttributes, err := json.Marshal(attributes) + if spanEvent.Attributes().Len() > 0 { + droppedAttributesCount := uint64(spanEvent.DroppedAttributesCount()) + marshalledAttributes, err := json.Marshal(spanEvent.Attributes().AsRaw()) if err != nil { c.logger.Debug("failed to marshal attributes to JSON", err) - droppedAttributesCount += uint64(len(attributes)) + droppedAttributesCount += uint64(spanEvent.Attributes().Len()) } else { fields[common.AttributeAttributes] = string(marshalledAttributes) } - } - if droppedAttributesCount > 0 { - fields[common.AttributeDroppedAttributesCount] = droppedAttributesCount + if droppedAttributesCount > 0 { + fields[common.AttributeDroppedAttributesCount] = droppedAttributesCount + } } tags := map[string]string{ - common.AttributeTraceID: hex.EncodeToString(traceID[:]), - common.AttributeSpanID: hex.EncodeToString(spanID[:]), + common.AttributeTraceID: traceID.String(), + common.AttributeSpanID: spanID.String(), } err := batch.EnqueuePoint(ctx, common.MeasurementLogs, tags, fields, spanEvent.Timestamp().AsTime(), common.InfluxMetricValueTypeUntyped) @@ -288,41 +274,28 @@ func (c *OtelTracesToLineProtocol) writeSpanLink(ctx context.Context, traceID pc } tags := map[string]string{ - common.AttributeTraceID: hex.EncodeToString(traceID[:]), - common.AttributeSpanID: hex.EncodeToString(spanID[:]), - common.AttributeLinkedTraceID: hex.EncodeToString(linkedTraceID[:]), - common.AttributeLinkedSpanID: hex.EncodeToString(linkedSpanID[:]), + common.AttributeTraceID: traceID.String(), + common.AttributeSpanID: spanID.String(), + common.AttributeLinkedTraceID: linkedTraceID.String(), + common.AttributeLinkedSpanID: linkedSpanID.String(), } if traceState := spanLink.TraceState().AsRaw(); traceState != "" { fields[common.AttributeTraceState] = traceState } - droppedAttributesCount := uint64(spanLink.DroppedAttributesCount()) - attributes := make(map[string]interface{}, spanLink.Attributes().Len()) - spanLink.Attributes().Range(func(k string, v pcommon.Value) bool { - if k == "" { - droppedAttributesCount++ - c.logger.Debug("span link attribute key is empty") - } else if v, err := AttributeValueToInfluxFieldValue(v); err != nil { - droppedAttributesCount++ - c.logger.Debug("invalid span link attribute value", err) - } else { - attributes[k] = v - } - return true - }) - if len(attributes) > 0 { - marshalledAttributes, err := json.Marshal(attributes) + if spanLink.Attributes().Len() > 0 { + droppedAttributesCount := uint64(spanLink.DroppedAttributesCount()) + marshalledAttributes, err := json.Marshal(spanLink.Attributes().AsRaw()) if err != nil { c.logger.Debug("failed to marshal attributes to JSON", err) - droppedAttributesCount += uint64(len(attributes)) + droppedAttributesCount += uint64(spanLink.Attributes().Len()) } else { fields[common.AttributeAttributes] = string(marshalledAttributes) } - } - if droppedAttributesCount > 0 { - fields[common.AttributeDroppedAttributesCount] = droppedAttributesCount + if droppedAttributesCount > 0 { + fields[common.AttributeDroppedAttributesCount] = droppedAttributesCount + } } if err := batch.EnqueuePoint(ctx, common.MeasurementSpanLinks, tags, fields, ts, common.InfluxMetricValueTypeUntyped); err != nil { diff --git a/tests-integration/test_fodder.go b/tests-integration/test_fodder.go index 51fe8abc..8b88f155 100644 --- a/tests-integration/test_fodder.go +++ b/tests-integration/test_fodder.go @@ -32,15 +32,16 @@ func init() { { metrics := pmetric.NewMetrics() rm := metrics.ResourceMetrics().AppendEmpty() - ilMetrics := rm.ScopeMetrics().AppendEmpty() - m := ilMetrics.Metrics().AppendEmpty() + isMetrics := rm.ScopeMetrics().AppendEmpty() + m := isMetrics.Metrics().AppendEmpty() m.SetName("cpu_temp") m.SetEmptyGauge() dp := m.Gauge().DataPoints().AppendEmpty() dp.Attributes().PutStr("foo", "bar") dp.SetTimestamp(pcommon.Timestamp(1622848686000000000)) dp.SetDoubleValue(87.332) - m = ilMetrics.Metrics().AppendEmpty() + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) + m = isMetrics.Metrics().AppendEmpty() m.SetName("http_request_duration_seconds") m.SetEmptyHistogram() m.Histogram().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -51,7 +52,8 @@ func init() { dp2.SetSum(53423) dp2.ExplicitBounds().FromRaw([]float64{0.05, 0.1, 0.2, 0.5, 1}) dp2.BucketCounts().FromRaw([]uint64{24054, 9390, 66948, 28997, 4599, 10332}) - m = ilMetrics.Metrics().AppendEmpty() + dp2.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) + m = isMetrics.Metrics().AppendEmpty() m.SetName("http_requests_total") m.SetEmptySum() m.Sum().SetAggregationTemporality(pmetric.AggregationTemporalityCumulative) @@ -61,19 +63,21 @@ func init() { dp.Attributes().PutStr("code", "200") dp.SetTimestamp(pcommon.Timestamp(1622848686000000000)) dp.SetDoubleValue(1027) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(true)) dp = m.Sum().DataPoints().AppendEmpty() dp.Attributes().PutStr("method", "post") dp.Attributes().PutStr("code", "400") dp.SetTimestamp(pcommon.Timestamp(1622848686000000000)) dp.SetDoubleValue(3) + dp.SetFlags(pmetric.DefaultDataPointFlags.WithNoRecordedValue(false)) metricTests = append(metricTests, metricTest{ otel: metrics, lp: ` -cpu_temp,foo=bar gauge=87.332 1622848686000000000 -http_request_duration_seconds,region=eu count=144320,sum=53423,0.05=24054,0.1=33444,0.2=100392,0.5=129389,1=133988,+Inf=144320 1622848686000000000 -http_requests_total,code=200,method=post counter=1027 1622848686000000000 -http_requests_total,code=400,method=post counter=3 1622848686000000000 +cpu_temp,foo=bar gauge=87.332,flags=1u 1622848686000000000 +http_request_duration_seconds,region=eu count=144320,sum=53423,flags=0u,0.05=24054,0.1=33444,0.2=100392,0.5=129389,1=133988,+Inf=144320 1622848686000000000 +http_requests_total,code=200,method=post counter=1027,flags=1u 1622848686000000000 +http_requests_total,code=400,method=post counter=3,flags=0u 1622848686000000000 `, }) } @@ -144,11 +148,12 @@ spans,span_id=0000000000000005,trace_id=00000000000000020000000000000002 duratio log.SetDroppedAttributesCount(5) log.SetTraceID([16]byte{0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 1}) log.SetSpanID([8]byte{0, 0, 0, 0, 0, 0, 0, 3}) + log.SetFlags(plog.DefaultLogRecordFlags.WithIsSampled(true)) logTests = append(logTests, logTest{ otel: logs, lp: ` -logs,span_id=0000000000000003,trace_id=00000000000000020000000000000001 body="something-happened",attributes="{\"k\":true}",dropped_attributes_count=5u,severity_number=9i,severity_text="info" 1622848686000000000 +logs,span_id=0000000000000003,trace_id=00000000000000020000000000000001 body="something-happened",attributes="{\"k\":true}",dropped_attributes_count=5u,flags=1u,severity_number=9i,severity_text="info" 1622848686000000000 `, }) } From 020d4c5bc1f0f1d537701fc52065637188aebead Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Thu, 31 Aug 2023 14:34:07 -0700 Subject: [PATCH 08/13] chore: resolve integration test failures Helps #273 Allow integration tests to pass by importing WIP branches of otelcontribcol and telegraf. --- tests-integration/go.mod | 22 ++++----- tests-integration/go.sum | 99 ++++++++++++++++++---------------------- 2 files changed, 56 insertions(+), 65 deletions(-) diff --git a/tests-integration/go.mod b/tests-integration/go.mod index c3af95c3..7ebf21b6 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -37,7 +37,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/compose-spec/compose-go v1.16.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/fatih/color v1.15.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect @@ -57,9 +57,9 @@ require ( github.com/gosnmp/gosnmp v1.35.1-0.20230602062452-f30602b8dad6 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/influxdata/influxdb-observability/common v0.5.5 // indirect - github.com/influxdata/influxdb-observability/influx2otel v0.5.5 // indirect - github.com/influxdata/influxdb-observability/otel2influx v0.5.5 // indirect + github.com/influxdata/influxdb-observability/common v0.5.6 // indirect + github.com/influxdata/influxdb-observability/influx2otel v0.5.6 // indirect + github.com/influxdata/influxdb-observability/otel2influx v0.5.6 // indirect github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.16.7 // indirect @@ -78,12 +78,12 @@ require ( github.com/naoina/go-stringutil v0.1.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.10.1 // indirect + github.com/prometheus/procfs v0.11.0 // indirect github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.9.0 // indirect @@ -129,15 +129,15 @@ require ( go.opentelemetry.io/otel/sdk v1.16.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect go.opentelemetry.io/otel/trace v1.16.0 // indirect - go.opentelemetry.io/proto/otlp v0.19.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.12.0 // indirect - golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect + golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/net v0.14.0 // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/text v0.12.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -148,6 +148,6 @@ replace ( github.com/influxdata/influxdb-observability/common => ../common github.com/influxdata/influxdb-observability/influx2otel => ../influx2otel github.com/influxdata/influxdb-observability/otel2influx => ../otel2influx - github.com/influxdata/telegraf => ../../telegraf - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter => ../../opentelemetry-collector-contrib/exporter/influxdbexporter + github.com/influxdata/telegraf => github.com/influxdata/telegraf v0.0.0-20230830233451-76d12e97cabc + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter => github.com/jacobmarble/opentelemetry-collector-contrib/exporter/influxdbexporter v0.0.0-20230831000419-93c5219f48bd ) diff --git a/tests-integration/go.sum b/tests-integration/go.sum index c6ff27a3..ba3a8bb0 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -28,11 +28,11 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/bigquery v1.52.0 h1:JKLNdxI0N+TIUWD6t9KN646X27N5dQWq9dZbbTWZ8hc= cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= -cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= +cloud.google.com/go/compute v1.22.0 h1:cB8R6FtUtT1TYGl5R3xuxnW6OUIc/DrT2aiR16TTG7Y= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= +cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y= cloud.google.com/go/monitoring v1.15.1 h1:65JhLMd+JiYnXr6j5Z63dUYCuOg770p8a/VC+gil/58= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= @@ -54,20 +54,20 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= -github.com/Azure/azure-amqp-common-go/v4 v4.1.0 h1:gcS6P4q/Qv1nmdq1IWoU3mLYlHnvNxAhVjxReEFmSz8= -github.com/Azure/azure-event-hubs-go/v3 v3.5.0 h1:H3nhguNPKFH+Z6GP0GZTJVsiuHjqrz5rsRsD816zNkQ= +github.com/Azure/azure-amqp-common-go/v4 v4.2.0 h1:q/jLx1KJ8xeI8XGfkOWMN9XrXzAfVTkyvCxPvHCjd2I= +github.com/Azure/azure-event-hubs-go/v3 v3.6.1 h1:vSiMmn3tOwgiLyfnmhT5K6Of/3QWRLaaNZPI0hFvZyU= github.com/Azure/azure-kusto-go v0.13.1 h1:0w4CmUTROT8qbLbKq921PhCb7mIfRFWeDu4iJxrNEOM= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU= -github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0-beta.2 h1:C3zKsGguxcLd8a2uEytB8+TFtBGd75bXRxEs0QBwsv0= +github.com/Azure/azure-sdk-for-go/sdk/azcore v1.8.0-beta.1 h1:8t6ZZtkOCl+rx7uBn40Nj62ABVGkXK69U/En44wJIlE= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg= github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.10.0 h1:dAPBLcjVx4qtf915ebQ10szmxqwqtlOxiQJEfjMllXs= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.10.1 h1:UpPmkj6X+Nha33xdAXX2wcTNTh9tU6vhCeM/QZIK4q8= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU= github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 h1:u/LLAOFgsMv7HmNL4Qufg58y+qElGOt5qv0z1mURkRY= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= -github.com/Azure/go-amqp v0.19.1 h1:S1l3HiSMU7Rhko2f70lBH6Vd0mLj5UZiTWC6xKY5Kho= +github.com/Azure/go-amqp v1.0.0 h1:QfCugi1M+4F2JDTRgVnRw7PYXLXZ9hmqk3+9+oJh3OA= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= @@ -177,8 +177,8 @@ github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/ github.com/aws/aws-sdk-go v1.38.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= -github.com/aws/aws-sdk-go-v2 v1.20.1 h1:rZBf5DWr7YGrnlTK4kgDQGn1ltqOg5orCYb/UhOFZkg= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.12 h1:lN6L3LrYHeZ6xCxaIYtoWCx4GMLk4nRknsh29OMSqHY= +github.com/aws/aws-sdk-go-v2 v1.21.0 h1:gMT0IW+03wtYJhRqTVYn0wLzwdnK9sRMcxmtfGzRdJc= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.13 h1:OPLEkmhXf6xFPiz0bLeDArZIDx1NNS4oJyG4nv3Gct0= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.18.27 h1:Az9uLwmssTE6OGTpsFqOnaGpLnKDqNYOJzWuC6UAYzA= github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ= @@ -187,8 +187,8 @@ github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.2.0 h1:8kvinmbID github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.6.0/go.mod h1:gqlclDEZp4aqJOancXK6TN24aKhT0W0Ae9MHk3wzTMM= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.8 h1:DK/9C+UN/X+1+Wm8pqaDksQr2tSLzq+8X1/rI/ZxKEQ= github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.11.70 h1:4bh28MeeXoBFTjb0JjQ5sVatzlf5xA1DziV8mZed9v4= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.38 h1:c8ed/T9T2K5I+h/JzmF5tpI46+OODQ74dzmdo+QnaMg= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.32 h1:hNeAAymUY5gu11WrrmFb3CVIp9Dar9hbo44yzzcQpzA= +github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.41 h1:22dGT7PneFMx4+b3pz7lMTRyN8ZKH7M2cW4GP9yUS2g= +github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.35 h1:SijA0mgjV8E+8G45ltVHs0fvKpTj8xmZJ3VwhGKtUSI= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.35 h1:LWA+3kDM8ly001vJ1X1waCuLJdtTl48gwkPKWy9sosI= github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.26 h1:wscW+pnn3J1OYnanMnza5ZVYXLX4cKk5rAvUAl4Qu+c= @@ -204,7 +204,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.28 h1:/D99 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.32 h1:dGAseBFEYxth10V23b5e2mAS+tX7oVbfYHD6dnDdAsg= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.14.3 h1:dBL3StFxHtpBzJJ/mNEsjXVgfO+7jR0dAIEwLqMapEA= -github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.2 h1:PkQN8Fl89d97R4JfmLozCX3RyJq4r9XMurIqpW59gRM= +github.com/aws/aws-sdk-go-v2/service/kinesis v1.18.5 h1:naSZmQiFjoTLxNjfDy/KgEnWdG3odkR6gIEgTx21YOM= github.com/aws/aws-sdk-go-v2/service/s3 v1.35.0 h1:ya7fmrN2fE7s1P2gaPbNg5MTkERVWfsH8ToP1YC4Z9o= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.13.2 h1:A2RlEMo4SJSwbNoUUgkxTAEMduAy/8wG3eB2b2lP4gY= @@ -213,7 +213,7 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21 github.com/aws/aws-sdk-go-v2/service/sts v1.21.2 h1:ympg1+Lnq33XLhcK/xTG4yZHPs1Oyxu+6DEWbl7qOzA= github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.17.2 h1:PlsApCYTMqiDmaCDikifXGYqQ53QWQ5UAOEZIevfcL8= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= -github.com/aws/smithy-go v1.14.1 h1:EFKMUmH/iHMqLiwoEDx2rRjRQpI1YCn5jTysoaDujFs= +github.com/aws/smithy-go v1.14.2 h1:MJU9hqBGbvWZdApzpvoF2WAIJDbtjK2NDJSiJP7HblQ= github.com/awslabs/kinesis-aggregation/go v0.0.0-20210630091500-54e17340d32f h1:Pf0BjJDga7C98f0vhw+Ip5EaiE07S3lTKpIYPNS0nMo= github.com/benbjohnson/clock v1.3.3 h1:g+rSsSaAzhHJYcIQE78hJ3AhyjjtQvleKDjlhdBnIhc= github.com/benbjohnson/clock v1.3.3/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= @@ -254,11 +254,6 @@ github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/compose-spec/compose-go v1.16.0 h1:HYk4uYWXgArHh6NG+WE4yGYayOXw+hjqJ+eJxpjWWjk= @@ -285,8 +280,9 @@ github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ github.com/danieljoos/wincred v1.2.0 h1:ozqKHaLK0W/ii4KVbbvluM91W2H3Sh0BncbUNPS7jLE= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU= github.com/devigned/tab v0.1.1 h1:3mD6Kb1mUOYeLpJvTVSDwSg5ZsfSxfvxGRTxRsJsITA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= @@ -326,7 +322,7 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ= +github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -334,8 +330,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -417,7 +411,7 @@ github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -469,7 +463,7 @@ github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfT github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M= github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= @@ -539,7 +533,6 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw github.com/golang/geo v0.0.0-20190916061304-5b978397cfec h1:lJwO/92dFXWeXOZdoGXgptLmNLwynMSHUmU6besqtiw= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -584,7 +577,7 @@ github.com/google/cel-go v0.14.1-0.20230424164844-d39523c445fc h1:jd+stC3Fqf9kaq github.com/google/cel-go v0.14.1-0.20230424164844-d39523c445fc/go.mod h1:YzWEoI07MC/a/wj9in8GeVatqfypkldgBlwXh9bCwqY= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= -github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnxi v0.0.0-20221016143401-2aeceb5a2901 h1:xlsMG0I0F6Ou3a4zRWu3cThivTt2N2V1cZafIloTBTU= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -656,7 +649,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -666,7 +658,7 @@ github.com/harlow/kinesis-consumer v0.3.6-0.20211204214318-c2b9f79d7ab6 h1:38nI+ github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk= github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= -github.com/hashicorp/consul/api v1.20.0 h1:9IHTjNVSZ7MIwjlW3N3a7iGiykCMDpxZu8jsxFJh0yc= +github.com/hashicorp/consul/api v1.24.0 h1:u2XyStA2j0jnCiVUU7Qyrt8idjRn4ORhK6DlvZ3bWhA= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= @@ -754,6 +746,8 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tail v1.0.1-0.20210707231403-b283181d1fa7 h1:0rQOs1VHLVFpAAOIR0mJEvVOIaMYFgYdreeVbgI9sII= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= +github.com/influxdata/telegraf v0.0.0-20230830233451-76d12e97cabc h1:RxDg8HDSLnTFEYpwqo/CFc5N26t9ScXvY1oIhrD01xY= +github.com/influxdata/telegraf v0.0.0-20230830233451-76d12e97cabc/go.mod h1:FxdFJ8D9EhfGD/e2kR1xqWfs4C6T4x3s8JE27hckFnk= github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 h1:vvyMtD5LTJc1W9sQKjDkAWdcg0478CszSdzlHtiAXCY= github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod h1:zApaNFpP/bTpQItGZNNUMISDMDAnTXu9UqJ4yT3ocz8= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= @@ -768,6 +762,8 @@ github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/ github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0= github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0= +github.com/jacobmarble/opentelemetry-collector-contrib/exporter/influxdbexporter v0.0.0-20230831000419-93c5219f48bd h1:AtE8G6MJ33jeCiiJgaJeYDQsc0lONC4H/H7OZIWYUBk= +github.com/jacobmarble/opentelemetry-collector-contrib/exporter/influxdbexporter v0.0.0-20230831000419-93c5219f48bd/go.mod h1:0cANO0DxI+F3db/zNd9wWrDHi72ZMo2wFbgmon8YSmw= github.com/jaegertracing/jaeger v1.47.0 h1:XXxTMO+GxX930gxKWsg90rFr6RswkCRIW0AgWFnTYsg= github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a h1:JxcWget6X/VfBMKxPIc28Jel37LGREut2fpV+ObkwJ0= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= @@ -960,7 +956,7 @@ github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= github.com/nats-io/nats-server/v2 v2.9.9 h1:bmj0RhvHOc8+z5/RuhI38GqPwtkFAHQuU3e99FVA/TI= github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= -github.com/nats-io/nats.go v1.27.0 h1:3o9fsPhmoKm+yK7rekH2GtWoE+D9jFbw8N3/ayI1C00= +github.com/nats-io/nats.go v1.28.0 h1:Th4G6zdsz2d0OqXdfzKLClo6bOfoI/b1kInhRtFIy5c= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.4.4 h1:xvBJ8d69TznjcQl9t6//Q5xXuVhyYiSos6RPtvQNTwA= @@ -1044,8 +1040,9 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= -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/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= @@ -1100,8 +1097,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= -github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= +github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 h1:AHi2TGs09Mv4v688/bjcY2PfAcu9+p4aPvsgVQ4nYDk= github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2/go.mod h1:5aBj+GpLB+V5MCnrKm5+JAqEJwzDiLugOmDhgt7sDec= github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= @@ -1364,9 +1361,8 @@ go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh4 go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= -go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1420,8 +1416,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw= +golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e h1:qyrTQ++p1afMkO4DPEeLGq/3oTsdlvdH4vqZUBWzUKM= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= @@ -1449,7 +1445,7 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1519,7 +1515,6 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.11.0 h1:vPL4xzxBM4niKCW6g9whtaWVXTJf1U5e4aZxxFx/gbU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1719,7 +1714,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.10.0 h1:tvDr/iQoUqNdohiYm0LmmKcBk+q86lb9EprIUFhHHGg= +golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1811,10 +1806,9 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210312152112-fc591d9ea70f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= -google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 h1:XVeBY8d/FaK4848myy41HBqnDwvxeV3zMZhwN1TvAMU= -google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:mPBs5jNgx2GuQGvFwUvVKqtn6HsUw9nP64BedgvqEsQ= +google.golang.org/genproto v0.0.0-20230717213848-3f92550aa753 h1:+VoAg+OKmWaommL56xmZSE2sUK8A7m6SUO7X89F2tbw= +google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 h1:lCbbUxUDD+DiXx9Q6F/ttL0aAu7N2pz8XnmMm8ZW4NE= +google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 h1:Z8qdAF9GFsmcUuWQ5KVYIpP3PCKydn/YKORnghIalu4= google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1843,8 +1837,6 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1859,7 +1851,6 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= @@ -1918,21 +1909,21 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.3.0 h1:2LdYUZ7CIxnYgskbUZfY7FPggmqnh6shBqfWa8Tn3XU= k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU= -k8s.io/api v0.27.4 h1:0pCo/AN9hONazBKlNUdhQymmnfLRbSZjd5H5H3f0bSs= +k8s.io/api v0.28.1 h1:i+0O8k2NPBCPYaMB+uCkseEbawEt/eFaiRqUx8aB108= k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.27.4 h1:CdxflD4AF61yewuid0fLl6bM4a3q04jWel0IlP+aYjs= +k8s.io/apimachinery v0.28.1 h1:EJD40og3GizBSV3mkIoXQBsws32okPOy+MkRyzh6nPY= k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA= -k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE= +k8s.io/client-go v0.28.1 h1:pRhMzB8HyLfVwpngWKE8hDcXRqifh1ga2Z/PU9SXVK8= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= +k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg= +k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20230308161112-d77c459e9343 h1:m7tbIjXGcGIAtpmQr7/NAi7RsWoW3E7Zcm4jI1HicTc= +k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc= layeh.com/radius v0.0.0-20221205141417-e7fbddd11d68 h1:2NDro2Jzkrqfngy/sA5GVnChs7fx8EzcQKFi/lI2cfg= lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw= @@ -1951,7 +1942,7 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= From a9d262dc74b84840e41865fc5d6dda4d4ee9c368 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Thu, 31 Aug 2023 18:01:32 -0700 Subject: [PATCH 09/13] chore: update Jaeger to v1.48 --- demo/docker-compose-development.yml | 3 +- demo/docker-compose.yml | 2 +- jaeger-influxdb/Dockerfile.all-in-one | 2 +- jaeger-influxdb/go.mod | 43 ++++++------- jaeger-influxdb/go.sum | 93 ++++++++++++--------------- 5 files changed, 64 insertions(+), 79 deletions(-) diff --git a/demo/docker-compose-development.yml b/demo/docker-compose-development.yml index e8947286..20076124 100644 --- a/demo/docker-compose-development.yml +++ b/demo/docker-compose-development.yml @@ -1,7 +1,7 @@ services: jaeger-query: - image: jaegertracing/jaeger-query:1.45 + image: jaegertracing/jaeger-query:1.48 stop_grace_period: 10s ports: - "16686:16686" # web UI @@ -16,6 +16,7 @@ services: QUERY_HTTP_SERVER_HOST_PORT: :16686 ADMIN_HTTP_HOST_PORT: :16687 QUERY_UI_CONFIG: /jaeger-ui-config.json + QUERY_ENABLE_TRACING: false volumes: - ./demo/jaeger-ui-config.json:/jaeger-ui-config.json:ro diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index 2964f1a8..525d8d14 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -1,7 +1,7 @@ services: jaeger-query: - image: jaegertracing/jaeger-query:1.45 + image: jaegertracing/jaeger-query:1.48 stop_grace_period: 10s ports: - "16686:16686" # web UI diff --git a/jaeger-influxdb/Dockerfile.all-in-one b/jaeger-influxdb/Dockerfile.all-in-one index 6fbd922f..a0e58d3b 100644 --- a/jaeger-influxdb/Dockerfile.all-in-one +++ b/jaeger-influxdb/Dockerfile.all-in-one @@ -16,7 +16,7 @@ RUN \ FROM alpine:3.16 RUN apk --update --no-cache add bash ca-certificates USER 10001 -COPY --from=jaegertracing/jaeger-query:1.45 --chmod=0755 /go/bin/query-linux /jaeger-query +COPY --from=jaegertracing/jaeger-query:1.48 --chmod=0755 /go/bin/query-linux /jaeger-query COPY --chmod=0755 jaeger-influxdb/all-in-one.sh / COPY --from=builder --chmod=0755 /go/bin/jaeger-influxdb / ENTRYPOINT ["/all-in-one.sh"] diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index 53b52316..22a7dd73 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -3,11 +3,11 @@ module github.com/influxdata/influxdb-observability/jaeger-influxdb go 1.20 require ( - github.com/apache/arrow-adbc/go/adbc v0.3.0 + github.com/apache/arrow-adbc/go/adbc v0.6.0 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da - github.com/influxdata/influxdb-observability/common v0.5.5 + github.com/influxdata/influxdb-observability/common v0.5.6 github.com/influxdata/line-protocol/v2 v2.2.1 - github.com/jaegertracing/jaeger v1.47.0 + github.com/jaegertracing/jaeger v1.48.0 github.com/mattn/go-isatty v0.0.18 github.com/opentracing/opentracing-go v1.2.0 github.com/spf13/cobra v1.7.0 @@ -16,43 +16,37 @@ require ( go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 go.opentelemetry.io/collector/semconv v0.84.0 go.uber.org/multierr v1.11.0 - go.uber.org/zap v1.24.0 - google.golang.org/grpc v1.56.2 + go.uber.org/zap v1.25.0 + google.golang.org/grpc v1.57.0 ) require ( - github.com/andybalholm/brotli v1.0.4 // indirect - github.com/apache/arrow/go/v12 v12.0.0-20230307201612-6fdf1e520a76 // indirect - github.com/apache/thrift v0.18.1 // indirect + github.com/apache/arrow/go/v13 v13.0.0 // indirect github.com/bluele/gcache v0.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fatih/color v1.13.0 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/goccy/go-json v0.10.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.3 // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/google/flatbuffers v23.1.21+incompatible // indirect + github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-plugin v1.4.10 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/asmfmt v1.3.2 // indirect github.com/klauspost/compress v1.16.7 // indirect - github.com/klauspost/cpuid/v2 v2.2.3 // indirect + github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect - github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/mitchellh/go-testing-interface v1.0.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/oklog/run v1.1.0 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect - github.com/pierrec/lz4/v4 v4.1.17 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/cast v1.5.1 // indirect @@ -62,15 +56,16 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/zeebo/xxh3 v1.0.2 // indirect + go.opentelemetry.io/otel v1.16.0 // indirect + go.opentelemetry.io/otel/trace v1.16.0 // indirect go.uber.org/atomic v1.11.0 // indirect - go.uber.org/goleak v1.2.0 // indirect - golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect - golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect - golang.org/x/tools v0.6.0 // indirect + golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sync v0.3.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect + golang.org/x/tools v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index 2bf0bf1d..3753ac0d 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -39,15 +39,10 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= -github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= -github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/apache/arrow-adbc/go/adbc v0.3.0 h1:8a2roR2eQ9rfybW+o5o+piwLoim/LZsFCUn8TPiQues= -github.com/apache/arrow-adbc/go/adbc v0.3.0/go.mod h1:GnOviOwgZGT6IdogE6RP+o5Tjiw+U+2mH7X+WCX9j/w= -github.com/apache/arrow/go/v12 v12.0.0-20230307201612-6fdf1e520a76 h1:6O9PR51TZFveY6xYg4RCCj23hIFyL7vR5hav0zc+Vss= -github.com/apache/arrow/go/v12 v12.0.0-20230307201612-6fdf1e520a76/go.mod h1:p9SbFzxqBIUcxDFFqy4aLDT6RdooPoA18Bru+OL1gbk= -github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg= -github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I= +github.com/apache/arrow-adbc/go/adbc v0.6.0 h1:WBy5cQO/xOFyGX17UB8kPNpoa6OuQ9jQ7b4bP2QdMeo= +github.com/apache/arrow-adbc/go/adbc v0.6.0/go.mod h1:7HnZmHalFWS5PUA6Viqa5cvR0rfsn+9X5rWOaWVYKpo= +github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk= +github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= @@ -82,8 +77,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= -github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -116,12 +111,10 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= 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/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/flatbuffers v23.1.21+incompatible h1:bUqzx/MXCDxuS0hRJL2EfjyZL3uQrPbMocUa8zGqsTA= -github.com/google/flatbuffers v23.1.21+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= +github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -174,8 +167,8 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= -github.com/jaegertracing/jaeger v1.47.0 h1:XXxTMO+GxX930gxKWsg90rFr6RswkCRIW0AgWFnTYsg= -github.com/jaegertracing/jaeger v1.47.0/go.mod h1:mHU/OHFML51CijQql4+rLfgPOcIb9MhxOMn+RKQwrJc= +github.com/jaegertracing/jaeger v1.48.0 h1:YuKooQ7qJsjgxws9xuf8C/BLNTPx8qTAJz4wv7IHhSc= +github.com/jaegertracing/jaeger v1.48.0/go.mod h1:BoAPkdCAIEuLsVz/EDhjXd+GSVpHtJhiGqWoFEvBCKg= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -184,12 +177,10 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= -github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid/v2 v2.2.3 h1:sxCkb+qR91z4vsqw4vGGZlDgPz3G7gjaLyK3V8y70BU= -github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= +github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -209,10 +200,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs= -github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY= -github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI= -github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE= github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 h1:BpfhmLKZf+SjVanKKhCgf3bg+511DmU9eDQTen7LLbY= @@ -229,9 +216,8 @@ github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+ github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ= github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4= -github.com/pierrec/lz4/v4 v4.1.17 h1:kV4Ip+/hUBC+8T6+2EgburRtkE9ef4nbY3f4dFhGjMc= -github.com/pierrec/lz4/v4 v4.1.17/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -292,14 +278,17 @@ go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L5 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= +go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= +go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= +go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= 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/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.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= +go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= 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/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -317,8 +306,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg= -golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw= +golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -342,8 +331,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= -golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= 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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -376,8 +365,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -397,8 +386,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/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-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -438,12 +427,12 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -453,8 +442,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= @@ -507,15 +496,15 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8= +golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E= +gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -596,8 +585,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -631,14 +620,14 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= +lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo= modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw= modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw= -modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0= +modernc.org/libc v1.22.4 h1:wymSbZb0AlrjdAVX3cjreCHTPCpPARbQXNz6BHPzdwQ= modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= -modernc.org/sqlite v1.20.4 h1:J8+m2trkN+KKoE7jglyHYYYiaq5xmz2HoHJIiBlRzbE= +modernc.org/sqlite v1.21.2 h1:ixuUG0QS413Vfzyx6FWx6PYTmHaOegTY+hjzhn7L+a0= modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= From 3433a30ad1f2ffa7e123278c18d82c5baa5501a8 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Fri, 22 Sep 2023 07:53:17 -0700 Subject: [PATCH 10/13] chore(deps): update OpenTelemetry and Jaeger - OpenTelemetry v0.84.0 => v0.85.0 - Jaeger v1.48 => 1.49 --- .github/workflows/ci.yml | 2 +- common/go.mod | 2 +- common/go.sum | 4 +- demo/docker-compose-development.yml | 2 +- demo/docker-compose.yml | 4 +- influx2otel/go.mod | 18 +-- influx2otel/go.sum | 34 ++--- jaeger-influxdb/Dockerfile.all-in-one | 2 +- jaeger-influxdb/go.mod | 20 ++- jaeger-influxdb/go.sum | 39 +++--- otel2influx/go.mod | 12 +- otel2influx/go.sum | 22 +-- otelcol-influxdb/Dockerfile | 2 +- otelcol-influxdb/build.yml | 44 +++--- run-checks.sh | 2 +- tests-integration/go.mod | 97 +++++++------ tests-integration/go.sum | 192 +++++++++++++------------- 17 files changed, 245 insertions(+), 253 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2da9d174..f2531f13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,6 @@ jobs: - name: build run: > - go install go.opentelemetry.io/collector/cmd/builder@v0.84.0 && + go install go.opentelemetry.io/collector/cmd/builder@v0.85.0 && cd otelcol-influxdb && builder --config build.yml diff --git a/common/go.mod b/common/go.mod index 39e5668b..aa56bd56 100644 --- a/common/go.mod +++ b/common/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.84.0 + go.opentelemetry.io/collector/semconv v0.85.0 ) require ( diff --git a/common/go.sum b/common/go.sum index f1a6528e..26857e19 100644 --- a/common/go.sum +++ b/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= -go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= +go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/demo/docker-compose-development.yml b/demo/docker-compose-development.yml index 20076124..5ecb154e 100644 --- a/demo/docker-compose-development.yml +++ b/demo/docker-compose-development.yml @@ -1,7 +1,7 @@ services: jaeger-query: - image: jaegertracing/jaeger-query:1.48 + image: jaegertracing/jaeger-query:1.49 stop_grace_period: 10s ports: - "16686:16686" # web UI diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index 525d8d14..31d0631c 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -1,7 +1,7 @@ services: jaeger-query: - image: jaegertracing/jaeger-query:1.48 + image: jaegertracing/jaeger-query:1.49 stop_grace_period: 10s ports: - "16686:16686" # web UI @@ -46,7 +46,7 @@ services: JAEGER_AGENT_PORT: 6831 otelcol-influxdb: - image: otel/opentelemetry-collector-contrib:0.84.0 + image: otel/opentelemetry-collector-contrib:0.85.0 command: [ "--config", "/config.yml" ] stop_grace_period: 10s volumes: diff --git a/influx2otel/go.mod b/influx2otel/go.mod index f7d904bd..a40f6712 100644 --- a/influx2otel/go.mod +++ b/influx2otel/go.mod @@ -3,12 +3,12 @@ module github.com/influxdata/influxdb-observability/influx2otel go 1.19 require ( - github.com/influxdata/influxdb-observability/common v0.5.5 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 + github.com/influxdata/influxdb-observability/common v0.5.7 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.84.0 + go.opentelemetry.io/collector/semconv v0.85.0 ) require ( @@ -21,11 +21,11 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.14.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/grpc v1.57.0 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/grpc v1.58.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/influx2otel/go.sum b/influx2otel/go.sum index e1add9cd..b663b4c3 100644 --- a/influx2otel/go.sum +++ b/influx2otel/go.sum @@ -22,11 +22,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.84.0 h1:EMdLjuWUpbkbYQ/lEg+qZk3lGEG2iPiU+t6g7g/J/5s= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 h1:NXzx/YViPbapdfI0RZ2RJk4XgKU099Ci9rGBsZ/div8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0/go.mod h1:t7+PIcvZwI9599uzwRVpJbJBUbOLBmvs0cIVse8djaA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 h1:Zuk1i/92HvV5cI6dtsG/VWSKwaLGh17q9a26qP9DBbo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 h1:syi7DOno9/zo5t90bdqQe9EhFMjeozS2RT1A2Ty/bVM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 h1:M8jCisGDhD0WbSwaA54pIX7WTn9/x/wAcUEXtTRExbw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0/go.mod h1:DvfKdx5R9XmbgOUi2WyyT3pqLVvIShOlPwve75UoIu8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 h1:spVx9VQV8KV6EsvyeBjoz7lfZxApg0InR8Ju6j3Yyk0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0/go.mod h1:h5h6CZwte3hBoitlWffAO2OHtc38jBRdr1UAS9hyXFs= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -38,8 +38,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= -go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= +go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -51,20 +51,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= 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.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -73,10 +73,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o= +google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/jaeger-influxdb/Dockerfile.all-in-one b/jaeger-influxdb/Dockerfile.all-in-one index a0e58d3b..ef585aa7 100644 --- a/jaeger-influxdb/Dockerfile.all-in-one +++ b/jaeger-influxdb/Dockerfile.all-in-one @@ -16,7 +16,7 @@ RUN \ FROM alpine:3.16 RUN apk --update --no-cache add bash ca-certificates USER 10001 -COPY --from=jaegertracing/jaeger-query:1.48 --chmod=0755 /go/bin/query-linux /jaeger-query +COPY --from=jaegertracing/jaeger-query:1.49 --chmod=0755 /go/bin/query-linux /jaeger-query COPY --chmod=0755 jaeger-influxdb/all-in-one.sh / COPY --from=builder --chmod=0755 /go/bin/jaeger-influxdb / ENTRYPOINT ["/all-in-one.sh"] diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index 22a7dd73..9a103aef 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/apache/arrow-adbc/go/adbc v0.6.0 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da - github.com/influxdata/influxdb-observability/common v0.5.6 + github.com/influxdata/influxdb-observability/common v0.5.7 github.com/influxdata/line-protocol/v2 v2.2.1 - github.com/jaegertracing/jaeger v1.48.0 + github.com/jaegertracing/jaeger v1.49.0 github.com/mattn/go-isatty v0.0.18 github.com/opentracing/opentracing-go v1.2.0 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.84.0 + go.opentelemetry.io/collector/semconv v0.85.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.25.0 google.golang.org/grpc v1.57.0 @@ -31,7 +31,7 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect - github.com/hashicorp/go-plugin v1.4.10 // indirect + github.com/hashicorp/go-plugin v1.5.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -53,18 +53,16 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect - github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect - github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.12.0 // indirect - golang.org/x/net v0.14.0 // indirect + golang.org/x/net v0.15.0 // indirect golang.org/x/sync v0.3.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index 3753ac0d..5a82333f 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -46,6 +46,7 @@ github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -148,8 +149,8 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-plugin v1.4.10 h1:xUbmA4jC6Dq163/fWcp8P3JuHilrHHMLNRxzGQJ9hNk= -github.com/hashicorp/go-plugin v1.4.10/go.mod h1:6/1TEzT0eQznvI/gV2CM29DLSkAK/e58mUWKVsPaph0= +github.com/hashicorp/go-plugin v1.5.0 h1:g6Lj3USwF5LaB8HlvCxPjN2X4nFE08ko2BJNVpl7TIE= +github.com/hashicorp/go-plugin v1.5.0/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -167,9 +168,9 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= -github.com/jaegertracing/jaeger v1.48.0 h1:YuKooQ7qJsjgxws9xuf8C/BLNTPx8qTAJz4wv7IHhSc= -github.com/jaegertracing/jaeger v1.48.0/go.mod h1:BoAPkdCAIEuLsVz/EDhjXd+GSVpHtJhiGqWoFEvBCKg= -github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= +github.com/jaegertracing/jaeger v1.49.0 h1:3XI8ZOK6oncyoAxCiKakC9sRaeDTdDwmxmaSN+KQBo8= +github.com/jaegertracing/jaeger v1.49.0/go.mod h1:gU5wCSJSwk5MJHO/uWEBYKklT80oqEc2ixj3ssbwloQ= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -257,10 +258,6 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= -github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= -github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -276,12 +273,12 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= -go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= +go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= 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/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= @@ -365,8 +362,8 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -431,8 +428,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -442,8 +439,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= diff --git a/otel2influx/go.mod b/otel2influx/go.mod index d12ec878..f5241294 100644 --- a/otel2influx/go.mod +++ b/otel2influx/go.mod @@ -3,11 +3,11 @@ module github.com/influxdata/influxdb-observability/otel2influx go 1.19 require ( - github.com/influxdata/influxdb-observability/common v0.5.5 + github.com/influxdata/influxdb-observability/common v0.5.7 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.84.0 + go.opentelemetry.io/collector/consumer v0.85.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.84.0 + go.opentelemetry.io/collector/semconv v0.85.0 go.uber.org/multierr v1.11.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 ) @@ -20,9 +20,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/net v0.14.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/otel2influx/go.sum b/otel2influx/go.sum index 3d3f0ae5..86dfa541 100644 --- a/otel2influx/go.sum +++ b/otel2influx/go.sum @@ -29,13 +29,13 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.84.0 h1:zzsegdPlDR0iJufPsHTJhXkv9q2kbpTTTI6nTyya2wA= -go.opentelemetry.io/collector/consumer v0.84.0 h1:sz8mXIdPACJArlRyFNXA1SScVoo954IU1qp9V78VUxc= -go.opentelemetry.io/collector/consumer v0.84.0/go.mod h1:Mu+KeuorwHHWd6iGxU7DMAhgsHZmmzmQgf3sSWkugmM= +go.opentelemetry.io/collector v0.85.0 h1:I037iYQ2FlAOKmaesT5Hgy7VazJO5oO4rcHSgc1+K8A= +go.opentelemetry.io/collector/consumer v0.85.0 h1:YG1yQHhuLWLNANyRIqM6QasVFKanDI/p51mcjXV8+k8= +go.opentelemetry.io/collector/consumer v0.85.0/go.mod h1:Ysc7XgJDZuNkyyvQVKz+/e6R3Z7haiOcFNsjkgmBSHY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= -go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= +go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -49,20 +49,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= 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.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile index 30dbffad..d0e2cb5e 100644 --- a/otelcol-influxdb/Dockerfile +++ b/otelcol-influxdb/Dockerfile @@ -7,7 +7,7 @@ RUN \ --mount=type=cache,id=influxdb-observability-gocache,sharing=locked,target=/root/.cache/go-build \ --mount=type=cache,id=influxdb-observability-gomodcache,sharing=locked,target=/go/pkg/mod \ du -cshx /root/.cache/go-build /go/pkg/mod && \ - go install go.opentelemetry.io/collector/cmd/builder@v0.84.0 && \ + go install go.opentelemetry.io/collector/cmd/builder@v0.85.0 && \ du -cshx /root/.cache/go-build /go/pkg/mod COPY . /project diff --git a/otelcol-influxdb/build.yml b/otelcol-influxdb/build.yml index 5a822319..20e8ddd2 100644 --- a/otelcol-influxdb/build.yml +++ b/otelcol-influxdb/build.yml @@ -2,39 +2,39 @@ dist: name: otelcol-influxdb module: github.com/influxdata/influxdb-observability/otelcol-influxdb description: OpenTelemetry Collector Distribution built for InfluxDB - version: 0.84.0-0.0.0-beta.0 - otelcol_version: 0.84.0 + version: 0.85.0-0.0.0-beta.0 + otelcol_version: 0.85.0 output_path: ./build receivers: -- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.84.0 +- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.85.0 exporters: -- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.84.0 +- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.85.0 connectors: -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.84.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.85.0 extensions: -- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.84.0 -- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.84.0 +- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.85.0 +- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.85.0 processors: -- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.84.0 -- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.84.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.84.0 +- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.85.0 +- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.85.0 replaces: - github.com/influxdata/influxdb-observability/common => ../../common diff --git a/run-checks.sh b/run-checks.sh index 328d8979..6980bf19 100755 --- a/run-checks.sh +++ b/run-checks.sh @@ -18,7 +18,7 @@ if ! hash staticcheck; then fi if ! hash builder; then echo "installing the opentelemetry collector builder" - if ! go install go.opentelemetry.io/collector/cmd/builder@v0.84.0; then + if ! go install go.opentelemetry.io/collector/cmd/builder@v0.85.0; then echo "failed to install the opentelemetry collector builder" exit 1 fi diff --git a/tests-integration/go.mod b/tests-integration/go.mod index 7ebf21b6..a8b77d4a 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -6,22 +6,22 @@ require ( github.com/influxdata/influxdb/v2 v2.6.1 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/influxdata/telegraf v1.27.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.84.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.84.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.85.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.85.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.84.0 - go.opentelemetry.io/collector/component v0.84.0 - go.opentelemetry.io/collector/confmap v0.84.0 - go.opentelemetry.io/collector/consumer v0.84.0 - go.opentelemetry.io/collector/exporter v0.84.0 - go.opentelemetry.io/collector/extension v0.84.0 + go.opentelemetry.io/collector v0.85.0 + go.opentelemetry.io/collector/component v0.85.0 + go.opentelemetry.io/collector/confmap v0.85.0 + go.opentelemetry.io/collector/consumer v0.85.0 + go.opentelemetry.io/collector/exporter v0.85.0 + go.opentelemetry.io/collector/extension v0.85.0 go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/processor v0.84.0 - go.opentelemetry.io/collector/receiver v0.84.0 + go.opentelemetry.io/collector/processor v0.85.0 + go.opentelemetry.io/collector/receiver v0.85.0 go.uber.org/zap v1.25.0 - google.golang.org/grpc v1.57.0 + google.golang.org/grpc v1.58.0 ) require ( @@ -57,8 +57,8 @@ require ( github.com/gosnmp/gosnmp v1.35.1-0.20230602062452-f30602b8dad6 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/influxdata/influxdb-observability/common v0.5.6 // indirect - github.com/influxdata/influxdb-observability/influx2otel v0.5.6 // indirect + github.com/influxdata/influxdb-observability/common v0.5.7 // indirect + github.com/influxdata/influxdb-observability/influx2otel v0.5.7 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.5.6 // indirect github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -76,8 +76,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.16.0 // indirect @@ -86,7 +86,7 @@ require ( github.com/prometheus/procfs v0.11.0 // indirect github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - github.com/rs/cors v1.9.0 // indirect + github.com/rs/cors v1.10.0 // indirect github.com/shirou/gopsutil/v3 v3.23.7 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect @@ -100,42 +100,41 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.84.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.84.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.84.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.84.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.84.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.84.0 // indirect - go.opentelemetry.io/collector/config/internal v0.84.0 // indirect - go.opentelemetry.io/collector/connector v0.84.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.84.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.85.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.85.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.85.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.85.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.85.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.85.0 // indirect + go.opentelemetry.io/collector/config/internal v0.85.0 // indirect + go.opentelemetry.io/collector/connector v0.85.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.85.0 // indirect go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/collector/semconv v0.84.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect + go.opentelemetry.io/collector/semconv v0.85.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect - go.opentelemetry.io/otel v1.16.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect - go.opentelemetry.io/otel/metric v1.16.0 // indirect - go.opentelemetry.io/otel/sdk v1.16.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect - go.opentelemetry.io/otel/trace v1.16.0 // indirect + go.opentelemetry.io/otel v1.17.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 // indirect + go.opentelemetry.io/otel/metric v1.17.0 // indirect + go.opentelemetry.io/otel/sdk v1.17.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.40.0 // indirect + go.opentelemetry.io/otel/trace v1.17.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.12.0 // indirect + golang.org/x/crypto v0.13.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect - golang.org/x/net v0.14.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/text v0.12.0 // indirect + golang.org/x/net v0.15.0 // indirect + golang.org/x/sys v0.12.0 // indirect + golang.org/x/text v0.13.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230720185612-659f7aaaa771 // indirect diff --git a/tests-integration/go.sum b/tests-integration/go.sum index ba3a8bb0..95300860 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -982,17 +982,17 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0 h1:9G7QLkloZCu4Kz+YddCokyyHWoJwFH5iKMF2P5+hmFM= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.84.0/go.mod h1:HlqBRg9x9ZSaL4rnaC5OeFMlQBHgj/IjgxzF3n021yk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0 h1:Z6mmJnj4t47FLifxesZsuGN9mZRCT6pUY5Y5g8SWJkw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.84.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.84.0 h1:EMdLjuWUpbkbYQ/lEg+qZk3lGEG2iPiU+t6g7g/J/5s= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0 h1:NXzx/YViPbapdfI0RZ2RJk4XgKU099Ci9rGBsZ/div8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.84.0/go.mod h1:t7+PIcvZwI9599uzwRVpJbJBUbOLBmvs0cIVse8djaA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0 h1:Zuk1i/92HvV5cI6dtsG/VWSKwaLGh17q9a26qP9DBbo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.84.0/go.mod h1:WoSzL9NAVwvEy1lMwM2utn68g0Khoxm591WliToPnDQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.84.0 h1:uetVWFWQM4Se1zIfgrNhHcCBqN6nt89Ts8Rb4axbqlc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.84.0/go.mod h1:an1T53ly6lhlwFRX5oQhvZr7GzkTzL6FGfAMeuerkKI= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0 h1:JTHKAQLFae3rIXUFPuW9I2uvTlS2FAx2D2t5yTMH0+I= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0/go.mod h1:AOMyqzzvJNqas262U8YuWZhSae+zW2f74/+yuy4zEso= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0 h1:LSh3CEsFBQJykzrnAzFP2RhdWTR8tpPiQYa3Cjl5+oI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 h1:syi7DOno9/zo5t90bdqQe9EhFMjeozS2RT1A2Ty/bVM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 h1:M8jCisGDhD0WbSwaA54pIX7WTn9/x/wAcUEXtTRExbw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0/go.mod h1:DvfKdx5R9XmbgOUi2WyyT3pqLVvIShOlPwve75UoIu8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 h1:spVx9VQV8KV6EsvyeBjoz7lfZxApg0InR8Ju6j3Yyk0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0/go.mod h1:h5h6CZwte3hBoitlWffAO2OHtc38jBRdr1UAS9hyXFs= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.85.0 h1:wXI/yTQepNBPFibMOKvd/aiSJIVKO1821c3xvFXr714= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.85.0/go.mod h1:yzLHd4/dFlITs23myYTGA2joZYL0wCfy8dfEH3l9oqA= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1119,8 +1119,8 @@ github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE= -github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8= +github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -1282,85 +1282,83 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.84.0 h1:zzsegdPlDR0iJufPsHTJhXkv9q2kbpTTTI6nTyya2wA= -go.opentelemetry.io/collector v0.84.0/go.mod h1:+cv/zxludfiiDuK3z+5eXkxAJhkCCcy8Chtvv0nOlr0= -go.opentelemetry.io/collector/component v0.84.0 h1:bh4Is5Z7TjuyF7Mab0rSNh2q3y15fImdNDRXqrqGlbA= -go.opentelemetry.io/collector/component v0.84.0/go.mod h1:uXteRaacYXXYhzeCJe5ClLz5gLzleXWz01IZ730w7FA= -go.opentelemetry.io/collector/config/configauth v0.84.0 h1:N2cnOZYJ3DKg4NF28qLqrDj5Arl8IFt2rK3voDImTUU= -go.opentelemetry.io/collector/config/configauth v0.84.0/go.mod h1:8Uoq8FyFLhlELIHApKwGa9mhhTtQKGAfKDcBAw1aM8M= -go.opentelemetry.io/collector/config/configcompression v0.84.0 h1:NyyBsDlZDLKY6/+Ki2T5muQII6bq4ZGNMHTz9XKLskI= -go.opentelemetry.io/collector/config/configcompression v0.84.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= -go.opentelemetry.io/collector/config/confighttp v0.84.0 h1:SQK89DAe4VSACnMN79opyzEZa8DaN206nNsQbjbeu60= -go.opentelemetry.io/collector/config/confighttp v0.84.0/go.mod h1:lC4RRRZSAqDbppfKKtATQ8nZtC4wYowvpkXwYhnHkFY= -go.opentelemetry.io/collector/config/confignet v0.84.0 h1:AGaAdhKgV/lxNxHL/RqqpKjVGuIPSO8whTZyBbP3KK0= -go.opentelemetry.io/collector/config/configopaque v0.84.0 h1:EjALh+TaICWGcHAwTV87niSgWoI3fTQ3h6ureyo8ksw= -go.opentelemetry.io/collector/config/configopaque v0.84.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= -go.opentelemetry.io/collector/config/configtelemetry v0.84.0 h1:pnZiYtppJN6SlzJNcrkA8R+Ur63e33qMO260m8JbK18= -go.opentelemetry.io/collector/config/configtelemetry v0.84.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= -go.opentelemetry.io/collector/config/configtls v0.84.0 h1:0rE1cdCLBx98nm6UgHnWFbytY0leZi/dr5bJ+i6Zup0= -go.opentelemetry.io/collector/config/configtls v0.84.0/go.mod h1:7zgWZBbH1+ZZLxNzDS+Kz0Em9dAXdlYmRqjXTWxZK2o= -go.opentelemetry.io/collector/config/internal v0.84.0 h1:LX1gO0q3+/y8JeRCOnYuMiF73gLZ7CwMSiov8Cqmumw= -go.opentelemetry.io/collector/config/internal v0.84.0/go.mod h1:XN8Y+Vhq/RqxGry7CGKwhMXJptUrmWTHdC6ZeI+Uy9E= -go.opentelemetry.io/collector/confmap v0.84.0 h1:fS62yIRrsTQwe1gyuEc8TQM0yUNfSAzPVi0A1665ZpQ= -go.opentelemetry.io/collector/confmap v0.84.0/go.mod h1:/SNHqYkLagF0TjBjQyCy2Gt3ZF6hTK8VKbaan/ZHuJs= -go.opentelemetry.io/collector/connector v0.84.0 h1:glvKR5FCHX/KuXKrItzVhSNaP3/n19LHrewaaFaRnWI= -go.opentelemetry.io/collector/connector v0.84.0/go.mod h1:VzBR1lHPntgGZkTYry35xyEtJLeHB8nQ/pcEeSt54H0= -go.opentelemetry.io/collector/consumer v0.84.0 h1:sz8mXIdPACJArlRyFNXA1SScVoo954IU1qp9V78VUxc= -go.opentelemetry.io/collector/consumer v0.84.0/go.mod h1:Mu+KeuorwHHWd6iGxU7DMAhgsHZmmzmQgf3sSWkugmM= -go.opentelemetry.io/collector/exporter v0.84.0 h1:OWvHJghs7/R6Qwr2fh7HrgEqsIUbCgLddLQsmqN95kM= -go.opentelemetry.io/collector/exporter v0.84.0/go.mod h1:Bz7MTaVosTIz6ZISszKYLDOewjathUJuVgT5W4Ee/wU= -go.opentelemetry.io/collector/extension v0.84.0 h1:HN4otmncTE/eaeRcvBGTf0ApcX+dIQWsnShs6bgiKYA= -go.opentelemetry.io/collector/extension v0.84.0/go.mod h1:FoUzonXMAjVbFuSLM06F1260iVcbnMLMAEQk/xBfN1Y= -go.opentelemetry.io/collector/extension/auth v0.84.0 h1:e6IgIzLFdtTBImOC2qtH64PP/D/U6it3azMrAQ3/22I= -go.opentelemetry.io/collector/extension/auth v0.84.0/go.mod h1:eYm6kN05PyJrNjousma3CXiwzBsI582tlKjF9AUxnpQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.84.0 h1:huytVHKFVKDQBnLvy5tL/AUmzE3ydOwPClOZq1iZp50= +go.opentelemetry.io/collector v0.85.0 h1:I037iYQ2FlAOKmaesT5Hgy7VazJO5oO4rcHSgc1+K8A= +go.opentelemetry.io/collector v0.85.0/go.mod h1:jcETa0UJmwkDSyhkOTwQi8rgie1M3TjsIO98KeGM2vk= +go.opentelemetry.io/collector/component v0.85.0 h1:RdeUDdX3prvkf0PFFbhMjWLsYUJdxy/d0oovOuObRDs= +go.opentelemetry.io/collector/component v0.85.0/go.mod h1:C3CWpjYa+k7Vjkqes/8abJ/fkCn6FlR1sNkW4QPd+kI= +go.opentelemetry.io/collector/config/configauth v0.85.0 h1:KJquqyQ/Am3wgyOEhLHAYmLix1Mow7zUORNKitUv6GQ= +go.opentelemetry.io/collector/config/configauth v0.85.0/go.mod h1:+NTOnvvrYtuLUu5e0dM9luKjeyzHf+DPK9MEP/S24Vk= +go.opentelemetry.io/collector/config/configcompression v0.85.0 h1:QWqDla4mE+pDV+97vnA8OpBxX4VJxllsi1DSMN2M0mo= +go.opentelemetry.io/collector/config/configcompression v0.85.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= +go.opentelemetry.io/collector/config/confighttp v0.85.0 h1:CwY8qLcMdRshKCPzdZX6UnH5QU4YwuXtLNt/E6if+LY= +go.opentelemetry.io/collector/config/confighttp v0.85.0/go.mod h1:T+UpZ+VwkayTaFOAANa4nkUx1P3YlYdR6gx6mSoEwsU= +go.opentelemetry.io/collector/config/confignet v0.85.0 h1:oo+P10MC5wWvSfN5NyZFqVXQCvVNfAwf0SIRDcFRuJ0= +go.opentelemetry.io/collector/config/configopaque v0.85.0 h1:FdQCf88Vq2yX7kiRswN00t/oGY+BbRCaAd0paG0if1A= +go.opentelemetry.io/collector/config/configopaque v0.85.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= +go.opentelemetry.io/collector/config/configtelemetry v0.85.0 h1:hxKBwHEK4enl4YKtdZCq2rxxIKHrccoChoZlVgG8vbI= +go.opentelemetry.io/collector/config/configtelemetry v0.85.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= +go.opentelemetry.io/collector/config/configtls v0.85.0 h1:oYXJ5Je0218tXyJef1ri98HDEORPdToO4rM1C7D+1YI= +go.opentelemetry.io/collector/config/configtls v0.85.0/go.mod h1:IZJrxrpGoNb5W8U1ihe2lLOp0KdtBYPC6z2aoaBrRPo= +go.opentelemetry.io/collector/config/internal v0.85.0 h1:Pjr2XMqSLCHXsmzZrW7zVZf1VBcal84tYNDoEsu8loA= +go.opentelemetry.io/collector/config/internal v0.85.0/go.mod h1:XN8Y+Vhq/RqxGry7CGKwhMXJptUrmWTHdC6ZeI+Uy9E= +go.opentelemetry.io/collector/confmap v0.85.0 h1:xyshTMElkpCJRCbg9OyGL41f7ToCr+PRBJKuAbGR17I= +go.opentelemetry.io/collector/confmap v0.85.0/go.mod h1:/SNHqYkLagF0TjBjQyCy2Gt3ZF6hTK8VKbaan/ZHuJs= +go.opentelemetry.io/collector/connector v0.85.0 h1:eiDGlbhjRCrhZlgcIbm5fizKBnZ4t7P6bjgehldKx88= +go.opentelemetry.io/collector/connector v0.85.0/go.mod h1:2CK6s5lepQ59In8bBw6UmAknBCVxXQY9Xg6hCxJQjlQ= +go.opentelemetry.io/collector/consumer v0.85.0 h1:YG1yQHhuLWLNANyRIqM6QasVFKanDI/p51mcjXV8+k8= +go.opentelemetry.io/collector/consumer v0.85.0/go.mod h1:Ysc7XgJDZuNkyyvQVKz+/e6R3Z7haiOcFNsjkgmBSHY= +go.opentelemetry.io/collector/exporter v0.85.0 h1:06RnmrcEiBG3xhhGcGNT+hEk/j/4XtHavlMIxZcJHQE= +go.opentelemetry.io/collector/exporter v0.85.0/go.mod h1:4RNnq8xd6OBmc10XUF/K+NLUMfRiXrus+XRpAZeoLuA= +go.opentelemetry.io/collector/extension v0.85.0 h1:izKozTZ4vOnYdMGhu0ROV69hXCptH6DI8JVkN/ZOEJQ= +go.opentelemetry.io/collector/extension v0.85.0/go.mod h1:l5zRPdhtmBjRmPeOhxJsZ/GRIimq4/HIAq/Rgf70W+o= +go.opentelemetry.io/collector/extension/auth v0.85.0 h1:mMZfNUCeWaXnQY85gepFA9uhzsEf0AAnAE4/Oblx/Wc= +go.opentelemetry.io/collector/extension/auth v0.85.0/go.mod h1:TBe1YtL27cc7liJFpamMhkmMVOEzR5/ccavvQFlLkAQ= +go.opentelemetry.io/collector/extension/zpagesextension v0.85.0 h1:nhcOh4HAKOmOHEnZjCcicv3GXy9L7IKKXMkKMt54qm4= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 h1:C9o0mbP0MyygqFnKueVQK/v9jef6zvuttmTGlKaqhgw= go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/processor v0.84.0 h1:6VM5HLdkroeqNZ/jvjxA4nsgweJ87FDMsnNnzVBHpcY= -go.opentelemetry.io/collector/processor v0.84.0/go.mod h1:KWgBNQuA6wmmRqJwfvPaRybK2Di9X8nE2fraGuVLNJo= -go.opentelemetry.io/collector/receiver v0.84.0 h1:5bN0A18UMAVu9AsFv5AYDgzEFEJ/nFaD1OK2rk7Ygy0= -go.opentelemetry.io/collector/receiver v0.84.0/go.mod h1:QvjpfmMUA4tW59QJBagoNEbRT5JGYZN333GAOuWIRr4= -go.opentelemetry.io/collector/semconv v0.84.0 h1:sI1B8ebHhfJPd87iyba66TDnluVFvYu8CEpSjKHqIDc= -go.opentelemetry.io/collector/semconv v0.84.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 h1:pginetY7+onl4qN1vl0xW/V/v6OBZ0vVdH+esuJgvmM= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0/go.mod h1:XiYsayHc36K3EByOO6nbAXnAWbrUxdjUROCEeeROOH8= +go.opentelemetry.io/collector/processor v0.85.0 h1:vN3A+E/rm6nCkx9iM+kjlMzXAtE0a2vP1JhF9oqLjZQ= +go.opentelemetry.io/collector/processor v0.85.0/go.mod h1:jp9vOjg9dS13zUy1ma6C4u4hGTdbp2GKb9xp5bX2krc= +go.opentelemetry.io/collector/receiver v0.85.0 h1:ecDJicAq1mbQcsEkzo1q+6Y2DP8plK51y4p4w7ZhNmA= +go.opentelemetry.io/collector/receiver v0.85.0/go.mod h1:6pmub7FpyQIAcCLmijUtelzWD9Jj8Csno7W+3FBQFJo= +go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= +go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 h1:HKORGpiOY0R0nAPtKx/ub8/7XoHhRooP8yNRkuPfelI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0/go.mod h1:e+y1M74SYXo/FcIx3UATwth2+5dDkM8dBi7eXg1tbw8= go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc= -go.opentelemetry.io/contrib/zpages v0.42.0 h1:hFscXKQ9PTjyIVmAr6zIV8cMoiEeR9lPIwPVqHi8+5Q= -go.opentelemetry.io/otel v1.16.0 h1:Z7GVAX/UkAXPKsy94IU+i6thsQS4nb7LviLpnaNeW8s= -go.opentelemetry.io/otel v1.16.0/go.mod h1:vl0h9NUa1D5s1nv3A5vZOYWn8av4K8Ml6JDeHrT/bx4= -go.opentelemetry.io/otel/bridge/opencensus v0.39.0 h1:YHivttTaDhbZIHuPlg1sWsy2P5gj57vzqPfkHItgbwQ= -go.opentelemetry.io/otel/bridge/opencensus v0.39.0/go.mod h1:vZ4537pNjFDXEx//WldAR6Ro2LC8wwmFC76njAXwNPE= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 h1:t4ZwRPU+emrcvM2e9DHd0Fsf0JTPVcbfa/BhTDF03d0= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0/go.mod h1:vLarbg68dH2Wa77g71zmKQqlQ8+8Rq3GRG31uc0WcWI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 h1:f6BwB2OACc3FCbYVznctQ9V6KK7Vq6CjmYXJ7DeSs4E= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0/go.mod h1:UqL5mZ3qs6XYhDnZaW1Ps4upD+PX6LipH40AoeuIlwU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 h1:rm+Fizi7lTM2UefJ1TO347fSRcwmIsUAaZmYmIGBRAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0/go.mod h1:sWFbI3jJ+6JdjOVepA5blpv/TJ20Hw+26561iMbWcwU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 h1:IZXpCEtI7BbX01DRQEWTGDkvjMB6hEhiEZXS+eg2YqY= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0/go.mod h1:xY111jIZtWb+pUUgT4UiiSonAaY2cD2Ts5zvuKLki3o= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 h1:cbsD4cUcviQGXdw8+bo5x2wazq10SKz8hEbtCRPcU78= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0/go.mod h1:JgXSGah17croqhJfhByOLVY719k1emAXC8MVhCIJlRs= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 h1:TVQp/bboR4mhZSav+MdgXB8FaRho1RC8UwVn3T0vjVc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0/go.mod h1:I33vtIe0sR96wfrUcilIzLoA3mLHhRmz9S9Te0S3gDo= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 h1:iqjq9LAB8aK++sKVcELezzn655JnBNdsDhghU4G/So8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0/go.mod h1:hGXzO5bhhSHZnKvrDaXB82Y9DRFour0Nz/KrBh7reWw= -go.opentelemetry.io/otel/exporters/prometheus v0.39.0 h1:whAaiHxOatgtKd+w0dOi//1KUxj3KoPINZdtDaDj3IA= -go.opentelemetry.io/otel/exporters/prometheus v0.39.0/go.mod h1:4jo5Q4CROlCpSPsXLhymi+LYrDXd2ObU5wbKayfZs7Y= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 h1:fl2WmyenEf6LYYlfHAtCUEDyGcpwJNqD4dHGO7PVm4w= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0/go.mod h1:csyQxQ0UHHKVA8KApS7eUO/klMO5sd/av5CNZNU4O6w= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 h1:+XWJd3jf75RXJq29mxbuXhCXFDG3S3R4vBUeSI2P7tE= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0/go.mod h1:hqgzBPTf4yONMFgdZvL/bK42R/iinTyVQtiWihs3SZc= -go.opentelemetry.io/otel/metric v1.16.0 h1:RbrpwVG1Hfv85LgnZ7+txXioPDoh6EdbZHo26Q3hqOo= -go.opentelemetry.io/otel/metric v1.16.0/go.mod h1:QE47cpOmkwipPiefDwo2wDzwJrlfxxNYodqc4xnGCo4= -go.opentelemetry.io/otel/sdk v1.16.0 h1:Z1Ok1YsijYL0CSJpHt4cS3wDDh7p572grzNrBMiMWgE= -go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF9QD68aP6p4= -go.opentelemetry.io/otel/sdk/metric v0.39.0 h1:Kun8i1eYf48kHH83RucG93ffz0zGV1sh46FAScOTuDI= -go.opentelemetry.io/otel/sdk/metric v0.39.0/go.mod h1:piDIRgjcK7u0HCL5pCA4e74qpK/jk3NiUoAHATVAmiI= -go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZEu5MQs= -go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= +go.opentelemetry.io/contrib/zpages v0.43.0 h1:3Vp9HDMY/lGe7UY8fDRGmwddCoAb7cACiAL2joIdJh8= +go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= +go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= +go.opentelemetry.io/otel/bridge/opencensus v0.40.0 h1:pqDiayRhBgoqy1vwnscik+TizcImJ58l053NScJyZso= +go.opentelemetry.io/otel/bridge/opencensus v0.40.0/go.mod h1:1NvVHb6tLTe5A9qCYz+eErW0t8iPn4ZfR6tDKcqlGTM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 h1:SZaSbubADNhH2Gxm+1GaZ/cFsGiYefZoodMMX79AOd4= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0/go.mod h1:N65FzQDfQH7NY7umgb0U+7ypGKVYKwwE24L6KXT4OA8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 h1:kvWMtSUNVylLVrOE4WLUmBtgziYoCIYUNSpTYtMzVJI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0/go.mod h1:SExUrRYIXhDgEKG4tkiQovd2HTaELiHUsuK08s5Nqx4= +go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e h1:eh19+pVw4g/V7QM/8iNDk3M5cNy3mOVzggEgdlt9jkY= +go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e/go.mod h1:5USWZ0ovyQB5CIM3IO3bGRSoDPMXiT3t+15gu8Zo9HQ= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 h1:hf7JSONqAuXT1PDYYlVhKNMPLe4060d+4RFREcv7X2c= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0/go.mod h1:IxD5qbw/XcnFB7i5k4d7J1aW5iBU2h4DgSxtk4YqR4c= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 h1:Ut6hgtYcASHwCzRHkXEtSsM251cXJPW+Z9DyLwEn6iI= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0/go.mod h1:TYeE+8d5CjrgBa0ZuRaDeMpIC1xZ7atg4g+nInjuSjc= +go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= +go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= +go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= +go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= +go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= +go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= +go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= +go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= @@ -1401,8 +1399,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= -golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= +golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= +golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1500,8 +1498,8 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= +golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1619,13 +1617,13 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1636,8 +1634,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1837,8 +1835,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o= +google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From 8b7a8bd7363ebf5e9a38a091cfb95b0e936f3acc Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Fri, 22 Sep 2023 10:38:10 -0700 Subject: [PATCH 11/13] chore: allow the docker workflow to be dispatched manually --- .github/workflows/docker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 34a11895..092ea1d1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,6 +4,7 @@ on: push: tags: - 'v*' + workflow_dispatch: jobs: docker: From bf4885ffdc2e1ba3a235b6abd9fdaeb954a6f619 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Wed, 27 Sep 2023 09:06:12 -0700 Subject: [PATCH 12/13] chore: update OpenTelemetry - OpenTelemetry v0.85.0 => v0.86.0 --- .github/workflows/ci.yml | 2 +- common/go.mod | 2 +- common/go.sum | 4 +- demo/docker-compose.yml | 4 +- influx2otel/go.mod | 12 +-- influx2otel/go.sum | 22 ++-- jaeger-influxdb/go.mod | 10 +- jaeger-influxdb/go.sum | 16 +-- otel2influx/go.mod | 12 +-- otel2influx/go.sum | 22 ++-- otelcol-influxdb/Dockerfile | 2 +- otelcol-influxdb/build.yml | 44 ++++---- run-checks.sh | 2 +- tests-integration/go.mod | 102 +++++++++--------- tests-integration/go.sum | 208 ++++++++++++++++++------------------ 15 files changed, 235 insertions(+), 229 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2531f13..1b8f7242 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,6 @@ jobs: - name: build run: > - go install go.opentelemetry.io/collector/cmd/builder@v0.85.0 && + go install go.opentelemetry.io/collector/cmd/builder@v0.86.0 && cd otelcol-influxdb && builder --config build.yml diff --git a/common/go.mod b/common/go.mod index aa56bd56..05bded18 100644 --- a/common/go.mod +++ b/common/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.85.0 + go.opentelemetry.io/collector/semconv v0.86.0 ) require ( diff --git a/common/go.sum b/common/go.sum index 26857e19..b46403b5 100644 --- a/common/go.sum +++ b/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= -go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= +go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index 31d0631c..a3bcd6ea 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -19,7 +19,7 @@ services: - ./demo/jaeger-ui-config.json:/jaeger-ui-config.json:ro jaeger-influxdb: - image: jacobmarble/jaeger-influxdb:0.5.2 + image: jacobmarble/jaeger-influxdb:0.5.9 stop_grace_period: 10s environment: LOG_LEVEL: info @@ -46,7 +46,7 @@ services: JAEGER_AGENT_PORT: 6831 otelcol-influxdb: - image: otel/opentelemetry-collector-contrib:0.85.0 + image: otel/opentelemetry-collector-contrib:0.86.0 command: [ "--config", "/config.yml" ] stop_grace_period: 10s volumes: diff --git a/influx2otel/go.mod b/influx2otel/go.mod index a40f6712..ad8fb587 100644 --- a/influx2otel/go.mod +++ b/influx2otel/go.mod @@ -3,12 +3,12 @@ module github.com/influxdata/influxdb-observability/influx2otel go 1.19 require ( - github.com/influxdata/influxdb-observability/common v0.5.7 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 + github.com/influxdata/influxdb-observability/common v0.5.8 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.85.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 + go.opentelemetry.io/collector/semconv v0.86.0 ) require ( @@ -25,7 +25,7 @@ require ( golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.58.0 // indirect + google.golang.org/grpc v1.58.1 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/influx2otel/go.sum b/influx2otel/go.sum index b663b4c3..5ff2a8b3 100644 --- a/influx2otel/go.sum +++ b/influx2otel/go.sum @@ -22,11 +22,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 h1:syi7DOno9/zo5t90bdqQe9EhFMjeozS2RT1A2Ty/bVM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 h1:M8jCisGDhD0WbSwaA54pIX7WTn9/x/wAcUEXtTRExbw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0/go.mod h1:DvfKdx5R9XmbgOUi2WyyT3pqLVvIShOlPwve75UoIu8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 h1:spVx9VQV8KV6EsvyeBjoz7lfZxApg0InR8Ju6j3Yyk0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0/go.mod h1:h5h6CZwte3hBoitlWffAO2OHtc38jBRdr1UAS9hyXFs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.86.0 h1:HEuJ7hCbLVfoL7xLrGQ2QORvocyFfWuaoDuzyTLwTdc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 h1:EzGSvuCXAsGpwgeieTVcy1gs0hOlPidhFPcvwcPEU8s= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0/go.mod h1:EL62K0jwPFXa3uxYeYMZGS1TSLR6AdGHRvM7RnRlosY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 h1:xt/YvYpgssWk2Ix2C9SSXrILIzRqyWe+r5RE348m1fE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0/go.mod h1:fjK1kn7PIDP+TqOIFVEth3w0Eiexx5jIk411c//fYkM= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -36,10 +36,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= -go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= +go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= +go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -75,8 +75,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o= -google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= +google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index 9a103aef..a0139e47 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/apache/arrow-adbc/go/adbc v0.6.0 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da - github.com/influxdata/influxdb-observability/common v0.5.7 + github.com/influxdata/influxdb-observability/common v0.5.8 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/jaegertracing/jaeger v1.49.0 github.com/mattn/go-isatty v0.0.18 @@ -13,11 +13,11 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.85.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 + go.opentelemetry.io/collector/semconv v0.86.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.25.0 - google.golang.org/grpc v1.57.0 + google.golang.org/grpc v1.58.1 ) require ( @@ -65,7 +65,7 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index 5a82333f..ec05a9bd 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -271,10 +271,10 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= -go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= +go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= +go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= @@ -564,8 +564,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -582,8 +582,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= +google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/otel2influx/go.mod b/otel2influx/go.mod index f5241294..68879a87 100644 --- a/otel2influx/go.mod +++ b/otel2influx/go.mod @@ -3,11 +3,11 @@ module github.com/influxdata/influxdb-observability/otel2influx go 1.19 require ( - github.com/influxdata/influxdb-observability/common v0.5.7 + github.com/influxdata/influxdb-observability/common v0.5.8 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.85.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/semconv v0.85.0 + go.opentelemetry.io/collector/consumer v0.86.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 + go.opentelemetry.io/collector/semconv v0.86.0 go.uber.org/multierr v1.11.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 ) @@ -23,8 +23,8 @@ require ( golang.org/x/net v0.15.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect - google.golang.org/grpc v1.57.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect + google.golang.org/grpc v1.58.1 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/otel2influx/go.sum b/otel2influx/go.sum index 86dfa541..9f12bcc6 100644 --- a/otel2influx/go.sum +++ b/otel2influx/go.sum @@ -29,13 +29,13 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.85.0 h1:I037iYQ2FlAOKmaesT5Hgy7VazJO5oO4rcHSgc1+K8A= -go.opentelemetry.io/collector/consumer v0.85.0 h1:YG1yQHhuLWLNANyRIqM6QasVFKanDI/p51mcjXV8+k8= -go.opentelemetry.io/collector/consumer v0.85.0/go.mod h1:Ysc7XgJDZuNkyyvQVKz+/e6R3Z7haiOcFNsjkgmBSHY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= -go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector v0.86.0 h1:Yxu0muUws9e7HG+5DDiYajkfAeOo/riUv0sJO4E9rXA= +go.opentelemetry.io/collector/consumer v0.86.0 h1:8AL9I30tJV01KfcSaa+8DTiARIiUDA8o2p7yQoSFUCs= +go.opentelemetry.io/collector/consumer v0.86.0/go.mod h1:SvoV1eto4VZzQ3ILKQ1rv4qgN8rUMJqupn78hoXLHRw= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= +go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= +go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -71,10 +71,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= +google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= +google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile index d0e2cb5e..fbd7838b 100644 --- a/otelcol-influxdb/Dockerfile +++ b/otelcol-influxdb/Dockerfile @@ -7,7 +7,7 @@ RUN \ --mount=type=cache,id=influxdb-observability-gocache,sharing=locked,target=/root/.cache/go-build \ --mount=type=cache,id=influxdb-observability-gomodcache,sharing=locked,target=/go/pkg/mod \ du -cshx /root/.cache/go-build /go/pkg/mod && \ - go install go.opentelemetry.io/collector/cmd/builder@v0.85.0 && \ + go install go.opentelemetry.io/collector/cmd/builder@v0.86.0 && \ du -cshx /root/.cache/go-build /go/pkg/mod COPY . /project diff --git a/otelcol-influxdb/build.yml b/otelcol-influxdb/build.yml index 20e8ddd2..45dfe5b3 100644 --- a/otelcol-influxdb/build.yml +++ b/otelcol-influxdb/build.yml @@ -2,39 +2,39 @@ dist: name: otelcol-influxdb module: github.com/influxdata/influxdb-observability/otelcol-influxdb description: OpenTelemetry Collector Distribution built for InfluxDB - version: 0.85.0-0.0.0-beta.0 - otelcol_version: 0.85.0 + version: 0.86.0-0.0.0-beta.0 + otelcol_version: 0.86.0 output_path: ./build receivers: -- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.85.0 +- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.86.0 exporters: -- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.85.0 +- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.86.0 connectors: -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.85.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.86.0 extensions: -- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.85.0 -- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.85.0 +- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.86.0 +- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.86.0 processors: -- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.85.0 -- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.85.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.85.0 +- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.86.0 +- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.86.0 replaces: - github.com/influxdata/influxdb-observability/common => ../../common diff --git a/run-checks.sh b/run-checks.sh index 6980bf19..2cc3315a 100755 --- a/run-checks.sh +++ b/run-checks.sh @@ -18,7 +18,7 @@ if ! hash staticcheck; then fi if ! hash builder; then echo "installing the opentelemetry collector builder" - if ! go install go.opentelemetry.io/collector/cmd/builder@v0.85.0; then + if ! go install go.opentelemetry.io/collector/cmd/builder@v0.86.0; then echo "failed to install the opentelemetry collector builder" exit 1 fi diff --git a/tests-integration/go.mod b/tests-integration/go.mod index a8b77d4a..bd12c8fd 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -6,22 +6,22 @@ require ( github.com/influxdata/influxdb/v2 v2.6.1 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/influxdata/telegraf v1.27.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.85.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.86.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.86.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.85.0 - go.opentelemetry.io/collector/component v0.85.0 - go.opentelemetry.io/collector/confmap v0.85.0 - go.opentelemetry.io/collector/consumer v0.85.0 - go.opentelemetry.io/collector/exporter v0.85.0 - go.opentelemetry.io/collector/extension v0.85.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 - go.opentelemetry.io/collector/processor v0.85.0 - go.opentelemetry.io/collector/receiver v0.85.0 - go.uber.org/zap v1.25.0 - google.golang.org/grpc v1.58.0 + go.opentelemetry.io/collector/component v0.86.0 + go.opentelemetry.io/collector/confmap v0.86.0 + go.opentelemetry.io/collector/consumer v0.86.0 + go.opentelemetry.io/collector/exporter v0.86.0 + go.opentelemetry.io/collector/extension v0.86.0 + go.opentelemetry.io/collector/otelcol v0.86.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 + go.opentelemetry.io/collector/processor v0.86.0 + go.opentelemetry.io/collector/receiver v0.86.0 + go.uber.org/zap v1.26.0 + google.golang.org/grpc v1.58.1 ) require ( @@ -57,12 +57,12 @@ require ( github.com/gosnmp/gosnmp v1.35.1-0.20230602062452-f30602b8dad6 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/influxdata/influxdb-observability/common v0.5.7 // indirect + github.com/influxdata/influxdb-observability/common v0.5.8 // indirect github.com/influxdata/influxdb-observability/influx2otel v0.5.7 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.5.6 // indirect github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/pgzip v1.2.6 // indirect github.com/knadh/koanf v1.5.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect @@ -76,8 +76,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.86.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.16.0 // indirect @@ -87,7 +87,7 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rs/cors v1.10.0 // indirect - github.com/shirou/gopsutil/v3 v3.23.7 // indirect + github.com/shirou/gopsutil/v3 v3.23.8 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sleepinggenius2/gosmi v0.4.4 // indirect @@ -95,39 +95,41 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/stoewer/go-strcase v1.2.0 // indirect github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 // indirect - github.com/tklauser/go-sysconf v0.3.11 // indirect - github.com/tklauser/numcpus v0.6.0 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.85.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.85.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.85.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.85.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.85.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.85.0 // indirect - go.opentelemetry.io/collector/config/internal v0.85.0 // indirect - go.opentelemetry.io/collector/connector v0.85.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.85.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 // indirect - go.opentelemetry.io/collector/semconv v0.85.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect - go.opentelemetry.io/otel v1.17.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 // indirect - go.opentelemetry.io/otel/metric v1.17.0 // indirect - go.opentelemetry.io/otel/sdk v1.17.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.40.0 // indirect - go.opentelemetry.io/otel/trace v1.17.0 // indirect + go.opentelemetry.io/collector v0.86.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.86.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.86.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.86.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.86.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.86.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.86.0 // indirect + go.opentelemetry.io/collector/config/internal v0.86.0 // indirect + go.opentelemetry.io/collector/connector v0.86.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.86.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 // indirect + go.opentelemetry.io/collector/semconv v0.86.0 // indirect + go.opentelemetry.io/collector/service v0.86.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.19.0 // indirect + go.opentelemetry.io/otel v1.18.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v0.41.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.41.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 // indirect + go.opentelemetry.io/otel/metric v1.18.0 // indirect + go.opentelemetry.io/otel/sdk v1.18.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.41.0 // indirect + go.opentelemetry.io/otel/trace v1.18.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.13.0 // indirect diff --git a/tests-integration/go.sum b/tests-integration/go.sum index 95300860..6a9aedc0 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -812,8 +812,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= @@ -982,17 +982,17 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0 h1:JTHKAQLFae3rIXUFPuW9I2uvTlS2FAx2D2t5yTMH0+I= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.85.0/go.mod h1:AOMyqzzvJNqas262U8YuWZhSae+zW2f74/+yuy4zEso= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0 h1:LSh3CEsFBQJykzrnAzFP2RhdWTR8tpPiQYa3Cjl5+oI= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.85.0/go.mod h1:6XJ+dV/QjwFJf55/2nnVfVqA+qwa8Y/iYR6taPJN7n0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.85.0 h1:syi7DOno9/zo5t90bdqQe9EhFMjeozS2RT1A2Ty/bVM= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0 h1:M8jCisGDhD0WbSwaA54pIX7WTn9/x/wAcUEXtTRExbw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.85.0/go.mod h1:DvfKdx5R9XmbgOUi2WyyT3pqLVvIShOlPwve75UoIu8= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0 h1:spVx9VQV8KV6EsvyeBjoz7lfZxApg0InR8Ju6j3Yyk0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.85.0/go.mod h1:h5h6CZwte3hBoitlWffAO2OHtc38jBRdr1UAS9hyXFs= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.85.0 h1:wXI/yTQepNBPFibMOKvd/aiSJIVKO1821c3xvFXr714= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.85.0/go.mod h1:yzLHd4/dFlITs23myYTGA2joZYL0wCfy8dfEH3l9oqA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0 h1:vuAWap/sYNrFO3bOYk88OdAh6C/W4NpHqn6DQBNUoJw= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0/go.mod h1:o8VZZbmu7vVq6bku63VJegMiG+RarlooFu8Yt6m3JdY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.86.0 h1:g7HlND105lwm7NW8JCxAfbpaFyk1WKcEUUVwchIo9zE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.86.0/go.mod h1:BTFCu+oeOnvPt/R6HQDW1S/duHuJcV5Xb0pbURCSMno= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.86.0 h1:HEuJ7hCbLVfoL7xLrGQ2QORvocyFfWuaoDuzyTLwTdc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 h1:EzGSvuCXAsGpwgeieTVcy1gs0hOlPidhFPcvwcPEU8s= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0/go.mod h1:EL62K0jwPFXa3uxYeYMZGS1TSLR6AdGHRvM7RnRlosY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 h1:xt/YvYpgssWk2Ix2C9SSXrILIzRqyWe+r5RE348m1fE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0/go.mod h1:fjK1kn7PIDP+TqOIFVEth3w0Eiexx5jIk411c//fYkM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.86.0 h1:evSOdq9M+JjxUGbC358jIsvrtJuN8pQStXDP32/rEcE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.86.0/go.mod h1:pAaB/eQMGg3rwFwmBV9GINWSYIulM0rkx30fDbQGhfg= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1136,8 +1136,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shirou/gopsutil/v3 v3.23.7 h1:C+fHO8hfIppoJ1WdsVm1RoI0RwXoNdfTK7yWXV0wVj4= -github.com/shirou/gopsutil/v3 v3.23.7/go.mod h1:c4gnmoRC0hQuaLqvxnx1//VXQ0Ms/X9UnJF8pddY5z4= +github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE= +github.com/shirou/gopsutil/v3 v3.23.8/go.mod h1:7hmCaBn+2ZwaZOr6jmPBZDfawwMGuo1id3C6aM8EDqQ= 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= @@ -1214,10 +1214,10 @@ github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= -github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM= -github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= -github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms= -github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= +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-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/uber/jaeger-client-go v2.25.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= @@ -1282,83 +1282,87 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.85.0 h1:I037iYQ2FlAOKmaesT5Hgy7VazJO5oO4rcHSgc1+K8A= -go.opentelemetry.io/collector v0.85.0/go.mod h1:jcETa0UJmwkDSyhkOTwQi8rgie1M3TjsIO98KeGM2vk= -go.opentelemetry.io/collector/component v0.85.0 h1:RdeUDdX3prvkf0PFFbhMjWLsYUJdxy/d0oovOuObRDs= -go.opentelemetry.io/collector/component v0.85.0/go.mod h1:C3CWpjYa+k7Vjkqes/8abJ/fkCn6FlR1sNkW4QPd+kI= -go.opentelemetry.io/collector/config/configauth v0.85.0 h1:KJquqyQ/Am3wgyOEhLHAYmLix1Mow7zUORNKitUv6GQ= -go.opentelemetry.io/collector/config/configauth v0.85.0/go.mod h1:+NTOnvvrYtuLUu5e0dM9luKjeyzHf+DPK9MEP/S24Vk= -go.opentelemetry.io/collector/config/configcompression v0.85.0 h1:QWqDla4mE+pDV+97vnA8OpBxX4VJxllsi1DSMN2M0mo= -go.opentelemetry.io/collector/config/configcompression v0.85.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= -go.opentelemetry.io/collector/config/confighttp v0.85.0 h1:CwY8qLcMdRshKCPzdZX6UnH5QU4YwuXtLNt/E6if+LY= -go.opentelemetry.io/collector/config/confighttp v0.85.0/go.mod h1:T+UpZ+VwkayTaFOAANa4nkUx1P3YlYdR6gx6mSoEwsU= -go.opentelemetry.io/collector/config/confignet v0.85.0 h1:oo+P10MC5wWvSfN5NyZFqVXQCvVNfAwf0SIRDcFRuJ0= -go.opentelemetry.io/collector/config/configopaque v0.85.0 h1:FdQCf88Vq2yX7kiRswN00t/oGY+BbRCaAd0paG0if1A= -go.opentelemetry.io/collector/config/configopaque v0.85.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= -go.opentelemetry.io/collector/config/configtelemetry v0.85.0 h1:hxKBwHEK4enl4YKtdZCq2rxxIKHrccoChoZlVgG8vbI= -go.opentelemetry.io/collector/config/configtelemetry v0.85.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= -go.opentelemetry.io/collector/config/configtls v0.85.0 h1:oYXJ5Je0218tXyJef1ri98HDEORPdToO4rM1C7D+1YI= -go.opentelemetry.io/collector/config/configtls v0.85.0/go.mod h1:IZJrxrpGoNb5W8U1ihe2lLOp0KdtBYPC6z2aoaBrRPo= -go.opentelemetry.io/collector/config/internal v0.85.0 h1:Pjr2XMqSLCHXsmzZrW7zVZf1VBcal84tYNDoEsu8loA= -go.opentelemetry.io/collector/config/internal v0.85.0/go.mod h1:XN8Y+Vhq/RqxGry7CGKwhMXJptUrmWTHdC6ZeI+Uy9E= -go.opentelemetry.io/collector/confmap v0.85.0 h1:xyshTMElkpCJRCbg9OyGL41f7ToCr+PRBJKuAbGR17I= -go.opentelemetry.io/collector/confmap v0.85.0/go.mod h1:/SNHqYkLagF0TjBjQyCy2Gt3ZF6hTK8VKbaan/ZHuJs= -go.opentelemetry.io/collector/connector v0.85.0 h1:eiDGlbhjRCrhZlgcIbm5fizKBnZ4t7P6bjgehldKx88= -go.opentelemetry.io/collector/connector v0.85.0/go.mod h1:2CK6s5lepQ59In8bBw6UmAknBCVxXQY9Xg6hCxJQjlQ= -go.opentelemetry.io/collector/consumer v0.85.0 h1:YG1yQHhuLWLNANyRIqM6QasVFKanDI/p51mcjXV8+k8= -go.opentelemetry.io/collector/consumer v0.85.0/go.mod h1:Ysc7XgJDZuNkyyvQVKz+/e6R3Z7haiOcFNsjkgmBSHY= -go.opentelemetry.io/collector/exporter v0.85.0 h1:06RnmrcEiBG3xhhGcGNT+hEk/j/4XtHavlMIxZcJHQE= -go.opentelemetry.io/collector/exporter v0.85.0/go.mod h1:4RNnq8xd6OBmc10XUF/K+NLUMfRiXrus+XRpAZeoLuA= -go.opentelemetry.io/collector/extension v0.85.0 h1:izKozTZ4vOnYdMGhu0ROV69hXCptH6DI8JVkN/ZOEJQ= -go.opentelemetry.io/collector/extension v0.85.0/go.mod h1:l5zRPdhtmBjRmPeOhxJsZ/GRIimq4/HIAq/Rgf70W+o= -go.opentelemetry.io/collector/extension/auth v0.85.0 h1:mMZfNUCeWaXnQY85gepFA9uhzsEf0AAnAE4/Oblx/Wc= -go.opentelemetry.io/collector/extension/auth v0.85.0/go.mod h1:TBe1YtL27cc7liJFpamMhkmMVOEzR5/ccavvQFlLkAQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.85.0 h1:nhcOh4HAKOmOHEnZjCcicv3GXy9L7IKKXMkKMt54qm4= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014 h1:C9o0mbP0MyygqFnKueVQK/v9jef6zvuttmTGlKaqhgw= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014/go.mod h1:0mE3mDLmUrOXVoNsuvj+7dV14h/9HFl/Fy9YTLoLObo= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 h1:iT5qH0NLmkGeIdDtnBogYDx7L58t6CaWGL378DEo2QY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0014/go.mod h1:BRvDrx43kiSoUx3mr7SoA7h9B8+OY99mUK+CZSQFWW4= -go.opentelemetry.io/collector/processor v0.85.0 h1:vN3A+E/rm6nCkx9iM+kjlMzXAtE0a2vP1JhF9oqLjZQ= -go.opentelemetry.io/collector/processor v0.85.0/go.mod h1:jp9vOjg9dS13zUy1ma6C4u4hGTdbp2GKb9xp5bX2krc= -go.opentelemetry.io/collector/receiver v0.85.0 h1:ecDJicAq1mbQcsEkzo1q+6Y2DP8plK51y4p4w7ZhNmA= -go.opentelemetry.io/collector/receiver v0.85.0/go.mod h1:6pmub7FpyQIAcCLmijUtelzWD9Jj8Csno7W+3FBQFJo= -go.opentelemetry.io/collector/semconv v0.85.0 h1:TVXgaWeYADXnytlhNq44zyv2W9m3VodBR1ffiMFDusI= -go.opentelemetry.io/collector/semconv v0.85.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0 h1:HKORGpiOY0R0nAPtKx/ub8/7XoHhRooP8yNRkuPfelI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.43.0/go.mod h1:e+y1M74SYXo/FcIx3UATwth2+5dDkM8dBi7eXg1tbw8= -go.opentelemetry.io/contrib/propagators/b3 v1.17.0 h1:ImOVvHnku8jijXqkwCSyYKRDt2YrnGXD4BbhcpfbfJo= -go.opentelemetry.io/contrib/propagators/b3 v1.17.0/go.mod h1:IkfUfMpKWmynvvE0264trz0sf32NRTZL4nuAN9AbWRc= -go.opentelemetry.io/contrib/zpages v0.43.0 h1:3Vp9HDMY/lGe7UY8fDRGmwddCoAb7cACiAL2joIdJh8= -go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= -go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= -go.opentelemetry.io/otel/bridge/opencensus v0.40.0 h1:pqDiayRhBgoqy1vwnscik+TizcImJ58l053NScJyZso= -go.opentelemetry.io/otel/bridge/opencensus v0.40.0/go.mod h1:1NvVHb6tLTe5A9qCYz+eErW0t8iPn4ZfR6tDKcqlGTM= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0 h1:MZbjiZeMmn5wFMORhozpouGKDxj9POHTuU5UA8msBQk= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.40.0/go.mod h1:C7tOYVCJmrDTCwxNny0MuUtnDIR3032vFHYke0F2ZrU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0 h1:q3FNPi8FLQVjLlmV+WWHQfH9ZCCtQIS0O/+dn1+4cJ4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.40.0/go.mod h1:rmx4n0uSIAkKBeQYkygcv9dENAlL2/tv3OSq68h1JAo= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0 h1:SZaSbubADNhH2Gxm+1GaZ/cFsGiYefZoodMMX79AOd4= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.40.0/go.mod h1:N65FzQDfQH7NY7umgb0U+7ypGKVYKwwE24L6KXT4OA8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 h1:U5GYackKpVKlPrd/5gKMlrTlP2dCESAAFU682VCpieY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0/go.mod h1:aFsJfCEnLzEu9vRRAcUiB/cpRTbVsNdF3OHSPpdjxZQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0 h1:iGeIsSYwpYSvh5UGzWrJfTDJvPjrXtxl3GUppj6IXQU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0/go.mod h1:1j3H3G1SBYpZFti6OI4P0uRQCW20MXkG5v4UWXppLLE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0 h1:kvWMtSUNVylLVrOE4WLUmBtgziYoCIYUNSpTYtMzVJI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.17.0/go.mod h1:SExUrRYIXhDgEKG4tkiQovd2HTaELiHUsuK08s5Nqx4= -go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e h1:eh19+pVw4g/V7QM/8iNDk3M5cNy3mOVzggEgdlt9jkY= -go.opentelemetry.io/otel/exporters/prometheus v0.40.1-0.20230831181707-02616a25c68e/go.mod h1:5USWZ0ovyQB5CIM3IO3bGRSoDPMXiT3t+15gu8Zo9HQ= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0 h1:hf7JSONqAuXT1PDYYlVhKNMPLe4060d+4RFREcv7X2c= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.40.0/go.mod h1:IxD5qbw/XcnFB7i5k4d7J1aW5iBU2h4DgSxtk4YqR4c= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0 h1:Ut6hgtYcASHwCzRHkXEtSsM251cXJPW+Z9DyLwEn6iI= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.17.0/go.mod h1:TYeE+8d5CjrgBa0ZuRaDeMpIC1xZ7atg4g+nInjuSjc= -go.opentelemetry.io/otel/metric v1.17.0 h1:iG6LGVz5Gh+IuO0jmgvpTB6YVrCGngi8QGm+pMd8Pdc= -go.opentelemetry.io/otel/metric v1.17.0/go.mod h1:h4skoxdZI17AxwITdmdZjjYJQH5nzijUUjm+wtPph5o= -go.opentelemetry.io/otel/sdk v1.17.0 h1:FLN2X66Ke/k5Sg3V623Q7h7nt3cHXaW1FOvKKrW0IpE= -go.opentelemetry.io/otel/sdk v1.17.0/go.mod h1:U87sE0f5vQB7hwUoW98pW5Rz4ZDuCFBZFNUBlSgmDFQ= -go.opentelemetry.io/otel/sdk/metric v0.40.0 h1:qOM29YaGcxipWjL5FzpyZDpCYrDREvX0mVlmXdOjCHU= -go.opentelemetry.io/otel/sdk/metric v0.40.0/go.mod h1:dWxHtdzdJvg+ciJUKLTKwrMe5P6Dv3FyDbh8UkfgkVs= -go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= -go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/collector v0.86.0 h1:Yxu0muUws9e7HG+5DDiYajkfAeOo/riUv0sJO4E9rXA= +go.opentelemetry.io/collector v0.86.0/go.mod h1:HoXzPE/mJMN4jy5E1cSUMznxkKFiGAGJbkguzpnq5ak= +go.opentelemetry.io/collector/component v0.86.0 h1:3+6OTiknu081jWYSUx4PdOecvmo0kn5w1YlydZLKz8E= +go.opentelemetry.io/collector/component v0.86.0/go.mod h1:XaBL2y1EhcmbCIFqAqk5r3xOZyi1SarwU7Wj/iTiDOA= +go.opentelemetry.io/collector/config/configauth v0.86.0 h1:cqfr/zXyGGg5TGgmS+Ws6XFy6DdBNJxkTLUWpOVzmVI= +go.opentelemetry.io/collector/config/configauth v0.86.0/go.mod h1:8/v2oLZe9kskODghcRQSp2xP56EySlU1aNRthEIwn8w= +go.opentelemetry.io/collector/config/configcompression v0.86.0 h1:qA7i0igeYEpOW4PcGk3tYYSAO5dn+aMuDbCc/D0Rli4= +go.opentelemetry.io/collector/config/configcompression v0.86.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= +go.opentelemetry.io/collector/config/confighttp v0.86.0 h1:DLHWhUG3Xp9Gci6+ewJ21GwIV0RQd8jlNt3F36397uk= +go.opentelemetry.io/collector/config/confighttp v0.86.0/go.mod h1:FMCmz/9rg8AXxdltWKUbFxOGQ/g9rNvTfb4EUA+RjT4= +go.opentelemetry.io/collector/config/confignet v0.86.0 h1:jg8rsMsAGKa+x3gs1yxqnfr2jpSAu8mGn7hc4y8h71o= +go.opentelemetry.io/collector/config/configopaque v0.86.0 h1:usNMgdFXbmprEcTImwVtziGkhXHeC/aWE93n2ZXlIO8= +go.opentelemetry.io/collector/config/configopaque v0.86.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= +go.opentelemetry.io/collector/config/configtelemetry v0.86.0 h1:xMqeL/gz7ZwZKRB58WYimEGU+Lvbzo5zd99uihjkMZY= +go.opentelemetry.io/collector/config/configtelemetry v0.86.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= +go.opentelemetry.io/collector/config/configtls v0.86.0 h1:3BdB8Ntme+nDgYDPaWAb0jYbb/n7ueckN7hAPU3J3IM= +go.opentelemetry.io/collector/config/configtls v0.86.0/go.mod h1:vopMMIUjAvb6kojrc5G6vQOmfPIRxTU+hMHomvGNa2s= +go.opentelemetry.io/collector/config/internal v0.86.0 h1:r4LnOMxXmnKwAMaSX16bPe1jMbjkT9Up8VKt6IrJac0= +go.opentelemetry.io/collector/config/internal v0.86.0/go.mod h1:42VsQ/1kP2qnvzjNi+dfNP+KyCFRADejyrJ8m2GVL3M= +go.opentelemetry.io/collector/confmap v0.86.0 h1:u3qXVuIz2cmH/rb2teX0Ft/OKYHgObv1e4OQ2UXqxrE= +go.opentelemetry.io/collector/confmap v0.86.0/go.mod h1:vJms49x98lXUR7Mj6/28eXV+Otn3dDQpc+Znvex9Z84= +go.opentelemetry.io/collector/connector v0.86.0 h1:tQaphbRyLhDDBkKpcAWawc+vFdnnNwvpKx8CBzW5xR4= +go.opentelemetry.io/collector/connector v0.86.0/go.mod h1:0n6B8ZyDgT0hvZbJLFYd9y+uAH54wttUGZ6O7Zo1B5M= +go.opentelemetry.io/collector/consumer v0.86.0 h1:8AL9I30tJV01KfcSaa+8DTiARIiUDA8o2p7yQoSFUCs= +go.opentelemetry.io/collector/consumer v0.86.0/go.mod h1:SvoV1eto4VZzQ3ILKQ1rv4qgN8rUMJqupn78hoXLHRw= +go.opentelemetry.io/collector/exporter v0.86.0 h1:LFmBb7S4Fkj5fv/nrUkLOy50GT6s4R/BLrv6uTb+GNo= +go.opentelemetry.io/collector/exporter v0.86.0/go.mod h1:+PKZrFV4sVgS2TVFnfZ+RCJqXexEENjW1riWaqkxsN4= +go.opentelemetry.io/collector/extension v0.86.0 h1:oXnZarkh1aBgnr/U3JSj/lPpBJUquOQ3DHMXXP4Jacc= +go.opentelemetry.io/collector/extension v0.86.0/go.mod h1:EPAloXQ+48577GvHTP5wGDvV4OyHPuldvM+2rYbM/fw= +go.opentelemetry.io/collector/extension/auth v0.86.0 h1:VwKbeElL8sBnvRDC565EWOw4ixMG/t0oXjIphNsRszU= +go.opentelemetry.io/collector/extension/auth v0.86.0/go.mod h1:qGIIkeWXaOtdYO1fYEn1vAEhUS+OhVcceUC1G3XOsdk= +go.opentelemetry.io/collector/extension/zpagesextension v0.86.0 h1:Ga5ZGEChIN0eqide9NFqlfEZPTRaTX3mAdLdbKwiOPQ= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 h1:Wv8JFRUD01MwWkhZwF85to5oukHDFPRjnt88ArDFqco= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015/go.mod h1:fLmJMf1AoHttkF8p5oJAc4o5ZpHu8yO5XYJ7gbLCLzo= +go.opentelemetry.io/collector/otelcol v0.86.0 h1:p9NjJ7dIgQs0tp6uTsnmziDZdIwHDQqQ/wbnyD4FoIM= +go.opentelemetry.io/collector/otelcol v0.86.0/go.mod h1:jYS+YFA1qaxmgblwnARe97kQm0N2ngejb2qhR3zRPgg= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= +go.opentelemetry.io/collector/processor v0.86.0 h1:b4Htiom5mgcM5d7Memw1NkxBKgOADF1je0mLIhulQUM= +go.opentelemetry.io/collector/processor v0.86.0/go.mod h1:gJCNmRCqm/GKBHjRqlvRxMqWWcLCe1S6QNOxjtFv638= +go.opentelemetry.io/collector/receiver v0.86.0 h1:AP+KZ225CmXR1oBD36+vV/pZcRFTkSiG7HvAVqfHoRg= +go.opentelemetry.io/collector/receiver v0.86.0/go.mod h1:oFpofH/OG4HqmaVsb8ftnIAhLAhQnH/3bWrOdZZZjTk= +go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= +go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/service v0.86.0 h1:vyoynxNY2Oc6XET2ZvFkRC+Fpc1oMl9qQkORyX5LoWg= +go.opentelemetry.io/collector/service v0.86.0/go.mod h1:IT8MQbc9GWreG+GCuuG7DcQ72HUfV4a9iZXmwyPs27Q= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48= +go.opentelemetry.io/contrib/propagators/b3 v1.19.0 h1:ulz44cpm6V5oAeg5Aw9HyqGFMS6XM7untlMEhD7YzzA= +go.opentelemetry.io/contrib/propagators/b3 v1.19.0/go.mod h1:OzCmE2IVS+asTI+odXQstRGVfXQ4bXv9nMBRK0nNyqQ= +go.opentelemetry.io/contrib/zpages v0.44.0 h1:9J/cxTTWhM6kzgdaBt6NiXS2HUreXn/eW2M+vzHgDAQ= +go.opentelemetry.io/otel v1.18.0 h1:TgVozPGZ01nHyDZxK5WGPFB9QexeTMXEH7+tIClWfzs= +go.opentelemetry.io/otel v1.18.0/go.mod h1:9lWqYO0Db579XzVuCKFNPDl4s73Voa+zEck3wHaAYQI= +go.opentelemetry.io/otel/bridge/opencensus v0.41.0 h1:VBpeaTbrvLFHvRtsyCJXjsTaicBNrAFdmctiN1k6WNI= +go.opentelemetry.io/otel/bridge/opencensus v0.41.0/go.mod h1:yCQB5IKRhgjlbTLc91+ixcZc2/8BncGGJ+CS3dZJwtY= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 h1:k0k7hFNDd8K4iOMJXj7s8sHaC4mhTlAeppRmZXLgZ6k= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0 h1:HgbDTD8pioFdY3NRc/YCvsWjqQPtweGyXxa32LgnTOw= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0/go.mod h1:tmvt/yK5Es5d6lHYWerLSOna8lCEfrBVX/a9M0ggqss= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0 h1:iV3BOgW4fry1Riw9dwypigqlIYWXvSRVT2RJmblzo40= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0/go.mod h1:7PGzqlKrxIRmbj5tlNW0nTkYZ5fHXDgk6Fy8/KjR0CI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 h1:IAtl+7gua134xcV3NieDhJHjjOVeJhXAnYf/0hswjUY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0/go.mod h1:w+pXobnBzh95MNIkeIuAKcHe/Uu/CX2PKIvBP6ipKRA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 h1:yE32ay7mJG2leczfREEhoW3VfSZIvHaB+gvVo1o8DQ8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0/go.mod h1:G17FHPDLt74bCI7tJ4CMitEk4BXTYG4FW6XUpkPBXa4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 h1:6pu8ttx76BxHf+xz/H77AUZkPF3cwWzXqAUsXhVKI18= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0/go.mod h1:IOmXxPrxoxFMXdNy7lfDmE8MzE61YPcurbUm0SMjerI= +go.opentelemetry.io/otel/exporters/prometheus v0.41.0 h1:A3/bhjP5SmELy8dcpK+uttHeh9Qrh+YnS16/VzrztRQ= +go.opentelemetry.io/otel/exporters/prometheus v0.41.0/go.mod h1:mKuXEMi9suyyNJQ99SZCO0mpWGFe0MIALtjd3r6uo7Q= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0 h1:XzjGkawtAXs20Y+s6k1GNDMBsMDOV28TOT8cxmE42qM= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0/go.mod h1:HAomEgjcKZk3VJ+HHdHLnhZXeGqdzPxxNTdKYRopUXY= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 h1:hSWWvDjXHVLq9DkmB+77fl8v7+t+yYiS+eNkiplDK54= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0/go.mod h1:zG7KQql1WjZCaUJd+L/ReSYx4bjbYJxg5ws9ws+mYes= +go.opentelemetry.io/otel/metric v1.18.0 h1:JwVzw94UYmbx3ej++CwLUQZxEODDj/pOuTCvzhtRrSQ= +go.opentelemetry.io/otel/metric v1.18.0/go.mod h1:nNSpsVDjWGfb7chbRLUNW+PBNdcSTHD4Uu5pfFMOI0k= +go.opentelemetry.io/otel/sdk v1.18.0 h1:e3bAB0wB3MljH38sHzpV/qWrOTCFrdZF2ct9F8rBkcY= +go.opentelemetry.io/otel/sdk v1.18.0/go.mod h1:1RCygWV7plY2KmdskZEDDBs4tJeHG92MdHZIluiYs/M= +go.opentelemetry.io/otel/sdk/metric v0.41.0 h1:c3sAt9/pQ5fSIUfl0gPtClV3HhE18DCVzByD33R/zsk= +go.opentelemetry.io/otel/sdk/metric v0.41.0/go.mod h1:PmOmSt+iOklKtIg5O4Vz9H/ttcRFSNTgii+E1KGyn1w= +go.opentelemetry.io/otel/trace v1.18.0 h1:NY+czwbHbmndxojTEKiSMHkG2ClNH2PwmcHrdo0JY10= +go.opentelemetry.io/otel/trace v1.18.0/go.mod h1:T2+SGJGuYZY3bjj5rgh/hN7KIrlpWC5nS8Mjvzckz+0= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= @@ -1378,8 +1382,8 @@ go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +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-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1614,9 +1618,9 @@ golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1835,8 +1839,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.58.0 h1:32JY8YpPMSR45K+c3o6b8VL73V+rR8k+DeMIr4vRH8o= -google.golang.org/grpc v1.58.0/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= +google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= From d0aa7071afbbf1fd3d5aaf0052cd7502b68799d9 Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Tue, 10 Oct 2023 18:16:11 -0700 Subject: [PATCH 13/13] chore: update OpenTelemetry & Jaeger - OpenTelemetry => v0.87.0 - Jaeger => v1.50.0 --- .github/workflows/ci.yml | 2 +- common/go.mod | 2 +- common/go.sum | 4 +- demo/docker-compose.yml | 2 +- influx2otel/go.mod | 14 +-- influx2otel/go.sum | 30 ++--- jaeger-influxdb/go.mod | 18 +-- jaeger-influxdb/go.sum | 41 ++++--- otel2influx/go.mod | 8 +- otel2influx/go.sum | 18 +-- otelcol-influxdb/Dockerfile | 2 +- otelcol-influxdb/build.yml | 44 ++++---- run-checks.sh | 2 +- tests-integration/go.mod | 108 +++++++++--------- tests-integration/go.sum | 217 ++++++++++++++++++------------------ 15 files changed, 256 insertions(+), 256 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b8f7242..3286dacd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,6 +62,6 @@ jobs: - name: build run: > - go install go.opentelemetry.io/collector/cmd/builder@v0.86.0 && + go install go.opentelemetry.io/collector/cmd/builder@v0.87.0 && cd otelcol-influxdb && builder --config build.yml diff --git a/common/go.mod b/common/go.mod index 05bded18..91d104c5 100644 --- a/common/go.mod +++ b/common/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.86.0 + go.opentelemetry.io/collector/semconv v0.87.0 ) require ( diff --git a/common/go.sum b/common/go.sum index b46403b5..4e615ed8 100644 --- a/common/go.sum +++ b/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= -go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= +go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index a3bcd6ea..9cda0f44 100644 --- a/demo/docker-compose.yml +++ b/demo/docker-compose.yml @@ -46,7 +46,7 @@ services: JAEGER_AGENT_PORT: 6831 otelcol-influxdb: - image: otel/opentelemetry-collector-contrib:0.86.0 + image: otel/opentelemetry-collector-contrib:0.87.0 command: [ "--config", "/config.yml" ] stop_grace_period: 10s volumes: diff --git a/influx2otel/go.mod b/influx2otel/go.mod index ad8fb587..caaf8c98 100644 --- a/influx2otel/go.mod +++ b/influx2otel/go.mod @@ -4,11 +4,11 @@ go 1.19 require ( github.com/influxdata/influxdb-observability/common v0.5.8 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 - go.opentelemetry.io/collector/semconv v0.86.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 + go.opentelemetry.io/collector/semconv v0.87.0 ) require ( @@ -21,11 +21,11 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.15.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.58.1 // indirect + google.golang.org/grpc v1.58.2 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/influx2otel/go.sum b/influx2otel/go.sum index 5ff2a8b3..f88e40af 100644 --- a/influx2otel/go.sum +++ b/influx2otel/go.sum @@ -22,11 +22,11 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.86.0 h1:HEuJ7hCbLVfoL7xLrGQ2QORvocyFfWuaoDuzyTLwTdc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 h1:EzGSvuCXAsGpwgeieTVcy1gs0hOlPidhFPcvwcPEU8s= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0/go.mod h1:EL62K0jwPFXa3uxYeYMZGS1TSLR6AdGHRvM7RnRlosY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 h1:xt/YvYpgssWk2Ix2C9SSXrILIzRqyWe+r5RE348m1fE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0/go.mod h1:fjK1kn7PIDP+TqOIFVEth3w0Eiexx5jIk411c//fYkM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0 h1:ekT4/I9J484j4yR/0VHj5AGtgv8KmNd+e4oXxNJNR/o= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0 h1:9RtkoPmUPRW1NrOawEiWsxOZ/dBlym5DzhLXjRpM9tM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0/go.mod h1:xvO0/6zTw6UBl7g4hZpvapfvANNSnj6sQcSnF6jqSSg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 h1:zA50pvJziZjWQiN9MZIkT6Ii3hMSaCKa6jvs1vCYT5g= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0/go.mod h1:IjdtiiTTNlAkspcNyAjHysWAZs5U48alWGUodTkkxhI= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= @@ -36,10 +36,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= -go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= -go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 h1:qCPXSQCoD3qeWFb1RuIks8fw9Atxpk78bmtVdi15KhE= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlGehrZWgtBuiDsz/rlNeJeXiNg= +go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= +go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -51,16 +51,16 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= 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.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= @@ -75,8 +75,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index a0139e47..1b2968c7 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -7,17 +7,17 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/influxdata/influxdb-observability/common v0.5.8 github.com/influxdata/line-protocol/v2 v2.2.1 - github.com/jaegertracing/jaeger v1.49.0 + github.com/jaegertracing/jaeger v1.50.0 github.com/mattn/go-isatty v0.0.18 github.com/opentracing/opentracing-go v1.2.0 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 - go.opentelemetry.io/collector/semconv v0.86.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 + go.opentelemetry.io/collector/semconv v0.87.0 go.uber.org/multierr v1.11.0 - go.uber.org/zap v1.25.0 - google.golang.org/grpc v1.58.1 + go.uber.org/zap v1.26.0 + google.golang.org/grpc v1.58.2 ) require ( @@ -31,12 +31,12 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect - github.com/hashicorp/go-plugin v1.5.0 // indirect + github.com/hashicorp/go-plugin v1.5.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.0 // indirect github.com/klauspost/cpuid/v2 v2.2.5 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect @@ -54,8 +54,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/otel v1.17.0 // indirect - go.opentelemetry.io/otel/trace v1.17.0 // indirect + go.opentelemetry.io/otel v1.19.0 // indirect + go.opentelemetry.io/otel/trace v1.19.0 // indirect go.uber.org/atomic v1.11.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect golang.org/x/mod v0.12.0 // indirect diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index ec05a9bd..9ad2f153 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -43,7 +43,6 @@ github.com/apache/arrow-adbc/go/adbc v0.6.0 h1:WBy5cQO/xOFyGX17UB8kPNpoa6OuQ9jQ7 github.com/apache/arrow-adbc/go/adbc v0.6.0/go.mod h1:7HnZmHalFWS5PUA6Viqa5cvR0rfsn+9X5rWOaWVYKpo= github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk= github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc= -github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= @@ -143,14 +142,14 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-plugin v1.5.0 h1:g6Lj3USwF5LaB8HlvCxPjN2X4nFE08ko2BJNVpl7TIE= -github.com/hashicorp/go-plugin v1.5.0/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= +github.com/hashicorp/go-plugin v1.5.2 h1:aWv8eimFqWlsEiMrYZdPYl+FdHaBJSN4AWwGWfT1G2Y= +github.com/hashicorp/go-plugin v1.5.2/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -168,8 +167,8 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= -github.com/jaegertracing/jaeger v1.49.0 h1:3XI8ZOK6oncyoAxCiKakC9sRaeDTdDwmxmaSN+KQBo8= -github.com/jaegertracing/jaeger v1.49.0/go.mod h1:gU5wCSJSwk5MJHO/uWEBYKklT80oqEc2ixj3ssbwloQ= +github.com/jaegertracing/jaeger v1.50.0 h1:qsOcPeB3nAc3h8tx+gnZ3JODAZfqbYmQr45jPEwBd2w= +github.com/jaegertracing/jaeger v1.50.0/go.mod h1:MVGvxf4+Pcn31gz9RnLo0097w3khKFwJIprIZHOt89s= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -178,8 +177,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= -github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -271,21 +270,21 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= -go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= -go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/otel v1.17.0 h1:MW+phZ6WZ5/uk2nd93ANk/6yJ+dVrvNWUjGhnnFU5jM= -go.opentelemetry.io/otel v1.17.0/go.mod h1:I2vmBGtFaODIVMBSTPVDlJSzBDNf93k60E6Ft0nyjo0= -go.opentelemetry.io/otel/trace v1.17.0 h1:/SWhSRHmDPOImIAetP1QAeMnZYiQXrTy4fMMYOdSKWQ= -go.opentelemetry.io/otel/trace v1.17.0/go.mod h1:I/4vKTgFclIsXRVucpH25X0mpFSczM7aHeaz0ZBLWjY= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 h1:qCPXSQCoD3qeWFb1RuIks8fw9Atxpk78bmtVdi15KhE= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlGehrZWgtBuiDsz/rlNeJeXiNg= +go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= +go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= 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/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= 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/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= -go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= +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-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -501,7 +500,7 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= -gonum.org/v1/gonum v0.12.0 h1:xKuo6hzt+gMav00meVPUlXwSdoEJP46BR+wdxQEFK2o= +gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -582,8 +581,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/otel2influx/go.mod b/otel2influx/go.mod index 68879a87..dbe5e652 100644 --- a/otel2influx/go.mod +++ b/otel2influx/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( github.com/influxdata/influxdb-observability/common v0.5.8 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.86.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 - go.opentelemetry.io/collector/semconv v0.86.0 + go.opentelemetry.io/collector/consumer v0.87.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 + go.opentelemetry.io/collector/semconv v0.87.0 go.uber.org/multierr v1.11.0 golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 ) @@ -24,7 +24,7 @@ require ( golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.58.1 // indirect + google.golang.org/grpc v1.58.2 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/otel2influx/go.sum b/otel2influx/go.sum index 9f12bcc6..49cfe5c0 100644 --- a/otel2influx/go.sum +++ b/otel2influx/go.sum @@ -29,13 +29,13 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/collector v0.86.0 h1:Yxu0muUws9e7HG+5DDiYajkfAeOo/riUv0sJO4E9rXA= -go.opentelemetry.io/collector/consumer v0.86.0 h1:8AL9I30tJV01KfcSaa+8DTiARIiUDA8o2p7yQoSFUCs= -go.opentelemetry.io/collector/consumer v0.86.0/go.mod h1:SvoV1eto4VZzQ3ILKQ1rv4qgN8rUMJqupn78hoXLHRw= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= -go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= -go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector v0.87.0 h1:160HewHp+/wzr62BzWjQgIvdTtzpaYTlCnGVb8DYnM0= +go.opentelemetry.io/collector/consumer v0.87.0 h1:oR5XKZoVF/hwz0FnrYPaHcbbQazHifMsxpENMR7ivvo= +go.opentelemetry.io/collector/consumer v0.87.0/go.mod h1:lui5rg1byAT7QPbCY733StCDc/TPxS3hVNXKoVQ3LsI= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 h1:qCPXSQCoD3qeWFb1RuIks8fw9Atxpk78bmtVdi15KhE= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlGehrZWgtBuiDsz/rlNeJeXiNg= +go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= +go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -73,8 +73,8 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile index fbd7838b..6827b51d 100644 --- a/otelcol-influxdb/Dockerfile +++ b/otelcol-influxdb/Dockerfile @@ -7,7 +7,7 @@ RUN \ --mount=type=cache,id=influxdb-observability-gocache,sharing=locked,target=/root/.cache/go-build \ --mount=type=cache,id=influxdb-observability-gomodcache,sharing=locked,target=/go/pkg/mod \ du -cshx /root/.cache/go-build /go/pkg/mod && \ - go install go.opentelemetry.io/collector/cmd/builder@v0.86.0 && \ + go install go.opentelemetry.io/collector/cmd/builder@v0.87.0 && \ du -cshx /root/.cache/go-build /go/pkg/mod COPY . /project diff --git a/otelcol-influxdb/build.yml b/otelcol-influxdb/build.yml index 45dfe5b3..d5b43fd7 100644 --- a/otelcol-influxdb/build.yml +++ b/otelcol-influxdb/build.yml @@ -2,39 +2,39 @@ dist: name: otelcol-influxdb module: github.com/influxdata/influxdb-observability/otelcol-influxdb description: OpenTelemetry Collector Distribution built for InfluxDB - version: 0.86.0-0.0.0-beta.0 - otelcol_version: 0.86.0 + version: 0.87.0-0.0.0-beta.0 + otelcol_version: 0.87.0 output_path: ./build receivers: -- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.86.0 +- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.87.0 exporters: -- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.86.0 +- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.87.0 connectors: -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.86.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.87.0 extensions: -- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.86.0 -- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.86.0 +- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.87.0 +- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.87.0 processors: -- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.86.0 -- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.86.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.86.0 +- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.87.0 +- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.87.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.87.0 replaces: - github.com/influxdata/influxdb-observability/common => ../../common diff --git a/run-checks.sh b/run-checks.sh index 2cc3315a..951d50ab 100755 --- a/run-checks.sh +++ b/run-checks.sh @@ -18,7 +18,7 @@ if ! hash staticcheck; then fi if ! hash builder; then echo "installing the opentelemetry collector builder" - if ! go install go.opentelemetry.io/collector/cmd/builder@v0.86.0; then + if ! go install go.opentelemetry.io/collector/cmd/builder@v0.87.0; then echo "failed to install the opentelemetry collector builder" exit 1 fi diff --git a/tests-integration/go.mod b/tests-integration/go.mod index bd12c8fd..689a44f0 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -6,22 +6,22 @@ require ( github.com/influxdata/influxdb/v2 v2.6.1 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/influxdata/telegraf v1.27.2 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.86.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.86.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.87.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.86.0 - go.opentelemetry.io/collector/confmap v0.86.0 - go.opentelemetry.io/collector/consumer v0.86.0 - go.opentelemetry.io/collector/exporter v0.86.0 - go.opentelemetry.io/collector/extension v0.86.0 - go.opentelemetry.io/collector/otelcol v0.86.0 - go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 - go.opentelemetry.io/collector/processor v0.86.0 - go.opentelemetry.io/collector/receiver v0.86.0 + go.opentelemetry.io/collector/component v0.87.0 + go.opentelemetry.io/collector/confmap v0.87.0 + go.opentelemetry.io/collector/consumer v0.87.0 + go.opentelemetry.io/collector/exporter v0.87.0 + go.opentelemetry.io/collector/extension v0.87.0 + go.opentelemetry.io/collector/otelcol v0.87.0 + go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 + go.opentelemetry.io/collector/processor v0.87.0 + go.opentelemetry.io/collector/receiver v0.87.0 go.uber.org/zap v1.26.0 - google.golang.org/grpc v1.58.1 + google.golang.org/grpc v1.58.2 ) require ( @@ -58,7 +58,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/influxdata/influxdb-observability/common v0.5.8 // indirect - github.com/influxdata/influxdb-observability/influx2otel v0.5.7 // indirect + github.com/influxdata/influxdb-observability/influx2otel v0.5.8 // indirect github.com/influxdata/influxdb-observability/otel2influx v0.5.6 // indirect github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -76,18 +76,18 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.86.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect - github.com/prometheus/client_golang v1.16.0 // indirect - github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/client_golang v1.17.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.11.0 // indirect + github.com/prometheus/procfs v0.11.1 // indirect github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect - github.com/rs/cors v1.10.0 // indirect - github.com/shirou/gopsutil/v3 v3.23.8 // indirect + github.com/rs/cors v1.10.1 // indirect + github.com/shirou/gopsutil/v3 v3.23.9 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sleepinggenius2/gosmi v0.4.4 // indirect @@ -100,42 +100,42 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.86.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.86.0 // indirect - go.opentelemetry.io/collector/config/configcompression v0.86.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.86.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.86.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.86.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.86.0 // indirect - go.opentelemetry.io/collector/config/internal v0.86.0 // indirect - go.opentelemetry.io/collector/connector v0.86.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.86.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 // indirect - go.opentelemetry.io/collector/semconv v0.86.0 // indirect - go.opentelemetry.io/collector/service v0.86.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect + go.opentelemetry.io/collector v0.87.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.87.0 // indirect + go.opentelemetry.io/collector/config/configcompression v0.87.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.87.0 // indirect + go.opentelemetry.io/collector/config/configopaque v0.87.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.87.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.87.0 // indirect + go.opentelemetry.io/collector/config/internal v0.87.0 // indirect + go.opentelemetry.io/collector/connector v0.87.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.87.0 // indirect + go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016 // indirect + go.opentelemetry.io/collector/semconv v0.87.0 // indirect + go.opentelemetry.io/collector/service v0.87.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.19.0 // indirect - go.opentelemetry.io/otel v1.18.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.41.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.41.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 // indirect - go.opentelemetry.io/otel/metric v1.18.0 // indirect - go.opentelemetry.io/otel/sdk v1.18.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.41.0 // indirect - go.opentelemetry.io/otel/trace v1.18.0 // indirect + go.opentelemetry.io/otel v1.19.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect + go.opentelemetry.io/otel/sdk v1.19.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.19.0 // indirect + go.opentelemetry.io/otel/trace v1.19.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.13.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect - golang.org/x/net v0.15.0 // indirect - golang.org/x/sys v0.12.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect golang.org/x/text v0.13.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230717213848-3f92550aa753 // indirect diff --git a/tests-integration/go.sum b/tests-integration/go.sum index 6a9aedc0..39b2bd4d 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -982,17 +982,17 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0 h1:vuAWap/sYNrFO3bOYk88OdAh6C/W4NpHqn6DQBNUoJw= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.86.0/go.mod h1:o8VZZbmu7vVq6bku63VJegMiG+RarlooFu8Yt6m3JdY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.86.0 h1:g7HlND105lwm7NW8JCxAfbpaFyk1WKcEUUVwchIo9zE= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.86.0/go.mod h1:BTFCu+oeOnvPt/R6HQDW1S/duHuJcV5Xb0pbURCSMno= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.86.0 h1:HEuJ7hCbLVfoL7xLrGQ2QORvocyFfWuaoDuzyTLwTdc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0 h1:EzGSvuCXAsGpwgeieTVcy1gs0hOlPidhFPcvwcPEU8s= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.86.0/go.mod h1:EL62K0jwPFXa3uxYeYMZGS1TSLR6AdGHRvM7RnRlosY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0 h1:xt/YvYpgssWk2Ix2C9SSXrILIzRqyWe+r5RE348m1fE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.86.0/go.mod h1:fjK1kn7PIDP+TqOIFVEth3w0Eiexx5jIk411c//fYkM= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.86.0 h1:evSOdq9M+JjxUGbC358jIsvrtJuN8pQStXDP32/rEcE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.86.0/go.mod h1:pAaB/eQMGg3rwFwmBV9GINWSYIulM0rkx30fDbQGhfg= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.87.0 h1:6+09/q0HmqsUbptoTFV+IBM2nUEAynPilQ6PuCEtQdA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.87.0/go.mod h1:LTDmdLLEnIvhSX9Ysnf4syeEJYnVNuT/hC/IpkPcPfE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0 h1:W4Ty2pSyge/qNAOILO6HqyKrAcgALs0bn5CmpGZJXVo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.87.0/go.mod h1:3EFmVoLcdM8Adj75N8TGJ4txDB29oW1chTLCFiL/wxs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0 h1:ekT4/I9J484j4yR/0VHj5AGtgv8KmNd+e4oXxNJNR/o= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0 h1:9RtkoPmUPRW1NrOawEiWsxOZ/dBlym5DzhLXjRpM9tM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.87.0/go.mod h1:xvO0/6zTw6UBl7g4hZpvapfvANNSnj6sQcSnF6jqSSg= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0 h1:zA50pvJziZjWQiN9MZIkT6Ii3hMSaCKa6jvs1vCYT5g= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.87.0/go.mod h1:IjdtiiTTNlAkspcNyAjHysWAZs5U48alWGUodTkkxhI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.87.0 h1:HfGfZ/VWstxYML2OfgHTUD2Tc1bEpO+SSzKOp+62vfs= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.87.0/go.mod h1:jJx7CA05HxMj4vP5gds2Yr4t2KAbPkpbB4fYJ29OcSE= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -1062,16 +1062,16 @@ github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= -github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= +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-20190115171406-56726106282f/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.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +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.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= @@ -1097,8 +1097,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= -github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +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/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 h1:AHi2TGs09Mv4v688/bjcY2PfAcu9+p4aPvsgVQ4nYDk= github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2/go.mod h1:5aBj+GpLB+V5MCnrKm5+JAqEJwzDiLugOmDhgt7sDec= github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= @@ -1119,8 +1119,8 @@ github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8= -github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -1136,8 +1136,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/shirou/gopsutil/v3 v3.23.8 h1:xnATPiybo6GgdRoC4YoGnxXZFRc3dqQTGi73oLvvBrE= -github.com/shirou/gopsutil/v3 v3.23.8/go.mod h1:7hmCaBn+2ZwaZOr6jmPBZDfawwMGuo1id3C6aM8EDqQ= +github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E= +github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA= 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= @@ -1282,87 +1282,87 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.86.0 h1:Yxu0muUws9e7HG+5DDiYajkfAeOo/riUv0sJO4E9rXA= -go.opentelemetry.io/collector v0.86.0/go.mod h1:HoXzPE/mJMN4jy5E1cSUMznxkKFiGAGJbkguzpnq5ak= -go.opentelemetry.io/collector/component v0.86.0 h1:3+6OTiknu081jWYSUx4PdOecvmo0kn5w1YlydZLKz8E= -go.opentelemetry.io/collector/component v0.86.0/go.mod h1:XaBL2y1EhcmbCIFqAqk5r3xOZyi1SarwU7Wj/iTiDOA= -go.opentelemetry.io/collector/config/configauth v0.86.0 h1:cqfr/zXyGGg5TGgmS+Ws6XFy6DdBNJxkTLUWpOVzmVI= -go.opentelemetry.io/collector/config/configauth v0.86.0/go.mod h1:8/v2oLZe9kskODghcRQSp2xP56EySlU1aNRthEIwn8w= -go.opentelemetry.io/collector/config/configcompression v0.86.0 h1:qA7i0igeYEpOW4PcGk3tYYSAO5dn+aMuDbCc/D0Rli4= -go.opentelemetry.io/collector/config/configcompression v0.86.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= -go.opentelemetry.io/collector/config/confighttp v0.86.0 h1:DLHWhUG3Xp9Gci6+ewJ21GwIV0RQd8jlNt3F36397uk= -go.opentelemetry.io/collector/config/confighttp v0.86.0/go.mod h1:FMCmz/9rg8AXxdltWKUbFxOGQ/g9rNvTfb4EUA+RjT4= -go.opentelemetry.io/collector/config/confignet v0.86.0 h1:jg8rsMsAGKa+x3gs1yxqnfr2jpSAu8mGn7hc4y8h71o= -go.opentelemetry.io/collector/config/configopaque v0.86.0 h1:usNMgdFXbmprEcTImwVtziGkhXHeC/aWE93n2ZXlIO8= -go.opentelemetry.io/collector/config/configopaque v0.86.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= -go.opentelemetry.io/collector/config/configtelemetry v0.86.0 h1:xMqeL/gz7ZwZKRB58WYimEGU+Lvbzo5zd99uihjkMZY= -go.opentelemetry.io/collector/config/configtelemetry v0.86.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= -go.opentelemetry.io/collector/config/configtls v0.86.0 h1:3BdB8Ntme+nDgYDPaWAb0jYbb/n7ueckN7hAPU3J3IM= -go.opentelemetry.io/collector/config/configtls v0.86.0/go.mod h1:vopMMIUjAvb6kojrc5G6vQOmfPIRxTU+hMHomvGNa2s= -go.opentelemetry.io/collector/config/internal v0.86.0 h1:r4LnOMxXmnKwAMaSX16bPe1jMbjkT9Up8VKt6IrJac0= -go.opentelemetry.io/collector/config/internal v0.86.0/go.mod h1:42VsQ/1kP2qnvzjNi+dfNP+KyCFRADejyrJ8m2GVL3M= -go.opentelemetry.io/collector/confmap v0.86.0 h1:u3qXVuIz2cmH/rb2teX0Ft/OKYHgObv1e4OQ2UXqxrE= -go.opentelemetry.io/collector/confmap v0.86.0/go.mod h1:vJms49x98lXUR7Mj6/28eXV+Otn3dDQpc+Znvex9Z84= -go.opentelemetry.io/collector/connector v0.86.0 h1:tQaphbRyLhDDBkKpcAWawc+vFdnnNwvpKx8CBzW5xR4= -go.opentelemetry.io/collector/connector v0.86.0/go.mod h1:0n6B8ZyDgT0hvZbJLFYd9y+uAH54wttUGZ6O7Zo1B5M= -go.opentelemetry.io/collector/consumer v0.86.0 h1:8AL9I30tJV01KfcSaa+8DTiARIiUDA8o2p7yQoSFUCs= -go.opentelemetry.io/collector/consumer v0.86.0/go.mod h1:SvoV1eto4VZzQ3ILKQ1rv4qgN8rUMJqupn78hoXLHRw= -go.opentelemetry.io/collector/exporter v0.86.0 h1:LFmBb7S4Fkj5fv/nrUkLOy50GT6s4R/BLrv6uTb+GNo= -go.opentelemetry.io/collector/exporter v0.86.0/go.mod h1:+PKZrFV4sVgS2TVFnfZ+RCJqXexEENjW1riWaqkxsN4= -go.opentelemetry.io/collector/extension v0.86.0 h1:oXnZarkh1aBgnr/U3JSj/lPpBJUquOQ3DHMXXP4Jacc= -go.opentelemetry.io/collector/extension v0.86.0/go.mod h1:EPAloXQ+48577GvHTP5wGDvV4OyHPuldvM+2rYbM/fw= -go.opentelemetry.io/collector/extension/auth v0.86.0 h1:VwKbeElL8sBnvRDC565EWOw4ixMG/t0oXjIphNsRszU= -go.opentelemetry.io/collector/extension/auth v0.86.0/go.mod h1:qGIIkeWXaOtdYO1fYEn1vAEhUS+OhVcceUC1G3XOsdk= -go.opentelemetry.io/collector/extension/zpagesextension v0.86.0 h1:Ga5ZGEChIN0eqide9NFqlfEZPTRaTX3mAdLdbKwiOPQ= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015 h1:Wv8JFRUD01MwWkhZwF85to5oukHDFPRjnt88ArDFqco= -go.opentelemetry.io/collector/featuregate v1.0.0-rcv0015/go.mod h1:fLmJMf1AoHttkF8p5oJAc4o5ZpHu8yO5XYJ7gbLCLzo= -go.opentelemetry.io/collector/otelcol v0.86.0 h1:p9NjJ7dIgQs0tp6uTsnmziDZdIwHDQqQ/wbnyD4FoIM= -go.opentelemetry.io/collector/otelcol v0.86.0/go.mod h1:jYS+YFA1qaxmgblwnARe97kQm0N2ngejb2qhR3zRPgg= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015 h1:8PzrQFk3oKiT1Sd5EmNEcagdMyt1KcBy5/OyF5He5gY= -go.opentelemetry.io/collector/pdata v1.0.0-rcv0015/go.mod h1:I1PqyHJlsXjANC73tp43nDId7/jiv82NoZZ6uS0xdwM= -go.opentelemetry.io/collector/processor v0.86.0 h1:b4Htiom5mgcM5d7Memw1NkxBKgOADF1je0mLIhulQUM= -go.opentelemetry.io/collector/processor v0.86.0/go.mod h1:gJCNmRCqm/GKBHjRqlvRxMqWWcLCe1S6QNOxjtFv638= -go.opentelemetry.io/collector/receiver v0.86.0 h1:AP+KZ225CmXR1oBD36+vV/pZcRFTkSiG7HvAVqfHoRg= -go.opentelemetry.io/collector/receiver v0.86.0/go.mod h1:oFpofH/OG4HqmaVsb8ftnIAhLAhQnH/3bWrOdZZZjTk= -go.opentelemetry.io/collector/semconv v0.86.0 h1:bLlPe/JYNjQHo744cqi7iIEybuLv+M5DntUwQPTrvZo= -go.opentelemetry.io/collector/semconv v0.86.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= -go.opentelemetry.io/collector/service v0.86.0 h1:vyoynxNY2Oc6XET2ZvFkRC+Fpc1oMl9qQkORyX5LoWg= -go.opentelemetry.io/collector/service v0.86.0/go.mod h1:IT8MQbc9GWreG+GCuuG7DcQ72HUfV4a9iZXmwyPs27Q= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48= +go.opentelemetry.io/collector v0.87.0 h1:160HewHp+/wzr62BzWjQgIvdTtzpaYTlCnGVb8DYnM0= +go.opentelemetry.io/collector v0.87.0/go.mod h1:VsAXXIK0D1na+Ysoy1/GIx0GgkH8vQqA6zwosddFz7A= +go.opentelemetry.io/collector/component v0.87.0 h1:Q+lwM5WAa2x4a5lgyaF6SjFBpIij5gyjsoiv9KFG36A= +go.opentelemetry.io/collector/component v0.87.0/go.mod h1:LsfDQRkwJRHOSHNnM1/pdi/6EQNj41WpIxpZRqSdI0E= +go.opentelemetry.io/collector/config/configauth v0.87.0 h1:FufZLHvJ+VcAM2xi404TpuYnpO1Rmeq7XtHleQLavrs= +go.opentelemetry.io/collector/config/configauth v0.87.0/go.mod h1:xT8mIo1b57j0znSOssEFaJtE3rGw/kTZZucP5lEw6OU= +go.opentelemetry.io/collector/config/configcompression v0.87.0 h1:hWRT47RJbjbowDGQMXQO/dt/pzyYjMcf+rroW8b8fws= +go.opentelemetry.io/collector/config/configcompression v0.87.0/go.mod h1:LaavoxZsro5lL7qh1g9DMifG0qixWPEecW18Qr8bpag= +go.opentelemetry.io/collector/config/confighttp v0.87.0 h1:FOC4ArxbvJRiwABXsv/bSrRlD3m9nAEAACEYXmpNC+g= +go.opentelemetry.io/collector/config/confighttp v0.87.0/go.mod h1:Vt4DECSuhncd/bTKU3pB6MUjHwBKfPqiIkFg5fHJHIE= +go.opentelemetry.io/collector/config/confignet v0.87.0 h1:ULV44732QN0wTCtSIdYG04I+6wjZWzOCme/J4pqKYWg= +go.opentelemetry.io/collector/config/configopaque v0.87.0 h1:+qqJG1oEzX4+/YNbgeaXW9YM0BPWSj5XCi5y2zZLhDY= +go.opentelemetry.io/collector/config/configopaque v0.87.0/go.mod h1:TPCHaU+QXiEV+JXbgyr6mSErTI9chwQyasDVMdJr3eY= +go.opentelemetry.io/collector/config/configtelemetry v0.87.0 h1:xUqayM9b41OvXkjU3p8RkUr8hUrCjfDUmO+oKhRNSwc= +go.opentelemetry.io/collector/config/configtelemetry v0.87.0/go.mod h1:+LAXM5WFMW/UbTlAuSs6L/W72WC+q8TBJt/6z39FPOU= +go.opentelemetry.io/collector/config/configtls v0.87.0 h1:EXa9Plr74+r9t2/59dTyjR3y53zqwigHN0dQsI8VGiQ= +go.opentelemetry.io/collector/config/configtls v0.87.0/go.mod h1:3UoeynehS/NNhg1Qbt3xQdgPyrkWnjBRLUG2Gw7BFFc= +go.opentelemetry.io/collector/config/internal v0.87.0 h1:wffyWbpanr2HFQaPPp5bG62KqJYlw5EdPxwR0iG+Lbo= +go.opentelemetry.io/collector/config/internal v0.87.0/go.mod h1:42VsQ/1kP2qnvzjNi+dfNP+KyCFRADejyrJ8m2GVL3M= +go.opentelemetry.io/collector/confmap v0.87.0 h1:LFnyDKIOMtlJm5EsdcFN2t0rcU/QLbS9QEs/awM2HOA= +go.opentelemetry.io/collector/confmap v0.87.0/go.mod h1:inqYRP70+bMrUwGGnuhcWyyufxyU3VQT6rl3/EX0f+g= +go.opentelemetry.io/collector/connector v0.87.0 h1:Y00shHpxBSxliE/liJex2JMdYpJxbakfCUbaXe9eVMU= +go.opentelemetry.io/collector/connector v0.87.0/go.mod h1:qk+c3IeAdRkpUjXLh3PqAnC8BkKuMF7EhA5GpGNu7AI= +go.opentelemetry.io/collector/consumer v0.87.0 h1:oR5XKZoVF/hwz0FnrYPaHcbbQazHifMsxpENMR7ivvo= +go.opentelemetry.io/collector/consumer v0.87.0/go.mod h1:lui5rg1byAT7QPbCY733StCDc/TPxS3hVNXKoVQ3LsI= +go.opentelemetry.io/collector/exporter v0.87.0 h1:DZ0QT2yp1qACmHMxs6W2ho5RPqdevCx9R/LFCxnxi9w= +go.opentelemetry.io/collector/exporter v0.87.0/go.mod h1:SGobdCR0xwQElJT2Sbofo7BprMlV8XeXdsNP9fsNaKY= +go.opentelemetry.io/collector/extension v0.87.0 h1:EMIaEequ5rjWzoid6vNImjQGVMfzbME+8JSa5XACYKs= +go.opentelemetry.io/collector/extension v0.87.0/go.mod h1:D3srNZC99QVTAdLNUVuqfmmgJge4sQHDrnt5XWscvxI= +go.opentelemetry.io/collector/extension/auth v0.87.0 h1:na1OumQSd5l+JvUiMr3oaiW6fuiDr7mEnydwQwmE+nk= +go.opentelemetry.io/collector/extension/auth v0.87.0/go.mod h1:b7T9VefuK1GzSp5z1yjbkAvTxpWvflUmYoawTcGGuOs= +go.opentelemetry.io/collector/extension/zpagesextension v0.87.0 h1:vSaCojdWMq34LDw2qR6To0PkSe4p+1BtP2Xr37PHH7w= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016 h1:/6N9990tbjotvXgrXpV5AbaFiyxTdFEXDypGBHVDSQM= +go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016/go.mod h1:fLmJMf1AoHttkF8p5oJAc4o5ZpHu8yO5XYJ7gbLCLzo= +go.opentelemetry.io/collector/otelcol v0.87.0 h1:qmtF44r4heBSzoMo+hVJsYlwMDZBo4MjGDHJnDhT66c= +go.opentelemetry.io/collector/otelcol v0.87.0/go.mod h1:BSCvlVMyWLH3704kfGUv8KWRRN2nvNJBOBcfKttXTDM= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016 h1:qCPXSQCoD3qeWFb1RuIks8fw9Atxpk78bmtVdi15KhE= +go.opentelemetry.io/collector/pdata v1.0.0-rcv0016/go.mod h1:OdN0alYOlYhHXu6BDlGehrZWgtBuiDsz/rlNeJeXiNg= +go.opentelemetry.io/collector/processor v0.87.0 h1:aUGtRyeQk0WgQwp2rZBvJ1j+6+WJO8XMb1kjtanIWo8= +go.opentelemetry.io/collector/processor v0.87.0/go.mod h1:FHqpqdm/uyjjhNQxXJBhvQDIwjnP01EW9M6t0xVaRR4= +go.opentelemetry.io/collector/receiver v0.87.0 h1:4HpA5Rxb1jcMywCB8y5aNTXiqSt3n7oaFLfQbAkSaWM= +go.opentelemetry.io/collector/receiver v0.87.0/go.mod h1:uApnlS81KGGfQJrzbCdBZWsB5DQJgcPTsYlb9CFdE3s= +go.opentelemetry.io/collector/semconv v0.87.0 h1:BsG1jdLLRCBRlvUujk4QA86af7r/ZXnizczQpEs/gg8= +go.opentelemetry.io/collector/semconv v0.87.0/go.mod h1:j/8THcqVxFna1FpvA2zYIsUperEtOaRaqoLYIN4doWw= +go.opentelemetry.io/collector/service v0.87.0 h1:IFVdchppG9od4SzHgFEUfxUvvJ/F6WqknO1GK90mfVA= +go.opentelemetry.io/collector/service v0.87.0/go.mod h1:kBdpzrqR2wJkOdg50yzp4dv+2XBMyeqTgF4lCx0hSpQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= go.opentelemetry.io/contrib/propagators/b3 v1.19.0 h1:ulz44cpm6V5oAeg5Aw9HyqGFMS6XM7untlMEhD7YzzA= go.opentelemetry.io/contrib/propagators/b3 v1.19.0/go.mod h1:OzCmE2IVS+asTI+odXQstRGVfXQ4bXv9nMBRK0nNyqQ= -go.opentelemetry.io/contrib/zpages v0.44.0 h1:9J/cxTTWhM6kzgdaBt6NiXS2HUreXn/eW2M+vzHgDAQ= -go.opentelemetry.io/otel v1.18.0 h1:TgVozPGZ01nHyDZxK5WGPFB9QexeTMXEH7+tIClWfzs= -go.opentelemetry.io/otel v1.18.0/go.mod h1:9lWqYO0Db579XzVuCKFNPDl4s73Voa+zEck3wHaAYQI= -go.opentelemetry.io/otel/bridge/opencensus v0.41.0 h1:VBpeaTbrvLFHvRtsyCJXjsTaicBNrAFdmctiN1k6WNI= -go.opentelemetry.io/otel/bridge/opencensus v0.41.0/go.mod h1:yCQB5IKRhgjlbTLc91+ixcZc2/8BncGGJ+CS3dZJwtY= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0 h1:k0k7hFNDd8K4iOMJXj7s8sHaC4mhTlAeppRmZXLgZ6k= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.41.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0 h1:HgbDTD8pioFdY3NRc/YCvsWjqQPtweGyXxa32LgnTOw= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.41.0/go.mod h1:tmvt/yK5Es5d6lHYWerLSOna8lCEfrBVX/a9M0ggqss= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0 h1:iV3BOgW4fry1Riw9dwypigqlIYWXvSRVT2RJmblzo40= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.41.0/go.mod h1:7PGzqlKrxIRmbj5tlNW0nTkYZ5fHXDgk6Fy8/KjR0CI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0 h1:IAtl+7gua134xcV3NieDhJHjjOVeJhXAnYf/0hswjUY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.18.0/go.mod h1:w+pXobnBzh95MNIkeIuAKcHe/Uu/CX2PKIvBP6ipKRA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0 h1:yE32ay7mJG2leczfREEhoW3VfSZIvHaB+gvVo1o8DQ8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.18.0/go.mod h1:G17FHPDLt74bCI7tJ4CMitEk4BXTYG4FW6XUpkPBXa4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0 h1:6pu8ttx76BxHf+xz/H77AUZkPF3cwWzXqAUsXhVKI18= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.18.0/go.mod h1:IOmXxPrxoxFMXdNy7lfDmE8MzE61YPcurbUm0SMjerI= -go.opentelemetry.io/otel/exporters/prometheus v0.41.0 h1:A3/bhjP5SmELy8dcpK+uttHeh9Qrh+YnS16/VzrztRQ= -go.opentelemetry.io/otel/exporters/prometheus v0.41.0/go.mod h1:mKuXEMi9suyyNJQ99SZCO0mpWGFe0MIALtjd3r6uo7Q= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0 h1:XzjGkawtAXs20Y+s6k1GNDMBsMDOV28TOT8cxmE42qM= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.41.0/go.mod h1:HAomEgjcKZk3VJ+HHdHLnhZXeGqdzPxxNTdKYRopUXY= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0 h1:hSWWvDjXHVLq9DkmB+77fl8v7+t+yYiS+eNkiplDK54= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.18.0/go.mod h1:zG7KQql1WjZCaUJd+L/ReSYx4bjbYJxg5ws9ws+mYes= -go.opentelemetry.io/otel/metric v1.18.0 h1:JwVzw94UYmbx3ej++CwLUQZxEODDj/pOuTCvzhtRrSQ= -go.opentelemetry.io/otel/metric v1.18.0/go.mod h1:nNSpsVDjWGfb7chbRLUNW+PBNdcSTHD4Uu5pfFMOI0k= -go.opentelemetry.io/otel/sdk v1.18.0 h1:e3bAB0wB3MljH38sHzpV/qWrOTCFrdZF2ct9F8rBkcY= -go.opentelemetry.io/otel/sdk v1.18.0/go.mod h1:1RCygWV7plY2KmdskZEDDBs4tJeHG92MdHZIluiYs/M= -go.opentelemetry.io/otel/sdk/metric v0.41.0 h1:c3sAt9/pQ5fSIUfl0gPtClV3HhE18DCVzByD33R/zsk= -go.opentelemetry.io/otel/sdk/metric v0.41.0/go.mod h1:PmOmSt+iOklKtIg5O4Vz9H/ttcRFSNTgii+E1KGyn1w= -go.opentelemetry.io/otel/trace v1.18.0 h1:NY+czwbHbmndxojTEKiSMHkG2ClNH2PwmcHrdo0JY10= -go.opentelemetry.io/otel/trace v1.18.0/go.mod h1:T2+SGJGuYZY3bjj5rgh/hN7KIrlpWC5nS8Mjvzckz+0= +go.opentelemetry.io/contrib/zpages v0.45.0 h1:jIwHHGoWzJoZdbIUtWdErjL85Gni6BignnAFqDtMRL4= +go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/bridge/opencensus v0.42.0 h1:QvC+bcZkWMphWPiVqRQygMj6M0/3TOuJEO+erRA7kI8= +go.opentelemetry.io/otel/bridge/opencensus v0.42.0/go.mod h1:XJojP7g5DqYdiyArix/H9i1XzPPlIUc9dGLKtF9copI= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 h1:NmnYCiR0qNufkldjVvyQfZTHSdzeHoZ41zggMsdMcLM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0/go.mod h1:UVAO61+umUsHLtYb8KXXRoHtxUkdOPkYidzW3gipRLQ= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 h1:wNMDy/LVGLj2h3p6zg4d0gypKfWKSWI14E1C4smOgl8= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod h1:YfbDdXAAkemWJK3H/DshvlrxqFB2rtW4rY6ky/3x/H0= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 h1:3d+S281UTjM+AbF31XSOYn1qXn3BgIdWl8HNEpx08Jk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0/go.mod h1:0+KuTDyKL4gjKCF75pHOX4wuzYDUZYfAQdSu43o+Z2I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU= +go.opentelemetry.io/otel/exporters/prometheus v0.42.0 h1:jwV9iQdvp38fxXi8ZC+lNpxjK16MRcZlpDYvbuO1FiA= +go.opentelemetry.io/otel/exporters/prometheus v0.42.0/go.mod h1:f3bYiqNqhoPxkvI2LrXqQVC546K7BuRDL/kKuxkujhA= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0 h1:4jJuoeOo9W6hZnz+r046fyoH5kykZPRvKfUXJVfMpB0= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.42.0/go.mod h1:/MtYTE1SfC2QIcE0bDot6fIX+h+WvXjgTqgn9P0LNPE= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0 h1:Nw7Dv4lwvGrI68+wULbcq7su9K2cebeCUrDjVrUJHxM= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0/go.mod h1:1MsF6Y7gTqosgoZvHlzcaaM8DIMNZgJh87ykokoNH7Y= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k= +go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= @@ -1403,8 +1403,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck= -golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1502,8 +1502,8 @@ golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8= -golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1621,13 +1621,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.12.0 h1:/ZfYdc3zq+q02Rv9vGqTeSItdzZTSNDmfTi0mBAuidU= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1839,8 +1840,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I= +google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=