From bdd43c16c23518d231766d84ba835e4882abb9e3 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 15 May 2024 22:53:27 +0300 Subject: [PATCH 1/2] feat: add opentelemetry tracing --- cmd/cosmos-wallets-exporter.go | 2 +- go.mod | 34 ++++++++++--- go.sum | 88 ++++++++++++++++++++++++++-------- pkg/app.go | 47 ++++++++++++------ pkg/coingecko/coingecko.go | 16 +++++-- pkg/config/config.go | 17 +++++-- pkg/http/http.go | 19 ++++++-- pkg/queriers/balance.go | 26 ++++++++-- pkg/queriers/price.go | 18 +++++-- pkg/queriers/uptime.go | 9 +++- pkg/tendermint/tendermint.go | 13 +++-- pkg/tracing/noop-exporter.go | 22 +++++++++ pkg/tracing/provider.go | 27 +++++++++++ pkg/tracing/tracer.go | 56 ++++++++++++++++++++++ pkg/types/types.go | 3 +- 15 files changed, 330 insertions(+), 67 deletions(-) create mode 100644 pkg/tracing/noop-exporter.go create mode 100644 pkg/tracing/provider.go create mode 100644 pkg/tracing/tracer.go diff --git a/cmd/cosmos-wallets-exporter.go b/cmd/cosmos-wallets-exporter.go index 185e1c5..e24bdf0 100644 --- a/cmd/cosmos-wallets-exporter.go +++ b/cmd/cosmos-wallets-exporter.go @@ -13,7 +13,7 @@ var ( ) func ExecuteMain(configPath string) { - app := pkg.NewApp(configPath) + app := pkg.NewApp(configPath, version) app.Start() } diff --git a/go.mod b/go.mod index d05938d..1856892 100644 --- a/go.mod +++ b/go.mod @@ -1,27 +1,47 @@ module main -go 1.18 +go 1.21.4 + +toolchain go1.22.1 require ( github.com/BurntSushi/toml v1.1.0 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.6.0 + github.com/guregu/null/v5 v5.0.0 github.com/mcuadros/go-defaults v1.2.0 github.com/prometheus/client_golang v1.12.2 github.com/rs/zerolog v1.26.1 github.com/spf13/cobra v1.4.0 - github.com/superoo7/go-gecko v1.0.0 + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 + go.opentelemetry.io/otel v1.26.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 + go.opentelemetry.io/otel/sdk v1.26.0 + go.opentelemetry.io/otel/trace v1.26.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect - google.golang.org/protobuf v1.26.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 // indirect + go.opentelemetry.io/otel/metric v1.26.0 // indirect + go.opentelemetry.io/proto/otlp v1.2.0 // indirect + golang.org/x/net v0.23.0 // indirect + golang.org/x/sys v0.19.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect + google.golang.org/grpc v1.63.2 // indirect + google.golang.org/protobuf v1.33.0 // indirect ) diff --git a/go.sum b/go.sum index 687c0a5..2086836 100644 --- a/go.sum +++ b/go.sum @@ -44,10 +44,13 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -56,11 +59,14 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/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= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= 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= @@ -70,6 +76,11 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb 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= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -99,8 +110,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= 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/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -111,13 +123,13 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190404155422-f8f10df84213/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -125,12 +137,14 @@ github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -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.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 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/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= -github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= +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/guregu/null/v5 v5.0.0 h1:PRxjqyOekS11W+w/7Vfz6jgJE/BCwELWtgvOJzddimw= +github.com/guregu/null/v5 v5.0.0/go.mod h1:SjupzNy+sCPtwQTKWhUCqjhVCO69hpsl2QsZrWHjlwU= 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/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -150,9 +164,12 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mcuadros/go-defaults v1.2.0 h1:FODb8WSf0uGaY8elWJAkoLL0Ri6AlZ1bFlenk56oZtc= @@ -164,12 +181,11 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -194,6 +210,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= 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/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= @@ -210,8 +228,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/superoo7/go-gecko v1.0.0 h1:Xa1hZu2AYSA20eVMEd4etY0fcJoEI5deja1mdRmqlpI= -github.com/superoo7/go-gecko v1.0.0/go.mod h1:6AMYHL2wP2EN8AB9msPM76Lbo8L/MQOknYjvak5coaY= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/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= @@ -221,7 +239,22 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= 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= -golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c/go.mod h1:flIaEI6LNU6xOCD5PaJvn9wGP0agmIOqjrtsKGRguv4= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc= +go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= +go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0 h1:1u/AyyOqAWzy+SkPxDpahCNZParHV8Vid1RnI2clyDE= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0/go.mod h1:z46paqbJ9l7c9fIPCXTqTGwhQZ5XoTIsfeFYWboizjs= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0 h1:1wp/gyxsuYtuE/JFxsQRtcCDtMrO2qMvlfXALU5wkzI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.26.0/go.mod h1:gbTHmghkGgqxMomVQQMur1Nba4M0MQ8AYThXDUjsJ38= +go.opentelemetry.io/otel/metric v1.26.0 h1:7S39CLuY5Jgg9CrnA9HHiEjGMF/X2VHvoXGgSllRz30= +go.opentelemetry.io/otel/metric v1.26.0/go.mod h1:SY+rHOI4cEawI9a7N1A4nIg/nTQXe1ccCNWYOJUrpX4= +go.opentelemetry.io/otel/sdk v1.26.0 h1:Y7bumHf5tAiDlRYFmGqetNcLaVUZmh4iYfmGxtmz7F8= +go.opentelemetry.io/otel/sdk v1.26.0/go.mod h1:0p8MXpqLeJ0pzcszQQN4F0S5FVjBLgypeGSngLsmirs= +go.opentelemetry.io/otel/trace v1.26.0 h1:1ieeAUb4y0TE26jUFrCIXKpTuVK7uJGN9/Z/2LP5sQA= +go.opentelemetry.io/otel/trace v1.26.0/go.mod h1:4iDxvGDQuUkHve82hJJ8UqrwswHYsZuWCBllGV2U2y0= +go.opentelemetry.io/proto/otlp v1.2.0 h1:pVeZGk7nXDC9O2hncA6nHldxEjm6LByfA2aN8IOkz94= +go.opentelemetry.io/proto/otlp v1.2.0/go.mod h1:gGpR8txAl5M03pDhMC79G6SdqNV26naRm/KDsgaHD8A= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -291,6 +324,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= @@ -343,8 +378,9 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= +golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= @@ -352,6 +388,8 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= 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= @@ -399,7 +437,6 @@ golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= 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 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= @@ -452,6 +489,12 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= 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= @@ -464,6 +507,8 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +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= @@ -475,23 +520,25 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= 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 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +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/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/h2non/gock.v1 v1.0.14 h1:fTeu9fcUvSnLNacYvYI54h+1/XEteDyHvrVCZEEEYNM= -gopkg.in/h2non/gock.v1 v1.0.14/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -500,6 +547,5 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt 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= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/pkg/app.go b/pkg/app.go index 38dd803..fa1924f 100644 --- a/pkg/app.go +++ b/pkg/app.go @@ -1,28 +1,36 @@ package pkg import ( + "context" coingeckoPkg "main/pkg/coingecko" "main/pkg/config" "main/pkg/logger" queriersPkg "main/pkg/queriers" + "main/pkg/tracing" "main/pkg/types" "net/http" "sync" "time" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" + "go.opentelemetry.io/otel/attribute" + "github.com/google/uuid" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog" + "go.opentelemetry.io/otel/trace" ) type App struct { Config *config.Config Logger zerolog.Logger Queriers []types.Querier + + Tracer trace.Tracer } -func NewApp(configPath string) *App { +func NewApp(configPath string, version string) *App { appConfig, err := config.GetConfig(configPath) if err != nil { logger.GetDefaultLogger().Fatal().Err(err).Msg("Could not load config") @@ -32,26 +40,31 @@ func NewApp(configPath string) *App { logger.GetDefaultLogger().Fatal().Err(err).Msg("Provided config is invalid!") } + tracer, err := tracing.InitTracer(appConfig.TracingConfig, version) + if err != nil { + logger.GetDefaultLogger().Fatal().Err(err).Msg("Error setting up tracing") + } + log := logger.GetLogger(appConfig.LogConfig) - coingecko := coingeckoPkg.NewCoingecko(appConfig, log) + coingecko := coingeckoPkg.NewCoingecko(appConfig, log, tracer) queriers := []types.Querier{ - queriersPkg.NewPriceQuerier(appConfig, coingecko), - queriersPkg.NewBalanceQuerier(appConfig, log), - queriersPkg.NewUptimeQuerier(), + queriersPkg.NewPriceQuerier(appConfig, coingecko, tracer), + queriersPkg.NewBalanceQuerier(appConfig, log, tracer), + queriersPkg.NewUptimeQuerier(tracer), } return &App{ Config: appConfig, Logger: log, Queriers: queriers, + Tracer: tracer, } } func (a *App) Start() { - http.HandleFunc("/metrics", func(w http.ResponseWriter, r *http.Request) { - a.Handler(w, r) - }) + otelHandler := otelhttp.NewHandler(http.HandlerFunc(a.Handler), "prometheus") + http.Handle("/metrics", otelHandler) a.Logger.Info().Str("addr", a.Config.ListenAddress).Msg("Listening") err := http.ListenAndServe(a.Config.ListenAddress, nil) @@ -62,11 +75,18 @@ func (a *App) Start() { func (a *App) Handler(w http.ResponseWriter, r *http.Request) { requestStart := time.Now() + requestID := uuid.New().String() sublogger := a.Logger.With(). - Str("request-id", uuid.New().String()). + Str("request-id", requestID). Logger() + span := trace.SpanFromContext(r.Context()) + span.SetAttributes(attribute.String("request-id", requestID)) + rootSpanCtx := r.Context() + + defer span.End() + registry := prometheus.NewRegistry() var wg sync.WaitGroup @@ -76,16 +96,15 @@ func (a *App) Handler(w http.ResponseWriter, r *http.Request) { for _, querier := range a.Queriers { wg.Add(1) - go func(querier types.Querier) { - mutex.Lock() + go func(querier types.Querier, ctx context.Context) { + metrics, querierQueryInfos := querier.GetMetrics(ctx) - metrics, querierQueryInfos := querier.GetMetrics() + mutex.Lock() registry.MustRegister(metrics...) queryInfos = append(queryInfos, querierQueryInfos...) - mutex.Unlock() wg.Done() - }(querier) + }(querier, rootSpanCtx) } wg.Wait() diff --git a/pkg/coingecko/coingecko.go b/pkg/coingecko/coingecko.go index 392003d..d0c6a30 100644 --- a/pkg/coingecko/coingecko.go +++ b/pkg/coingecko/coingecko.go @@ -1,12 +1,15 @@ package coingecko import ( + "context" "fmt" "main/pkg/config" "main/pkg/http" "main/pkg/types" "strings" + "go.opentelemetry.io/otel/trace" + "github.com/rs/zerolog" ) @@ -16,22 +19,27 @@ type Coingecko struct { Client *http.Client Config *config.Config Logger zerolog.Logger + Tracer trace.Tracer } -func NewCoingecko(appConfig *config.Config, logger zerolog.Logger) *Coingecko { +func NewCoingecko(appConfig *config.Config, logger zerolog.Logger, tracer trace.Tracer) *Coingecko { return &Coingecko{ Config: appConfig, - Client: http.NewClient(logger, "coingecko"), + Client: http.NewClient(logger, "coingecko", tracer), Logger: logger.With().Str("component", "coingecko").Logger(), + Tracer: tracer, } } -func (c *Coingecko) FetchPrices(currencies []string) (map[string]float64, types.QueryInfo) { +func (c *Coingecko) FetchPrices(currencies []string, ctx context.Context) (map[string]float64, types.QueryInfo) { + childCtx, span := c.Tracer.Start(ctx, "Querying prices") + defer span.End() + ids := strings.Join(currencies, ",") url := fmt.Sprintf("https://api.coingecko.com/api/v3/simple/price?ids=%s&vs_currencies=usd", ids) var response Response - queryInfo, _, err := c.Client.Get(url, &response, types.HTTPPredicateAlwaysPass()) + queryInfo, _, err := c.Client.Get(url, &response, types.HTTPPredicateAlwaysPass(), childCtx) if err != nil { c.Logger.Error().Err(err).Msg("Could not get rate") return nil, queryInfo diff --git a/pkg/config/config.go b/pkg/config/config.go index 9562f18..41a76b6 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -5,6 +5,8 @@ import ( "fmt" "os" + "github.com/guregu/null/v5" + "github.com/BurntSushi/toml" "github.com/mcuadros/go-defaults" ) @@ -78,9 +80,10 @@ func (c *Chain) FindDenomByName(denom string) (*DenomInfo, bool) { } type Config struct { - LogConfig LogConfig `toml:"log"` - ListenAddress string `default:":9550" toml:"listen-address"` - Chains []Chain `toml:"chains"` + TracingConfig TracingConfig `toml:"tracing"` + LogConfig LogConfig `toml:"log"` + ListenAddress string `default:":9550" toml:"listen-address"` + Chains []Chain `toml:"chains"` } type LogConfig struct { @@ -88,6 +91,14 @@ type LogConfig struct { JSONOutput bool `default:"false" toml:"json"` } +type TracingConfig struct { + Enabled null.Bool `default:"false" toml:"enabled"` + OpenTelemetryHTTPHost string `toml:"open-telemetry-http-host"` + OpenTelemetryHTTPInsecure null.Bool `default:"true" toml:"open-telemetry-http-insecure"` + OpenTelemetryHTTPUser string `toml:"open-telemetry-http-user"` + OpenTelemetryHTTPPassword string `toml:"open-telemetry-http-password"` +} + func (c *Config) Validate() error { if len(c.Chains) == 0 { return errors.New("no chains provided") diff --git a/pkg/http/http.go b/pkg/http/http.go index b9f102d..cf3c257 100644 --- a/pkg/http/http.go +++ b/pkg/http/http.go @@ -1,23 +1,29 @@ package http import ( + "context" "encoding/json" "main/pkg/types" "net/http" "time" + "go.opentelemetry.io/otel/trace" + "github.com/rs/zerolog" + "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" ) type Client struct { logger zerolog.Logger chain string + tracer trace.Tracer } -func NewClient(logger zerolog.Logger, chain string) *Client { +func NewClient(logger zerolog.Logger, chain string, tracer trace.Tracer) *Client { return &Client{ logger: logger.With().Str("component", "http").Logger(), chain: chain, + tracer: tracer, } } @@ -25,8 +31,15 @@ func (c *Client) Get( url string, target interface{}, predicate types.HTTPPredicate, + ctx context.Context, ) (types.QueryInfo, http.Header, error) { - client := &http.Client{Timeout: 10 * 1000000000} + childCtx, span := c.tracer.Start(ctx, "HTTP request") + defer span.End() + + client := &http.Client{ + Timeout: 10 * 1000000000, + Transport: otelhttp.NewTransport(http.DefaultTransport), + } start := time.Now() queryInfo := types.QueryInfo{ @@ -35,7 +48,7 @@ func (c *Client) Get( URL: url, } - req, err := http.NewRequest(http.MethodGet, url, nil) + req, err := http.NewRequestWithContext(childCtx, http.MethodGet, url, nil) if err != nil { return queryInfo, nil, err } diff --git a/pkg/queriers/balance.go b/pkg/queriers/balance.go index a798b27..b1e74cc 100644 --- a/pkg/queriers/balance.go +++ b/pkg/queriers/balance.go @@ -1,12 +1,16 @@ package queriers import ( + "context" "main/pkg/config" "main/pkg/tendermint" "main/pkg/types" "main/pkg/utils" "sync" + "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/trace" + "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog" ) @@ -15,23 +19,32 @@ type BalanceQuerier struct { Config *config.Config Logger zerolog.Logger RPCs []*tendermint.RPC + Tracer trace.Tracer } -func NewBalanceQuerier(config *config.Config, logger zerolog.Logger) *BalanceQuerier { +func NewBalanceQuerier( + config *config.Config, + logger zerolog.Logger, + tracer trace.Tracer, +) *BalanceQuerier { rpcs := make([]*tendermint.RPC, len(config.Chains)) for index, chain := range config.Chains { - rpcs[index] = tendermint.NewRPC(chain, logger) + rpcs[index] = tendermint.NewRPC(chain, logger, tracer) } return &BalanceQuerier{ Config: config, Logger: logger.With().Str("component", "balance_querier").Logger(), RPCs: rpcs, + Tracer: tracer, } } -func (q *BalanceQuerier) GetMetrics() ([]prometheus.Collector, []types.QueryInfo) { +func (q *BalanceQuerier) GetMetrics(ctx context.Context) ([]prometheus.Collector, []types.QueryInfo) { + childCtx, span := q.Tracer.Start(ctx, "Querying balance metrics") + defer span.End() + balancesGauge := prometheus.NewGaugeVec( prometheus.GaugeOpts{ Name: "cosmos_wallets_exporter_balance", @@ -51,9 +64,14 @@ func (q *BalanceQuerier) GetMetrics() ([]prometheus.Collector, []types.QueryInfo for _, wallet := range chain.Wallets { wg.Add(1) go func(wallet config.Wallet, chain config.Chain, rpc *tendermint.RPC) { + chainCtx, chainSpan := q.Tracer.Start(childCtx, "Querying chain and wallet") + chainSpan.SetAttributes(attribute.String("chain", chain.Name)) + chainSpan.SetAttributes(attribute.String("wallet", wallet.Address)) + defer chainSpan.End() + defer wg.Done() - balancesResponse, queryInfo, err := rpc.GetWalletBalances(wallet.Address) + balancesResponse, queryInfo, err := rpc.GetWalletBalances(wallet.Address, chainCtx) mutex.Lock() defer mutex.Unlock() diff --git a/pkg/queriers/price.go b/pkg/queriers/price.go index 053bfe1..6ad298d 100644 --- a/pkg/queriers/price.go +++ b/pkg/queriers/price.go @@ -1,10 +1,13 @@ package queriers import ( + "context" coingeckoPkg "main/pkg/coingecko" "main/pkg/config" "main/pkg/types" + "go.opentelemetry.io/otel/trace" + "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog" ) @@ -13,16 +16,25 @@ type PriceQuerier struct { Config *config.Config Coingecko *coingeckoPkg.Coingecko Logger zerolog.Logger + Tracer trace.Tracer } -func NewPriceQuerier(config *config.Config, coingecko *coingeckoPkg.Coingecko) *PriceQuerier { +func NewPriceQuerier( + config *config.Config, + coingecko *coingeckoPkg.Coingecko, + tracer trace.Tracer, +) *PriceQuerier { return &PriceQuerier{ Config: config, Coingecko: coingecko, + Tracer: tracer, } } -func (q *PriceQuerier) GetMetrics() ([]prometheus.Collector, []types.QueryInfo) { +func (q *PriceQuerier) GetMetrics(ctx context.Context) ([]prometheus.Collector, []types.QueryInfo) { + childCtx, span := q.Tracer.Start(ctx, "Querying prices") + defer span.End() + priceGauge := prometheus.NewGaugeVec( prometheus.GaugeOpts{ Name: "cosmos_wallets_exporter_price", @@ -32,7 +44,7 @@ func (q *PriceQuerier) GetMetrics() ([]prometheus.Collector, []types.QueryInfo) ) currenciesList := q.Config.GetCoingeckoCurrencies() - currenciesRates, queryInfo := q.Coingecko.FetchPrices(currenciesList) + currenciesRates, queryInfo := q.Coingecko.FetchPrices(currenciesList, childCtx) for currency, price := range currenciesRates { chainName, denom, found := q.Config.FindChainAndDenomByCoingeckoCurrency(currency) diff --git a/pkg/queriers/uptime.go b/pkg/queriers/uptime.go index bcf8bfb..3f4124c 100644 --- a/pkg/queriers/uptime.go +++ b/pkg/queriers/uptime.go @@ -1,23 +1,28 @@ package queriers import ( + "context" "main/pkg/types" "time" + "go.opentelemetry.io/otel/trace" + "github.com/prometheus/client_golang/prometheus" ) type UptimeQuerier struct { StartTime time.Time + Tracer trace.Tracer } -func NewUptimeQuerier() *UptimeQuerier { +func NewUptimeQuerier(tracer trace.Tracer) *UptimeQuerier { return &UptimeQuerier{ StartTime: time.Now(), + Tracer: tracer, } } -func (u *UptimeQuerier) GetMetrics() ([]prometheus.Collector, []types.QueryInfo) { +func (u *UptimeQuerier) GetMetrics(ctx context.Context) ([]prometheus.Collector, []types.QueryInfo) { uptimeMetricsGauge := prometheus.NewGaugeVec( prometheus.GaugeOpts{ Name: "cosmos_wallets_exporter_start_time", diff --git a/pkg/tendermint/tendermint.go b/pkg/tendermint/tendermint.go index 971755a..31824d1 100644 --- a/pkg/tendermint/tendermint.go +++ b/pkg/tendermint/tendermint.go @@ -1,6 +1,7 @@ package tendermint import ( + "context" "fmt" "main/pkg/config" "main/pkg/http" @@ -8,6 +9,8 @@ import ( "main/pkg/utils" "sync" + "go.opentelemetry.io/otel/trace" + "github.com/rs/zerolog" ) @@ -15,21 +18,23 @@ type RPC struct { Client *http.Client URL string Logger zerolog.Logger + Tracer trace.Tracer LastQueryHeight map[string]int64 Mutex sync.Mutex } -func NewRPC(chain config.Chain, logger zerolog.Logger) *RPC { +func NewRPC(chain config.Chain, logger zerolog.Logger, tracer trace.Tracer) *RPC { return &RPC{ - Client: http.NewClient(logger, chain.Name), + Client: http.NewClient(logger, chain.Name, tracer), URL: chain.LCDEndpoint, Logger: logger.With().Str("component", "rpc").Logger(), LastQueryHeight: make(map[string]int64), + Tracer: tracer, } } -func (rpc *RPC) GetWalletBalances(address string) (*types.BalanceResponse, types.QueryInfo, error) { +func (rpc *RPC) GetWalletBalances(address string, ctx context.Context) (*types.BalanceResponse, types.QueryInfo, error) { lastHeight, _ := rpc.LastQueryHeight[address] url := fmt.Sprintf( @@ -39,7 +44,7 @@ func (rpc *RPC) GetWalletBalances(address string) (*types.BalanceResponse, types ) var response *types.BalanceResponse - queryInfo, header, err := rpc.Client.Get(url, &response, types.HTTPPredicateCheckHeightAfter(lastHeight)) + queryInfo, header, err := rpc.Client.Get(url, &response, types.HTTPPredicateCheckHeightAfter(lastHeight), ctx) if err != nil { return nil, queryInfo, err } diff --git a/pkg/tracing/noop-exporter.go b/pkg/tracing/noop-exporter.go new file mode 100644 index 0000000..32859bc --- /dev/null +++ b/pkg/tracing/noop-exporter.go @@ -0,0 +1,22 @@ +package tracing + +import ( + "context" + + tracesdk "go.opentelemetry.io/otel/sdk/trace" +) + +type NoopExporter struct { +} + +func NewNoopExporter() tracesdk.SpanExporter { + return &NoopExporter{} +} + +func (e *NoopExporter) ExportSpans(ctx context.Context, spans []tracesdk.ReadOnlySpan) error { + return nil +} + +func (e *NoopExporter) Shutdown(ctx context.Context) error { + return nil +} diff --git a/pkg/tracing/provider.go b/pkg/tracing/provider.go new file mode 100644 index 0000000..a336ac7 --- /dev/null +++ b/pkg/tracing/provider.go @@ -0,0 +1,27 @@ +package tracing + +import ( + "go.opentelemetry.io/otel/sdk/resource" + tracesdk "go.opentelemetry.io/otel/sdk/trace" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" +) + +func NewTraceProvider(exp tracesdk.SpanExporter, version string) (*tracesdk.TracerProvider, error) { + // Ensure default SDK resources and the required service name are set. + r, err := resource.Merge( + resource.Default(), + resource.NewWithAttributes( + semconv.SchemaURL, + semconv.ServiceNameKey.String("cosmos-wallets-exporter"), + semconv.ServiceVersionKey.String(version), + ), + ) + if err != nil { + return nil, err + } + + return tracesdk.NewTracerProvider( + tracesdk.WithBatcher(exp), + tracesdk.WithResource(r), + ), nil +} diff --git a/pkg/tracing/tracer.go b/pkg/tracing/tracer.go new file mode 100644 index 0000000..a301c61 --- /dev/null +++ b/pkg/tracing/tracer.go @@ -0,0 +1,56 @@ +package tracing + +import ( + "context" + "encoding/base64" + "fmt" + configPkg "main/pkg/config" + + "go.opentelemetry.io/otel" + "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp" + tracesdk "go.opentelemetry.io/otel/sdk/trace" + "go.opentelemetry.io/otel/trace" +) + +func getExporter(config configPkg.TracingConfig) (tracesdk.SpanExporter, error) { + if config.Enabled.Bool { + opts := []otlptracehttp.Option{ + otlptracehttp.WithEndpoint(config.OpenTelemetryHTTPHost), + } + + if config.OpenTelemetryHTTPInsecure.Bool { + opts = append(opts, otlptracehttp.WithInsecure()) + } + + if config.OpenTelemetryHTTPUser != "" && config.OpenTelemetryHTTPPassword != "" { + auth := config.OpenTelemetryHTTPUser + ":" + config.OpenTelemetryHTTPPassword + token := base64.StdEncoding.EncodeToString([]byte(auth)) + opts = append(opts, otlptracehttp.WithHeaders(map[string]string{ + "Authorization": "Basic " + token, + })) + } + + return otlptracehttp.New( + context.Background(), + opts..., + ) + } + + return NewNoopExporter(), nil +} + +func InitTracer(config configPkg.TracingConfig, version string) (trace.Tracer, error) { + exporter, err := getExporter(config) + if err != nil { + return nil, fmt.Errorf("error creating exporter: %w", err) + } + + tp, err := NewTraceProvider(exporter, version) + if err != nil { + return nil, fmt.Errorf("error initializizng provider: %w", err) + } + + otel.SetTracerProvider(tp) + + return tp.Tracer("main"), nil +} diff --git a/pkg/types/types.go b/pkg/types/types.go index 79ef796..ac19117 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -1,6 +1,7 @@ package types import ( + "context" "main/pkg/config" "time" @@ -34,5 +35,5 @@ type QueryInfo struct { } type Querier interface { - GetMetrics() ([]prometheus.Collector, []QueryInfo) + GetMetrics(ctx context.Context) ([]prometheus.Collector, []QueryInfo) } From d16708bdc90ee0d7c2f302ebc4925d0c39694c28 Mon Sep 17 00:00:00 2001 From: Sergey Date: Wed, 15 May 2024 22:54:57 +0300 Subject: [PATCH 2/2] chore: update golang version to build --- .github/workflows/actions.yaml | 4 ++-- .github/workflows/release.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index b437007..513c7c3 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-go@v2 with: - go-version: '1.18.2' + go-version: '1.21.3' - run: go version - run: go mod download - run: go build cmd/cosmos-wallets-exporter.go @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-go@v2 with: - go-version: '1.18.2' + go-version: '1.21.3' - run: go version - run: go mod download - run: go vet ./... diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index dd16a60..7da8360 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: '1.18.2' + go-version: '1.21.3' - name: Run GoReleaser uses: goreleaser/goreleaser-action@v2