From 622cf682ba3f2119481c1ed5ac4d60ee3c8c721a Mon Sep 17 00:00:00 2001 From: Jacob Marble Date: Sat, 25 May 2024 14:20:17 -0700 Subject: [PATCH] chore: update otel to v0.99.0 --- .github/workflows/ci.yml | 2 +- common/go.mod | 2 +- common/go.sum | 4 +- demo/docker-compose.yml | 2 +- influx2otel/go.mod | 15 +- influx2otel/go.sum | 26 ++-- jaeger-influxdb/go.mod | 2 +- jaeger-influxdb/go.sum | 4 +- otel2influx/go.mod | 9 +- otel2influx/go.sum | 22 ++- otelcol-influxdb/Dockerfile | 2 +- otelcol-influxdb/build.yml | 44 +++--- run-checks.sh | 2 +- tests-integration/go.mod | 86 +++++------ tests-integration/go.sum | 180 +++++++++++------------ tests-integration/helper_otelcol_test.go | 38 ++--- 16 files changed, 215 insertions(+), 225 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1729f52c..8e2319d6 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.98.0 && + go install go.opentelemetry.io/collector/cmd/builder@v0.99.0 && cd otelcol-influxdb && builder --config build.yml diff --git a/common/go.mod b/common/go.mod index d40597e2..5c9ab8b6 100644 --- a/common/go.mod +++ b/common/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/semconv v0.98.0 + go.opentelemetry.io/collector/semconv v0.99.0 ) require ( diff --git a/common/go.sum b/common/go.sum index 43a413cc..8bc78754 100644 --- a/common/go.sum +++ b/common/go.sum @@ -11,8 +11,8 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -go.opentelemetry.io/collector/semconv v0.98.0 h1:zO4L4TmlxXoYu8UgPeYElGY19BW7wPjM+quL5CzoOoY= -go.opentelemetry.io/collector/semconv v0.98.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.99.0 h1:6xCezUbjdeMdrP2HtoEJQue99dgrZhqHCgjYRcuEGBg= +go.opentelemetry.io/collector/semconv v0.99.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= 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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml index 5f1c390f..8d60f85c 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.98.0 + image: otel/opentelemetry-collector-contrib:0.99.0 command: [ "--config", "/config.yml" ] stop_grace_period: 10s volumes: diff --git a/influx2otel/go.mod b/influx2otel/go.mod index 9eb0e95e..aff54d0c 100644 --- a/influx2otel/go.mod +++ b/influx2otel/go.mod @@ -1,21 +1,22 @@ module github.com/influxdata/influxdb-observability/influx2otel -go 1.21 +go 1.21.0 + +toolchain go1.21.10 require ( github.com/influxdata/influxdb-observability/common v0.5.8 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.98.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.99.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.99.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/semconv v0.98.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/semconv v0.99.0 ) require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.4 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -25,7 +26,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect - google.golang.org/grpc v1.62.1 // indirect + google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/influx2otel/go.sum b/influx2otel/go.sum index 251f9929..c220f259 100644 --- a/influx2otel/go.sum +++ b/influx2otel/go.sum @@ -5,8 +5,6 @@ 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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -23,12 +21,12 @@ 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/pkg/golden v0.98.0 h1:Y4UbYtpt+AsCVj4W8HKxLSlKNrMLhxypmA34GkwjJGE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.98.0/go.mod h1:a1eqRzzePACd9YamtiY0+42P4dn1pB0Ozc0B3P6JGMs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.98.0 h1:lZGvpoHCYoEFBDLhnKGGAgGJyX2l2jGZUgC1kTz/esI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.98.0/go.mod h1:fOHCXaWnVcKJPY9Jxeoyl7tSuuhZ/PPN92ib8eyjSLQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0 h1:F1Vnzkhg0Trncmvw65Mq1wBKPgX2wI3aGE90J7CXhuU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0/go.mod h1:yybbWtN2RnnIoqw3KzboFjk4iYpEBXPzHQvARs+eO9U= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.99.0 h1:UasccXIsMcNGsGuyft5N7C1vvzRmQCYHWVXF7YBcY/I= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.99.0/go.mod h1:v9snZu986K9CFjBYeYMwYs2hyqfTiOgLZDw5qphiObI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.99.0 h1:EEgERxtXvEIhtHtC7kWbRmfX5LWNIBQqx0RI70r1bfw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.99.0/go.mod h1:5KimRKjmPn++ylvv00qpVnaInTejqcrrYlZ24pCiymQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.99.0 h1:773dRpLIpySHFwejaGl8cPbyf1Q2jwhMOgJjDPSqQj0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.99.0/go.mod h1:PXpmpyK6VWoq1zb5ltUZxqSEpuBpFsY5WmlInpNiDUI= 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= @@ -39,10 +37,10 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8XFyA07j8LE= -go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw= -go.opentelemetry.io/collector/semconv v0.98.0 h1:zO4L4TmlxXoYu8UgPeYElGY19BW7wPjM+quL5CzoOoY= -go.opentelemetry.io/collector/semconv v0.98.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/pdata v1.6.0 h1:ZIByleLu7ZfHkfPuL8xIMb9M4Gv1R6568LAjhNOO9zY= +go.opentelemetry.io/collector/pdata v1.6.0/go.mod h1:pQv6AJO6wDUDxrPxhNaj3JdSzaOIo5glTGL1b4h4KTg= +go.opentelemetry.io/collector/semconv v0.99.0 h1:6xCezUbjdeMdrP2HtoEJQue99dgrZhqHCgjYRcuEGBg= +go.opentelemetry.io/collector/semconv v0.99.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -80,8 +78,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-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s= google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/jaeger-influxdb/go.mod b/jaeger-influxdb/go.mod index dceec8b9..52c3f34c 100644 --- a/jaeger-influxdb/go.mod +++ b/jaeger-influxdb/go.mod @@ -14,7 +14,7 @@ require ( github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/pdata v1.3.0 - go.opentelemetry.io/collector/semconv v0.98.0 + go.opentelemetry.io/collector/semconv v0.99.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.62.1 diff --git a/jaeger-influxdb/go.sum b/jaeger-influxdb/go.sum index 0e39ce6e..340ecb55 100644 --- a/jaeger-influxdb/go.sum +++ b/jaeger-influxdb/go.sum @@ -156,8 +156,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= go.opentelemetry.io/collector/pdata v1.3.0 h1:JRYN7tVHYFwmtQhIYbxWeiKSa2L1nCohyAs8sYqKFZo= go.opentelemetry.io/collector/pdata v1.3.0/go.mod h1:t7W0Undtes53HODPdSujPLTnfSR5fzT+WpL+RTaaayo= -go.opentelemetry.io/collector/semconv v0.98.0 h1:zO4L4TmlxXoYu8UgPeYElGY19BW7wPjM+quL5CzoOoY= -go.opentelemetry.io/collector/semconv v0.98.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/semconv v0.99.0 h1:6xCezUbjdeMdrP2HtoEJQue99dgrZhqHCgjYRcuEGBg= +go.opentelemetry.io/collector/semconv v0.99.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= diff --git a/otel2influx/go.mod b/otel2influx/go.mod index ffbf2735..b5e266c9 100644 --- a/otel2influx/go.mod +++ b/otel2influx/go.mod @@ -5,9 +5,9 @@ go 1.21 require ( github.com/influxdata/influxdb-observability/common v0.5.8 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/semconv v0.98.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/semconv v0.99.0 go.uber.org/multierr v1.11.0 golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 ) @@ -15,7 +15,6 @@ require ( require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.4 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -24,7 +23,7 @@ require ( golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect - google.golang.org/grpc v1.62.1 // indirect + google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/otel2influx/go.sum b/otel2influx/go.sum index 72126e32..9fdd4313 100644 --- a/otel2influx/go.sum +++ b/otel2influx/go.sum @@ -3,8 +3,6 @@ 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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -31,14 +29,14 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 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/consumer v0.98.0 h1:47zJ5HFKXVA0RciuwkZnPU5W8j0TYUxToB1/zzzgEhs= -go.opentelemetry.io/collector/consumer v0.98.0/go.mod h1:c2edTq38uVJET/NE6VV7/Qpyznnlz8b6VE7J6TXD57c= -go.opentelemetry.io/collector/pdata v1.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8XFyA07j8LE= -go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw= -go.opentelemetry.io/collector/pdata/testdata v0.98.0 h1:8gohV+LFXqMzuDwfOOQy9GcZBOX0C9xGoQkoeXFTzmI= -go.opentelemetry.io/collector/pdata/testdata v0.98.0/go.mod h1:B/IaHcf6+RtxI292CZu9TjfYQdi1n4+v6b8rHEonpKs= -go.opentelemetry.io/collector/semconv v0.98.0 h1:zO4L4TmlxXoYu8UgPeYElGY19BW7wPjM+quL5CzoOoY= -go.opentelemetry.io/collector/semconv v0.98.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/consumer v0.99.0 h1:juBa4nikGfi5QxjvKnscWG88BXyyozmtSLiLrw2An84= +go.opentelemetry.io/collector/consumer v0.99.0/go.mod h1:YzGeaxvKqkgtPFbFWXf4WtNO6KC8pdw209PaBQzV8Pk= +go.opentelemetry.io/collector/pdata v1.6.0 h1:ZIByleLu7ZfHkfPuL8xIMb9M4Gv1R6568LAjhNOO9zY= +go.opentelemetry.io/collector/pdata v1.6.0/go.mod h1:pQv6AJO6wDUDxrPxhNaj3JdSzaOIo5glTGL1b4h4KTg= +go.opentelemetry.io/collector/pdata/testdata v0.99.0 h1:/cEg4jdR3ntR3kZ0XjSelaBnm7GNSsFF1K3VK+ZHvL8= +go.opentelemetry.io/collector/pdata/testdata v0.99.0/go.mod h1:YzEkHFLPsxeNI2gv6UQvvn73nsgRNxMRnBpY63qvdsg= +go.opentelemetry.io/collector/semconv v0.99.0 h1:6xCezUbjdeMdrP2HtoEJQue99dgrZhqHCgjYRcuEGBg= +go.opentelemetry.io/collector/semconv v0.99.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -78,8 +76,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-20240311173647-c811ad7063a7 h1:8EeVk1VKMD+GD/neyEHGmz7pFblqPjHoi+PGQIlLx2s= google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/otelcol-influxdb/Dockerfile b/otelcol-influxdb/Dockerfile index 71bd0880..b003d10d 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.98.0 && \ + go install go.opentelemetry.io/collector/cmd/builder@v0.99.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 748f56ce..a8836c0f 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.98.0-0.0.0-beta.0 - otelcol_version: 0.98.0 + version: 0.99.0-0.0.0-beta.0 + otelcol_version: 0.99.0 output_path: ./build receivers: -- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.98.0 +- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.99.0 exporters: -- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.98.0 +- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.99.0 connectors: -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.98.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.99.0 extensions: -- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.98.0 -- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.98.0 +- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.99.0 +- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.99.0 processors: -- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.98.0 -- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.98.0 -- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.98.0 +- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.99.0 +- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.99.0 +- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.99.0 replaces: - github.com/influxdata/influxdb-observability/common => ../../common diff --git a/run-checks.sh b/run-checks.sh index 895d1cb3..1515c3c4 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.98.0; then + if ! go install go.opentelemetry.io/collector/cmd/builder@v0.99.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 0e341762..c9c696e8 100644 --- a/tests-integration/go.mod +++ b/tests-integration/go.mod @@ -1,30 +1,32 @@ module tests -go 1.21 +go 1.21.0 + +toolchain go1.21.10 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.98.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.98.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.98.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.98.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.99.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.99.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.99.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.99.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 - go.opentelemetry.io/collector/otelcol v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/processor v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 + go.opentelemetry.io/collector/otelcol v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/processor v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 go.uber.org/zap v1.27.0 - google.golang.org/grpc v1.63.0 + google.golang.org/grpc v1.63.2 ) require ( @@ -55,7 +57,7 @@ require ( github.com/google/cel-go v0.14.1-0.20230424164844-d39523c445fc // indirect github.com/google/uuid v1.6.0 // indirect github.com/gosnmp/gosnmp v1.35.1-0.20230602062452-f30602b8dad6 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/influxdata/influxdb-observability/common v0.5.8 // indirect @@ -76,13 +78,13 @@ 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.98.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.99.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.99.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.19.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.50.0 // indirect + github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 // indirect github.com/rs/cors v1.10.1 // indirect @@ -99,25 +101,25 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.5.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.98.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.98.0 // indirect - go.opentelemetry.io/collector/config/internal v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 // indirect - go.opentelemetry.io/collector/connector v0.98.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect - go.opentelemetry.io/collector/semconv v0.98.0 // indirect - go.opentelemetry.io/collector/service v0.98.0 // indirect - go.opentelemetry.io/contrib/config v0.4.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/collector v0.99.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.6.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.99.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.6.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.99.0 // indirect + go.opentelemetry.io/collector/config/internal v0.99.0 // indirect + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0 // indirect + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0 // indirect + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0 // indirect + go.opentelemetry.io/collector/connector v0.99.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect + go.opentelemetry.io/collector/semconv v0.99.0 // indirect + go.opentelemetry.io/collector/service v0.99.0 // indirect + go.opentelemetry.io/contrib/config v0.5.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.25.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/bridge/opencensus v1.25.0 // indirect @@ -133,7 +135,7 @@ require ( go.opentelemetry.io/otel/sdk v1.25.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect - go.opentelemetry.io/proto/otlp v1.1.0 // indirect + go.opentelemetry.io/proto/otlp v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.22.0 // indirect golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect diff --git a/tests-integration/go.sum b/tests-integration/go.sum index 361274de..26452cb6 100644 --- a/tests-integration/go.sum +++ b/tests-integration/go.sum @@ -800,8 +800,8 @@ 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.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF/w5E9CNxSwbpD6No= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/gwos/tcg/sdk v0.0.0-20220621192633-df0eac0a1a4c h1:pVr0TkSFnMP4BWSsEak/4bxD8/K+foJ9V8DGyZ6PIDE= @@ -1216,20 +1216,20 @@ 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.98.0 h1:Ox0TR2Rn81gutbf3NuC0iGytHW+p90+WSgjVRxA75Gk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.98.0/go.mod h1:8abc82jJHH8NezzPJAnNopRiTKKsyPfmqhpZ6YrlRvM= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.98.0 h1:96d2bgJfwjyX7oisKJjYPPUnhdKVK4mss/mL9f3nw2g= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.98.0/go.mod h1:DQBGDiuwOOmIXIxgWMRiK0Qu7XbAyHO8OEDsjIWEoNk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.98.0 h1:rbfZJ4YA82WSC9HW2jgmY1UZEsOYte8VTjrBFU6dv5Y= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.98.0/go.mod h1:KOTp7iN8sWTmqk/SxbMqvM2KXUdgXRWb6hI84E5arLY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.98.0 h1:Y4UbYtpt+AsCVj4W8HKxLSlKNrMLhxypmA34GkwjJGE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.98.0/go.mod h1:a1eqRzzePACd9YamtiY0+42P4dn1pB0Ozc0B3P6JGMs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.98.0 h1:lZGvpoHCYoEFBDLhnKGGAgGJyX2l2jGZUgC1kTz/esI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.98.0/go.mod h1:fOHCXaWnVcKJPY9Jxeoyl7tSuuhZ/PPN92ib8eyjSLQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0 h1:F1Vnzkhg0Trncmvw65Mq1wBKPgX2wI3aGE90J7CXhuU= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.98.0/go.mod h1:yybbWtN2RnnIoqw3KzboFjk4iYpEBXPzHQvARs+eO9U= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.98.0 h1:A6eJiRVs8nss7SVGAlhlsTiOThbap8Gevx0zV4mlEfY= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.98.0/go.mod h1:mVeEzkgkB09GZmPKuYngf1Fm49g9dV7AH/h0xzejGqA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.99.0 h1:qWoQxXzKM2dD9hUsb0+Mr7F/F/C1YG++4f6Z5+nHo1U= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter v0.99.0/go.mod h1:3j7oWYG069V3EXTL6050y9WCPd6vYzpnW0LfIG+GbH4= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.99.0 h1:b+3VKuqpt23UJwiLNF+OLCmYYPtRK6zWQ0WYwscT/as= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.99.0/go.mod h1:GT52Z72X1zd3F4LHqBHSgmNH4iB3nS2tD36rifNQzNs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.99.0 h1:kFFjokhjskiWZAEnuWa/WwptRmg2C1USHUuHLtFFd+c= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.99.0/go.mod h1:spCm7T9zJsnSzEzTfEVJXQ3HxgBUkZmJDCfpKeRO60I= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.99.0 h1:UasccXIsMcNGsGuyft5N7C1vvzRmQCYHWVXF7YBcY/I= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.99.0/go.mod h1:v9snZu986K9CFjBYeYMwYs2hyqfTiOgLZDw5qphiObI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.99.0 h1:EEgERxtXvEIhtHtC7kWbRmfX5LWNIBQqx0RI70r1bfw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.99.0/go.mod h1:5KimRKjmPn++ylvv00qpVnaInTejqcrrYlZ24pCiymQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.99.0 h1:773dRpLIpySHFwejaGl8cPbyf1Q2jwhMOgJjDPSqQj0= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.99.0/go.mod h1:PXpmpyK6VWoq1zb5ltUZxqSEpuBpFsY5WmlInpNiDUI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.99.0 h1:mKqvxtvrluec6tT8sfCkUPq0+m8B3sIh1oUjHBE1R9o= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/influxdbreceiver v0.99.0/go.mod h1:bt6GE7xL5ubh4phgZO52NAuOwhovVDSblphxgEftrDQ= github.com/openconfig/gnmi v0.10.0 h1:kQEZ/9ek3Vp2Y5IVuV2L/ba8/77TgjdXg505QXvYmg8= github.com/openconfig/gnmi v0.10.0/go.mod h1:Y9os75GmSkhHw2wX8sMsxfI7qRGAEcDh8NTa5a8vj6E= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -1329,8 +1329,8 @@ github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16 github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.23.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.50.0 h1:YSZE6aa9+luNa2da6/Tik0q0A5AbR+U003TItK57CPQ= -github.com/prometheus/common v0.50.0/go.mod h1:wHFBCEVWVmHMUpg7pYcOm2QUR/ocQdYSJVQJKnHc3xQ= +github.com/prometheus/common v0.52.3 h1:5f8uj6ZwHSscOGNdIQg6OiZv/ybiK2CO2q2drVZAQSA= +github.com/prometheus/common v0.52.3/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1568,74 +1568,74 @@ 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.98.0 h1:O7bpARGWzNfFQEYevLl4iigDrpGTJY3vV/kKqNZzMOk= -go.opentelemetry.io/collector v0.98.0/go.mod h1:fvPM+tBML07uvAP1MV2msYPSYJ9U/lgE1jDb3AFBaMM= -go.opentelemetry.io/collector/component v0.98.0 h1:0TMaBOyCdABiVLFdGOgG8zd/1IeGldCinYonbY08xWk= -go.opentelemetry.io/collector/component v0.98.0/go.mod h1:F6zyQLsoExl6r2q6WWZm8rmSSALbwG2zwIHLrMzZVio= -go.opentelemetry.io/collector/config/configauth v0.98.0 h1:FPffZ1dRL6emStrDUEGpL0rCChbUZNAQgpArXD0SESI= -go.opentelemetry.io/collector/config/configauth v0.98.0/go.mod h1:5pMzf2zgFwS7tujNq0AtOOli5vxIvnrNi7JlZwrBOFo= -go.opentelemetry.io/collector/config/configcompression v1.5.0 h1:FTxKbFPN4LznRCH/GQ+b+0tAWmg80Y2eEka79S2sLZ0= -go.opentelemetry.io/collector/config/configcompression v1.5.0/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= -go.opentelemetry.io/collector/config/confighttp v0.98.0 h1:pW7gR34TTXcrCHJgemL6A4VBVBS2NyDAkruSMvQj1Vo= -go.opentelemetry.io/collector/config/confighttp v0.98.0/go.mod h1:M9PMtiKrTJMG8i3SqJ+AUVKhR6sa3G/8S2F1+Dxkkr0= -go.opentelemetry.io/collector/config/confignet v0.98.0 h1:pXDBb2hFe10T/NMHlL/oMgk1aFfe4NmmJFdFoioyC9o= -go.opentelemetry.io/collector/config/confignet v0.98.0/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= -go.opentelemetry.io/collector/config/configopaque v1.5.0 h1:WJzgmsFU2v63BypPBNGL31ACwWn6PwumPJNpLZplcdE= -go.opentelemetry.io/collector/config/configopaque v1.5.0/go.mod h1:/otnfj2E8r5EfaAdNV4qHkTclmiBCZXaahV5EcLwT7k= -go.opentelemetry.io/collector/config/configretry v0.98.0 h1:gZRenX9oMLJmQ/CD8YwFNl9YYl68RtcD0RYSCJhrMAk= -go.opentelemetry.io/collector/config/configretry v0.98.0/go.mod h1:uRdmPeCkrW9Zsadh2WEbQ1AGXGYJ02vCfmmT+0g69nY= -go.opentelemetry.io/collector/config/configtelemetry v0.98.0 h1:f8RNZ1l/kYPPoxFmKKvTUli8iON7CMsm85KM38PVNts= -go.opentelemetry.io/collector/config/configtelemetry v0.98.0/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= -go.opentelemetry.io/collector/config/configtls v0.98.0 h1:g+MADy01ge8iGC6v2tbJ5G27CWNG1BaJtmYdmpvm8e4= -go.opentelemetry.io/collector/config/configtls v0.98.0/go.mod h1:9RHArziz0mNEEkti0kz5LIdvbQGT7/Unu/0whKKazHQ= -go.opentelemetry.io/collector/config/internal v0.98.0 h1:wz/6ncawMX5cfIiXJEYSUm1g1U6iE/VxFRm4/WhVBPI= -go.opentelemetry.io/collector/config/internal v0.98.0/go.mod h1:xPnEE6QaTSXr+ctYMSTBxI2qwTntTUM4cYk7OTm6Ugc= -go.opentelemetry.io/collector/confmap v0.98.0 h1:qQreBlrqio1y7uhrAvr+W86YbQ6fw7StgkbYpvJ2vVc= -go.opentelemetry.io/collector/confmap v0.98.0/go.mod h1:BWKPIpYeUzSG6ZgCJMjF7xsLvyrvJCfYURl57E5vhiQ= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.0 h1:lRhfcLr3gK5S/zn92h3clyOPnCvvNKs1WTMbtH4UvO0= -go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.0/go.mod h1:vNMFTWe4dF05LsodUOc84OfxdlYVp1kCMuZzb41WfAk= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 h1:x/VsGlBj+DtJCXIucwzwcxiwnwAU8a6ALK6UN8fPdKQ= -go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0/go.mod h1:BapTGXu7CYrQGNohbapPwTSt2Ty/k/c6Oemx9mSSiK4= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 h1:SxDS+Yr8qE+ID58ELR5n0D+SUlqHKOZ72pK3YPFAelA= -go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0/go.mod h1:DEoB0d0k1iGt4KEABntL8AW9xYQ6E7fmgkM2/s8aXvM= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 h1:C02SPbRPvrtmZ9TvsHWpz2TvHzqY5mNyEAlDdhax/a4= -go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0/go.mod h1:dzZKtykJio3Rm+G+Cmr15VV3xKp0PmFuh9Q9b3c1K7A= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 h1:04zGXVQZ8D6nvoPX8AaqxWxGHNNVsGR78E+tY+2VQr8= -go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0/go.mod h1:+UrRiugWaQPssz4mgEgQQo640f2bDUCFlo2Xr0/5ulc= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 h1:JYpDN0OnMsu0awk0rjaYEIko9hFzzBJ6+2U5W2iVvUE= -go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0/go.mod h1:xrXL804nBum1PgbvmJQ4I+hyW+DU4xBGO3MKMiYFX6E= -go.opentelemetry.io/collector/connector v0.98.0 h1:1ifadXqOtB5bZ+OocLVlzF0zltWjP70E3+xYt2fJnMg= -go.opentelemetry.io/collector/connector v0.98.0/go.mod h1:OFii9qa2ZgktI61/r0gWDsGjXtpEe+qXC8+0o4ZySeA= -go.opentelemetry.io/collector/consumer v0.98.0 h1:47zJ5HFKXVA0RciuwkZnPU5W8j0TYUxToB1/zzzgEhs= -go.opentelemetry.io/collector/consumer v0.98.0/go.mod h1:c2edTq38uVJET/NE6VV7/Qpyznnlz8b6VE7J6TXD57c= -go.opentelemetry.io/collector/exporter v0.98.0 h1:eN2qtkiwpeX9gBu9JZw1k/CZ3N9wZE1aGJ1A0EvwJ7w= -go.opentelemetry.io/collector/exporter v0.98.0/go.mod h1:GCW46a0VAuW7nljlW//GgFXI+8mSrJjrdEKVO9icExE= -go.opentelemetry.io/collector/extension v0.98.0 h1:08B5ipEsoNmPHY96j5EUsUrFre01GOZ4zgttUDtPUkY= -go.opentelemetry.io/collector/extension v0.98.0/go.mod h1:fZ1Hnnahszl5j3xcW2sMRJ0FLWDOFkFMQeVDP0Se7i8= -go.opentelemetry.io/collector/extension/auth v0.98.0 h1:7b1jioijJbTMqaOCrz5Hoqf+zJn2iPlGmtN7pXLNWbA= -go.opentelemetry.io/collector/extension/auth v0.98.0/go.mod h1:gssWC4AxAwAEKI2CqS93lhjWffsVdzD8q7UGL6LaRr0= -go.opentelemetry.io/collector/extension/zpagesextension v0.98.0 h1:JfvsDpTwAhA9au8/4vmONRh0OBVU6n36seb41JD/mTQ= -go.opentelemetry.io/collector/extension/zpagesextension v0.98.0/go.mod h1:t1zDwy6kYp4w1JgcGHMvdGbKYHqWpK00bB1AEQ0Oqlc= -go.opentelemetry.io/collector/featuregate v1.5.0 h1:uK8qnYQKz1TMkK+FDTFsywg/EybW/gbnOUaPNUkRznM= -go.opentelemetry.io/collector/featuregate v1.5.0/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= -go.opentelemetry.io/collector/otelcol v0.98.0 h1:sUk49Wqw+VBYeDynEA+GSeVEusFvzFW3KuF2vfDbyo0= -go.opentelemetry.io/collector/otelcol v0.98.0/go.mod h1:dW3UzuaiaNTddjKajk3Tp2Y7muDvYJdQz2yGUOE53gs= -go.opentelemetry.io/collector/pdata v1.5.0 h1:1fKTmUpr0xCOhP/B0VEvtz7bYPQ45luQ8XFyA07j8LE= -go.opentelemetry.io/collector/pdata v1.5.0/go.mod h1:TYj8aKRWZyT/KuKQXKyqSEvK/GV+slFaDMEI+Ke64Yw= -go.opentelemetry.io/collector/pdata/testdata v0.98.0 h1:8gohV+LFXqMzuDwfOOQy9GcZBOX0C9xGoQkoeXFTzmI= -go.opentelemetry.io/collector/pdata/testdata v0.98.0/go.mod h1:B/IaHcf6+RtxI292CZu9TjfYQdi1n4+v6b8rHEonpKs= -go.opentelemetry.io/collector/processor v0.98.0 h1:onrg8a99lToytbHF148Bg9a7DfNk31B+p6UHouiiVTw= -go.opentelemetry.io/collector/processor v0.98.0/go.mod h1:QxgzjmJI12DQWN0LIHmZBOR7HRzPuVWFW4oqTdrS1ho= -go.opentelemetry.io/collector/receiver v0.98.0 h1:qw6JYwm+sHcZvM1DByo3QlGe6yGHuwd0yW4hEPVqYKU= -go.opentelemetry.io/collector/receiver v0.98.0/go.mod h1:AwIWn+KnquTR+kbhXQrMH+i2PvTCFldSIJznBWFYs0s= -go.opentelemetry.io/collector/semconv v0.98.0 h1:zO4L4TmlxXoYu8UgPeYElGY19BW7wPjM+quL5CzoOoY= -go.opentelemetry.io/collector/semconv v0.98.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= -go.opentelemetry.io/collector/service v0.98.0 h1:lLJ7VXPXcV62fSISh4GuNd5ti6WvKje76NSgezc3ydo= -go.opentelemetry.io/collector/service v0.98.0/go.mod h1:wB7ozvZTHtMefb5KTYy5nyrVYWpGk8teq8jWFs4blIU= -go.opentelemetry.io/contrib/config v0.4.0 h1:Xb+ncYOqseLroMuBesGNRgVQolXcXOhMj7EhGwJCdHs= -go.opentelemetry.io/contrib/config v0.4.0/go.mod h1:drNk2xRqLWW4/amk6Uh1S+sDAJTc7bcEEN1GfJzj418= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/collector v0.99.0 h1:O3EtCr+Bp2FoYI4KZCcC10FbMOjtRPXN1JBgFmi2WvY= +go.opentelemetry.io/collector v0.99.0/go.mod h1:rdrDdSy+184UZ7YhJEo7aq9KHdrq6J46WWC//Tg7FBo= +go.opentelemetry.io/collector/component v0.99.0 h1:uU8m9d19Jf+zaf7T8Bl12Mm1qozqTZkDISCnnBnS0u4= +go.opentelemetry.io/collector/component v0.99.0/go.mod h1:sGAyyOtJRlqqt396jisIQxsOW7cOIKOTLi+iCarx++s= +go.opentelemetry.io/collector/config/configauth v0.99.0 h1:ggq8ow4HCSqab+YsdrbWRiePamHJdZlkUg1ve6Gg/Cc= +go.opentelemetry.io/collector/config/configauth v0.99.0/go.mod h1:24vfHNtW9sekwkje7C6kerbqqcG4V0Ezj/HZ0Clllc0= +go.opentelemetry.io/collector/config/configcompression v1.6.0 h1:uSQ5nNMLOdUVYEIBkATcJvwOasZbGUPGHXGDmaRRU8s= +go.opentelemetry.io/collector/config/configcompression v1.6.0/go.mod h1:O0fOPCADyGwGLLIf5lf7N3960NsnIfxsm6dr/mIpL+M= +go.opentelemetry.io/collector/config/confighttp v0.99.0 h1:tstF3CdiRId6etg9FbN5SLKPxhlW1TasErHF7AzxTvE= +go.opentelemetry.io/collector/config/confighttp v0.99.0/go.mod h1:CeLCwdaMLBlWdyruxFMH1hVGgTINYUaY2K79OHnr4KI= +go.opentelemetry.io/collector/config/confignet v0.99.0 h1:20NV0zLIjbRfKMh//z/ZC2XnNA2GwWZf8xTUBWubI34= +go.opentelemetry.io/collector/config/confignet v0.99.0/go.mod h1:3naWoPss70RhDHhYjGACi7xh4NcVRvs9itzIRVWyu1k= +go.opentelemetry.io/collector/config/configopaque v1.6.0 h1:MVlbCzVln1+8+VWxKVCLWONZNISVrSkbIz0+Q/bneOc= +go.opentelemetry.io/collector/config/configopaque v1.6.0/go.mod h1:i5d1RN7jwmChc78dCCF5ZE4Sm5EXXpksHbf1/tOBXho= +go.opentelemetry.io/collector/config/configretry v0.99.0 h1:ZVt2NVFaUn+wtNvvr9uU45tN59tc6qQUQBRgCslWSfQ= +go.opentelemetry.io/collector/config/configretry v0.99.0/go.mod h1:uRdmPeCkrW9Zsadh2WEbQ1AGXGYJ02vCfmmT+0g69nY= +go.opentelemetry.io/collector/config/configtelemetry v0.99.0 h1:Fks8xkTUnxw1nEcTyYOXnIHttI9BGgjOCB0bwBH3LcU= +go.opentelemetry.io/collector/config/configtelemetry v0.99.0/go.mod h1:YV5PaOdtnU1xRomPcYqoHmyCr48tnaAREeGO96EZw8o= +go.opentelemetry.io/collector/config/configtls v0.99.0 h1:T83FIw+f0SZu0pNoAccbNLNsaQJRX541q2R+pQXVGEY= +go.opentelemetry.io/collector/config/configtls v0.99.0/go.mod h1:TQO3AhguNC8GZxFCu3PpxMw0ZNoyFAAyRsqcz/ID2qY= +go.opentelemetry.io/collector/config/internal v0.99.0 h1:CkYpKq05qe/9v0us16Mtr3p+EvBI0ePTKIUC2gYcBns= +go.opentelemetry.io/collector/config/internal v0.99.0/go.mod h1:pCqivIZCN0wP2IjNZfDvTLjjdLAZgm7jOHVhrPwt+/Y= +go.opentelemetry.io/collector/confmap v0.99.0 h1:0ZJOl79eEm/oxR6aTIbhL9E5liq6UEod2gt1pYNaIoc= +go.opentelemetry.io/collector/confmap v0.99.0/go.mod h1:BWKPIpYeUzSG6ZgCJMjF7xsLvyrvJCfYURl57E5vhiQ= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0 h1:xkcnTCUiN+32nVMFe2KzBA2Pzku+iX8H0r9MoyAPMuk= +go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0/go.mod h1:ULgGr6lAcRAV1c/9FiiFtc/WVPmMiAKrtSmZukjmRjc= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0 h1:P83x+D5MX2V7zdwpmP5Z8dsIOISsB12+UYmRUqNHgEg= +go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0/go.mod h1:cp3yA/rhyowAkv+SieNIYkF2jfOsVIJgIKCeI2tE0dA= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 h1:pZRA+ZZ8udN5v9Cg+IWOQELh5IVoPqc0U+L1ctMlZDE= +go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0/go.mod h1:8gYm8SwY26/4m/30nofcKO2cZkY/4aqWc3IuaSANK9Q= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0 h1:mWFYoQ3B/rDcEDpzOjhj+zEKlR7uiYV5y2xTtM7KbOg= +go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0/go.mod h1:EXY7Es69mMsYhV0lBlB3xU5A133ffM8YyNBLNYSzh5k= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0 h1:2uymE+VC+TQ7EJiohstt/73ZvyT9FeZeeRNmAtHXvAw= +go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0/go.mod h1:NHf59q2Qz9AZg+wDzG/IWpQ8ekyIGqBfHnwBfPz4S7A= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0 h1:93pSXp/rBpZozB8HainZsVt0LSNX0oysVo9D2upeU4k= +go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0/go.mod h1:N2YrPm9qlyUblEVIFv7EEIgmLjXMbLv/Tw4Om0YuET8= +go.opentelemetry.io/collector/connector v0.99.0 h1:VTjRlDwQTybJ5FX8cV59Fo4/PscsuP5lmrzNVwwysmQ= +go.opentelemetry.io/collector/connector v0.99.0/go.mod h1:c38767M8LS8Dy/F3c+OInHmXGh6mXgMRF6Z1cckzWkc= +go.opentelemetry.io/collector/consumer v0.99.0 h1:juBa4nikGfi5QxjvKnscWG88BXyyozmtSLiLrw2An84= +go.opentelemetry.io/collector/consumer v0.99.0/go.mod h1:YzGeaxvKqkgtPFbFWXf4WtNO6KC8pdw209PaBQzV8Pk= +go.opentelemetry.io/collector/exporter v0.99.0 h1:A8F/65vFqAU3aJTAaVEg/16zh5vDdL75IyqKOsXe6xk= +go.opentelemetry.io/collector/exporter v0.99.0/go.mod h1:f3melXgO7dSjuAJjUtvSjTEBryj9aVMYG2JQlhtVUiI= +go.opentelemetry.io/collector/extension v0.99.0 h1:o8Lb7oT/CvqLz9JC9qJCs5h8ABlDVsdGeIJp/a8BFvs= +go.opentelemetry.io/collector/extension v0.99.0/go.mod h1:Whm3qKOk4F6336T6a0BlAxtt4+fEOLECuqTBazLG8mM= +go.opentelemetry.io/collector/extension/auth v0.99.0 h1:txyH8hQugRinASfuRmNgFj24TpkXN7q5H+oLVB9VaS4= +go.opentelemetry.io/collector/extension/auth v0.99.0/go.mod h1:brtmx1Xgj+2WBM5vYX59TRYiDjZ7+CNP3QM/V9WL2dI= +go.opentelemetry.io/collector/extension/zpagesextension v0.99.0 h1:4lG8GKJLuc/3WqdIPbA7zWF2E4Syn9IpLPLtUaWefRM= +go.opentelemetry.io/collector/extension/zpagesextension v0.99.0/go.mod h1:mQF+VTrjF0VQDbJM/MeWA6QhTunEU5R4unKi0+Vn+pE= +go.opentelemetry.io/collector/featuregate v1.6.0 h1:1Q0tt/GPx+PRBGAE7kNJaWLIXYNVD74K/KYf0DTXZfM= +go.opentelemetry.io/collector/featuregate v1.6.0/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w= +go.opentelemetry.io/collector/otelcol v0.99.0 h1:sQOyZQP68UqwqlNC1/hMm9lIbxS0PY9vnHubn7Qpp7w= +go.opentelemetry.io/collector/otelcol v0.99.0/go.mod h1:MwUkATYB4wCj1gnKI+/LvC9QjE6VAjdRaa66GNZ/IS8= +go.opentelemetry.io/collector/pdata v1.6.0 h1:ZIByleLu7ZfHkfPuL8xIMb9M4Gv1R6568LAjhNOO9zY= +go.opentelemetry.io/collector/pdata v1.6.0/go.mod h1:pQv6AJO6wDUDxrPxhNaj3JdSzaOIo5glTGL1b4h4KTg= +go.opentelemetry.io/collector/pdata/testdata v0.99.0 h1:/cEg4jdR3ntR3kZ0XjSelaBnm7GNSsFF1K3VK+ZHvL8= +go.opentelemetry.io/collector/pdata/testdata v0.99.0/go.mod h1:YzEkHFLPsxeNI2gv6UQvvn73nsgRNxMRnBpY63qvdsg= +go.opentelemetry.io/collector/processor v0.99.0 h1:A6xaGNybbHn/FDLVeDY2ZmU5S6F8y4si91IKIUHzPm8= +go.opentelemetry.io/collector/processor v0.99.0/go.mod h1:+uCijw9sMfQFg2ePkiVn1JM6jhBbjYrnvu4Kzdx2y3g= +go.opentelemetry.io/collector/receiver v0.99.0 h1:NdYShaEaabxVBRQaxK/HcKqRGl1eUFaipKmjZlQb5FA= +go.opentelemetry.io/collector/receiver v0.99.0/go.mod h1:aU9ftU4FhdEY9/eREf86FWHmZHz8kufXchfpHrTTrn0= +go.opentelemetry.io/collector/semconv v0.99.0 h1:6xCezUbjdeMdrP2HtoEJQue99dgrZhqHCgjYRcuEGBg= +go.opentelemetry.io/collector/semconv v0.99.0/go.mod h1:8ElcRZ8Cdw5JnvhTOQOdYizkJaQ10Z2fS+R6djOnj6A= +go.opentelemetry.io/collector/service v0.99.0 h1:Ods9uVHAZb1PW1nTC5XOzC+lC1qrA+EVyt1NNzT8Uqk= +go.opentelemetry.io/collector/service v0.99.0/go.mod h1:R5dcvSHaqdx3xojrq0rJdLyKeGZMke37ZWgzCbLhapQ= +go.opentelemetry.io/contrib/config v0.5.0 h1:7jLbj1losnHOq1rarCVMEDrmkHWixEIJ11pDtT4KrGM= +go.opentelemetry.io/contrib/config v0.5.0/go.mod h1:MY6YLx0DzoiCu0ZjnbNiCk+19yN2P0Zj5SkAdEo3Nz8= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 h1:cEPbyTSEHlQR89XVlyo78gqluF8Y3oMeBkXGWzQsfXY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0/go.mod h1:DKdbWcT4GH1D0Y3Sqt/PFXt2naRKDWtU+eE6oLdFNA8= go.opentelemetry.io/contrib/propagators/b3 v1.25.0 h1:QU8UEKyPqgr/8vCC9LlDmkPnfFmiWAUF9GtJdcLz+BU= go.opentelemetry.io/contrib/propagators/b3 v1.25.0/go.mod h1:qonC7wyvtX1E6cEpAR+bJmhcGr6IVRGc/f6ZTpvi7jA= go.opentelemetry.io/contrib/zpages v0.50.0 h1:hKC5asr83xDN4ErwSHVdk3gv053pZiF8SZKmS86IPEw= @@ -1668,8 +1668,8 @@ go.opentelemetry.io/otel/sdk/metric v1.25.0 h1:7CiHOy08LbrxMAp4vWpbiPcklunUshVpA go.opentelemetry.io/otel/sdk/metric v1.25.0/go.mod h1:LzwoKptdbBBdYfvtGCzGwk6GWMA3aUzBOwtQpR6Nz7o= go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM= go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I= -go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI= -go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY= +go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM= go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -2146,8 +2146,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.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= -google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= 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/tests-integration/helper_otelcol_test.go b/tests-integration/helper_otelcol_test.go index d95a976e..ae1b6c1a 100644 --- a/tests-integration/helper_otelcol_test.go +++ b/tests-integration/helper_otelcol_test.go @@ -70,7 +70,7 @@ service: mockDestination := httptest.NewServer(mockReceiverFactory) otelcolHealthCheckAddress := fmt.Sprintf("127.0.0.1:%d", findOpenTCPPort(t)) - otelcolConfigProvider := func() otelcol.ConfigProvider { + otelcolConfigProviderSettings := func() otelcol.ConfigProviderSettings { mockDestinationEndpoint := mockDestination.URL configString := strings.ReplaceAll(otelcolConfigTemplate, "ENDPOINT_DESTINATION", mockDestinationEndpoint) configString = strings.ReplaceAll(configString, "SPAN_DIMENSIONS", "\n - service.name\n - span.name") @@ -78,17 +78,13 @@ service: configString = strings.ReplaceAll(configString, "METRICS_SCHEMA", "telegraf-prometheus-v1") configString = strings.ReplaceAll(configString, "ADDRESS_HEALTH_CHECK", otelcolHealthCheckAddress) t.Setenv("test-env", configString) - configMapProvider := envprovider.NewWithSettings(confmap.ProviderSettings{}) - configProviderSettings := otelcol.ConfigProviderSettings{ + return otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{"env:test-env"}, - Providers: map[string]confmap.Provider{configMapProvider.Scheme(): configMapProvider}, - Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})}, + URIs: []string{"env:test-env"}, + ProviderFactories: []confmap.ProviderFactory{envprovider.NewFactory()}, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, } - configProvider, err := otelcol.NewConfigProvider(configProviderSettings) - require.NoError(t, err) - return configProvider }() receiverFactories, err := receiver.MakeFactoryMap(mockReceiverFactory) @@ -117,11 +113,11 @@ service: zap.ErrorOutput(&testingLogger{t}), zap.IncreaseLevel(zap.WarnLevel), }, - ConfigProvider: otelcolConfigProvider, - SkipSettingGRPCLogger: true, + ConfigProviderSettings: otelcolConfigProviderSettings, + SkipSettingGRPCLogger: true, } - envprovider.NewWithSettings(confmap.ProviderSettings{}) - fileprovider.NewWithSettings(confmap.ProviderSettings{}) + envprovider.NewFactory() + fileprovider.NewFactory() collector, err := otelcol.NewCollector(appSettings) require.NoError(t, err) @@ -295,21 +291,17 @@ service: otelcolReceiverAddress := fmt.Sprintf("127.0.0.1:%d", findOpenTCPPort(t)) otelcolHealthCheckAddress := fmt.Sprintf("127.0.0.1:%d", findOpenTCPPort(t)) - otelcolConfigProvider := func() otelcol.ConfigProvider { + otelcolConfigProviderSettings := func() otelcol.ConfigProviderSettings { configString := strings.ReplaceAll(otelcolConfigTemplate, "ADDRESS_INFLUXDB", otelcolReceiverAddress) configString = strings.ReplaceAll(configString, "ADDRESS_HEALTH_CHECK", otelcolHealthCheckAddress) t.Setenv("test-env", configString) - configMapProvider := envprovider.NewWithSettings(confmap.ProviderSettings{}) - configProviderSettings := otelcol.ConfigProviderSettings{ + return otelcol.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{"env:test-env"}, - Providers: map[string]confmap.Provider{configMapProvider.Scheme(): configMapProvider}, - Converters: []confmap.Converter{expandconverter.New(confmap.ConverterSettings{})}, + URIs: []string{"env:test-env"}, + ProviderFactories: []confmap.ProviderFactory{envprovider.NewFactory()}, + ConverterFactories: []confmap.ConverterFactory{expandconverter.NewFactory()}, }, } - configProvider, err := otelcol.NewConfigProvider(configProviderSettings) - require.NoError(t, err) - return configProvider }() receiverFactories, err := receiver.MakeFactoryMap(influxdbreceiver.NewFactory()) @@ -336,7 +328,7 @@ service: zap.ErrorOutput(&testingLogger{t}), zap.IncreaseLevel(zap.WarnLevel), }, - ConfigProvider: otelcolConfigProvider, + ConfigProviderSettings: otelcolConfigProviderSettings, } collector, err := otelcol.NewCollector(appSettings) require.NoError(t, err)