From f59e4d127748292f6c412b3a02ac0722ba4bcaa6 Mon Sep 17 00:00:00 2001 From: shantanualshi Date: Thu, 7 Sep 2023 12:43:37 +0530 Subject: [PATCH] Change dskit and loki to fix proto conflicts --- go.mod | 8 +- go.sum | 72 ++++- vendor/github.com/go-kit/kit/log/README.md | 2 +- vendor/github.com/gocql/gocql/cluster.go | 4 +- vendor/github.com/gocql/gocql/conn.go | 8 +- .../github.com/gocql/gocql/connectionpool.go | 6 +- vendor/github.com/gocql/gocql/control.go | 2 +- vendor/github.com/gocql/gocql/events.go | 2 +- vendor/github.com/gocql/gocql/metadata.go | 2 +- vendor/github.com/gocql/gocql/policies.go | 30 +- vendor/github.com/gocql/gocql/session.go | 19 +- .../grafana/dskit/httpgrpc/httpgrpc.go | 8 +- .../grafana/dskit/httpgrpc/httpgrpc.pb.go | 304 +++++++++--------- .../grafana/dskit/httpgrpc/httpgrpc.proto | 14 +- .../grafana/dskit/httpgrpc/server/server.go | 22 +- .../github.com/grafana/dskit/server/server.go | 2 +- .../loki/pkg/ruler/evaluator_remote.go | 16 +- .../grafana/loki/pkg/storage/store.go | 38 ++- .../pkg/storage/stores/composite_store.go | 45 ++- .../grafana/loki/pkg/validation/limits.go | 8 + .../grafana/loki/pkg/validation/validate.go | 6 +- vendor/modules.txt | 4 +- 22 files changed, 347 insertions(+), 275 deletions(-) diff --git a/go.mod b/go.mod index 97e01b30a..3c613697e 100644 --- a/go.mod +++ b/go.mod @@ -6,15 +6,15 @@ require ( github.com/alecthomas/chroma v0.7.0 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 github.com/cortexproject/cortex v1.15.2-0.20230901171400-63b372cbd008 - github.com/go-kit/kit v0.12.0 + github.com/go-kit/log v0.2.1 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b github.com/google/go-github/v32 v32.1.0 github.com/gorilla/mux v1.8.0 github.com/grafana-tools/sdk v0.0.0-20220203092117-edae16afa87b - github.com/grafana/dskit v0.0.0-20230905112532-e4f33b342cb6 - github.com/grafana/loki v1.6.2-0.20230905071424-a60c1777ce15 + github.com/grafana/dskit v0.0.0-20230907071146-cc0661f32e42 + github.com/grafana/loki v1.6.2-0.20230907070655-40d5d6c744d1 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db github.com/opentracing-contrib/go-stdlib v1.0.0 github.com/pkg/errors v0.9.1 @@ -109,7 +109,7 @@ require ( github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fsouza/fake-gcs-server v1.7.0 // indirect - github.com/go-kit/log v0.2.1 // indirect + github.com/go-kit/kit v0.12.0 // indirect github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.2.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/go.sum b/go.sum index 9ad82c394..b8cf34efc 100644 --- a/go.sum +++ b/go.sum @@ -401,6 +401,7 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7 github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 h1:/iHxaJhsFr0+xVFfbMr5vxz848jyiWuIEDhYq3y5odY= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q= github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1 h1:LNHhpdK7hzUcx/k1LIcuh5k7k1LGIWLQfCjaneSj7Fc= @@ -431,7 +432,9 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+XA683u8EctwboHk= +github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= +github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= @@ -444,6 +447,7 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= +github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/IBM/go-sdk-core/v5 v5.13.1 h1:zD6p3t1whAlRJo/VBmE69c8RcH9LCHL1n0/sO1MWlpw= github.com/IBM/go-sdk-core/v5 v5.13.1/go.mod h1:pVkN7IGmsSdmR1ZCU4E/cLcCclqRKMYgg7ya+O2Mk6g= github.com/IBM/ibm-cos-sdk-go v1.10.0 h1:/2VIev2/jBei39OqU2+nSZQnoWJ+KtkiSAIDkqsd7uU= @@ -456,8 +460,10 @@ github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYr github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.6 h1:U68crOE3y3MPttCMQGywZOLrTeF5HHJ3/vDBCJn9/bA= +github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= @@ -488,8 +494,10 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a h1:HbKu58rmZpUGpz5+4FfNmIU+FmZg2P3Xaj2v2bfNWmk= +github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= github.com/alicebob/miniredis/v2 v2.30.4 h1:8S4/o1/KoUArAGbGwPxcwf0krlzceva2XVOSchFS7Eo= +github.com/alicebob/miniredis/v2 v2.30.4/go.mod h1:b25qWj4fCEsBeAAR2mlb0ufImGC6uH3VlUfb/HS5zKg= github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible h1:KpbJFXwhVeuxNtBJ74MCGbIoaBok2uZvkD7QXp2+Wis= github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -549,6 +557,7 @@ github.com/baidubce/bce-sdk-go v0.9.141 h1:EV5BH5lfymIGPSmYDo9xYdsVlvWAW6nFeiA6t github.com/baidubce/bce-sdk-go v0.9.141/go.mod h1:zbYJMQwE4IZuyrJiFO8tO8NbtYiKTFTbwh4eIsqjVdg= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= +github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -577,8 +586,10 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chromedp/cdproto v0.0.0-20210526005521-9e51b9051fd0/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U= github.com/chromedp/cdproto v0.0.0-20210706234513-2bc298e8be7f/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U= github.com/chromedp/cdproto v0.0.0-20220629234738-4cfc9cdeeb92 h1:0kiAQSLWZDt4wsmcICou3C6in/OJ58FCqvXcB8Ax1Dk= +github.com/chromedp/cdproto v0.0.0-20220629234738-4cfc9cdeeb92/go.mod h1:5Y4sD/eXpwrChIuxhSr/G20n9CdbCmoerOHnuAf0Zr0= github.com/chromedp/chromedp v0.7.3/go.mod h1:9gC521Yzgrk078Ulv6KIgG7hJ2x9aWrxMBBobTFk30A= github.com/chromedp/chromedp v0.8.2 h1:EYSsSqWuKYwyHZEJpU00kOGOMz5DE0qDVckelzauMFA= +github.com/chromedp/chromedp v0.8.2/go.mod h1:vpbCNtfYeOUo2q5reuwX6ZmPpbHRf5PZfAqNR2ObB+g= github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic= github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -587,6 +598,7 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/mxj v1.8.4 h1:HuhwZtbyvyOw+3Z1AowPkU87JkJUSv751ELWaiTpj8I= +github.com/clbanning/mxj v1.8.4/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe h1:QQ3GSy+MqSHxm/d8nCtnAiZdYFd45cYZPs8vOOIYKfk= @@ -630,16 +642,22 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/digitalocean/godo v1.99.0 h1:gUHO7n9bDaZFWvbzOum4bXE0/09ZuYA9yA8idQHX57E= +github.com/digitalocean/godo v1.99.0/go.mod h1:SsS2oXo2rznfM/nORlZ/6JaUJZFhmKTib1YhopUc8NA= github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE= github.com/dlclark/regexp2 v1.1.6/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.2.0 h1:8sAhBGEM0dRWogWqWyQeIJnxjWO6oIjl8FKqREDsGfk= github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= +github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= +github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.4+incompatible h1:s/LVDftw9hjblvqIeTiGYXBCD95nOEEl7qRsRrIOuQI= +github.com/docker/docker v24.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= @@ -652,7 +670,9 @@ github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8E github.com/efficientgo/core v1.0.0-rc.2 h1:7j62qHLnrZqO3V3UA0AqOGd5d5aXV3AX6m/NZBHp78I= github.com/efficientgo/core v1.0.0-rc.2/go.mod h1:FfGdkzWarkuzOlY04VY+bGfb1lWrjaL6x/GLcQ4vJps= github.com/efficientgo/e2e v0.14.1-0.20230710114240-c316eb95ae5b h1:8VX23BNufsa4KCqnnEonvI3yrou2Pjp8JLcbdVn0Fs8= +github.com/efficientgo/e2e v0.14.1-0.20230710114240-c316eb95ae5b/go.mod h1:plsKU0YHE9uX+7utvr7SiDtVBSHJyEfHRO4UnUgDmts= github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= +github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/go-control-plane v0.11.1 h1:wSUXTlLfiAQRWs2F+p+EKOY9rUyis1MyGqJ2DIk5HpM= @@ -743,6 +763,7 @@ github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+ github.com/go-openapi/validate v0.22.1 h1:G+c2ub6q47kfX1sOBLwIQwzBVt8qmOAARyo/9Fqs9NU= github.com/go-openapi/validate v0.22.1/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= @@ -752,9 +773,11 @@ github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVL github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY= +github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= +github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= @@ -785,8 +808,10 @@ github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.1.0-rc.5/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA= +github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= @@ -866,6 +891,7 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0= +github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -889,12 +915,14 @@ github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= 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/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/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= @@ -939,6 +967,7 @@ github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qK github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gophercloud/gophercloud v1.5.0 h1:cDN6XFCLKiiqvYpjQLq9AiM7RDRbIC9450WpPH+yvXo= +github.com/gophercloud/gophercloud v1.5.0/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/csrf v1.6.0/go.mod h1:7tSf8kmjNYr7IWDCYhd3U8Ck34iQ/Yw5CJu7bAkHEGI= @@ -951,16 +980,17 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosimple/slug v1.1.1 h1:fRu/digW+NMwBIP+RmviTK97Ho/bEj/C9swrCspN3D4= github.com/gosimple/slug v1.1.1/go.mod h1:ER78kgg1Mv0NQGlXiDe57DpCyfbNywXXZ9mIorhxAf0= -github.com/grafana/dskit v0.0.0-20230905112532-e4f33b342cb6 h1:LmUREGRJdSQtEWlE9EHCE+KoasyXjnxciPAKvWHGVgI= -github.com/grafana/dskit v0.0.0-20230905112532-e4f33b342cb6/go.mod h1:3u7fr4hmOhuUL9Yc1QP/oa3za73kxvqJnRJH4BA5fOM= +github.com/grafana/dskit v0.0.0-20230907071146-cc0661f32e42 h1:3TcB+bUhvFz6NONC5wJ37eeGZ49zcv1xrOEv7Od4w7Y= +github.com/grafana/dskit v0.0.0-20230907071146-cc0661f32e42/go.mod h1:3u7fr4hmOhuUL9Yc1QP/oa3za73kxvqJnRJH4BA5fOM= github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY= github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85/go.mod h1:crI9WX6p0IhrqB+DqIUHulRW853PaNFf7o4UprV//3I= github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 h1:WB3bGH2f1UN6jkd6uAEWfHB8OD7dKJ0v2Oo6SNfhpfQ= github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9/go.mod h1:PGk3RjYHpxMM8HFPhKKo+vve3DdlPUELZLSDEFehPuU= -github.com/grafana/loki v1.6.2-0.20230905071424-a60c1777ce15 h1:wlWn0jT+o8GMxia85bKmMszSg6ohJh7/6jZl8i7XWK8= -github.com/grafana/loki v1.6.2-0.20230905071424-a60c1777ce15/go.mod h1:mnJ6/ZdBYmLZHiwvIY0td1iWHgu8L5fZ/88KNCElO3g= +github.com/grafana/loki v1.6.2-0.20230907070655-40d5d6c744d1 h1:gVRP8aa2ppFh96JF8ivNsT9SjBN9EfpHbuWpNggg7cs= +github.com/grafana/loki v1.6.2-0.20230907070655-40d5d6c744d1/go.mod h1:E6TPMm/yczSJa9MJF2447ce1gJ2CihTrgjZuKYpNvQ0= github.com/grafana/loki/pkg/push v0.0.0-20230904150506-087b21fa5ec6 h1:EFlCT/hWZpXX7bgerVK5074J7F+86a+Q7Q7re9ATdHI= github.com/grafana/loki/pkg/push v0.0.0-20230904150506-087b21fa5ec6/go.mod h1:5ll3An1wAxYejo6aM04+3/lc6N4joYVYLY5U+Z4O6vI= github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd h1:PpuIBO5P3e9hpqBD0O/HjhShYuM6XE0i/lbE6J94kww= @@ -982,7 +1012,9 @@ github.com/hashicorp/consul/api v1.22.0 h1:ydEvDooB/A0c/xpsBd8GSt7P2/zYPBui4KrNi github.com/hashicorp/consul/api v1.22.0/go.mod h1:zHpYgZ7TeYqS6zaszjwSt128OwESRpnhU9aGa6ue3Eg= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.14.0 h1:Hly+BMNMssVzoWddbBnBFi3W+Fzytvm0haSkihhj3GU= +github.com/hashicorp/consul/sdk v0.14.0/go.mod h1:gHYeuDa0+0qRAD6Wwr6yznMBvBwHKoxSBoW5l73+saE= github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c= +github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -1016,8 +1048,10 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -1031,14 +1065,17 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/nomad/api v0.0.0-20230605233119-67e39d5d248f h1:yxjcAZRuYymIDC0W4IQHgTe9EQdu2BsjPlVmKwyVZT4= +github.com/hashicorp/nomad/api v0.0.0-20230605233119-67e39d5d248f/go.mod h1:Xjd3OXUTfsWbCCBsQd3EdfPTz5evDi+fxqdvpN+WqQg= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= github.com/hetznercloud/hcloud-go v1.45.1 h1:nl0OOklFfQT5J6AaNIOhl5Ruh3fhmGmhvZEqHbibVuk= +github.com/hetznercloud/hcloud-go v1.45.1/go.mod h1:aAUGxSfSnB8/lVXHNEDxtCT1jykaul8kqjD7f5KQXF8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.3.3 h1:/Gcsuc1x8JVbJ9/rlye4xZnVAbEkGauT8lbebqcQws4= github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.3+incompatible h1:tKTaPHNVwikS3I1rdyf1INNvgJXWSf/+TzqsiGbrgnQ= +github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.3+incompatible/go.mod h1:l7VUhRbTKCzdOacdT4oWCwATKyvZqUOlOqr0Ous3k4s= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -1049,6 +1086,7 @@ github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/ionos-cloud/sdk-go/v6 v6.1.7 h1:uVG1Q/ZDJ7YmCI9Oevpue9xJEH5UrUMyXv8gm7NTxIw= +github.com/ionos-cloud/sdk-go/v6 v6.1.7/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1090,6 +1128,7 @@ github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZY github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE= github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00= +github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1098,6 +1137,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -1109,6 +1149,7 @@ github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ic github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/linode/linodego v1.17.0 h1:aWS98f0jUoY2lhsEuBxRdVkqyGM0nazPd68AEDF0EvU= +github.com/linode/linodego v1.17.0/go.mod h1:/omzPxie0/YI6S0sTw1q47qDt5IYSlbO/infRR4UG+A= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -1183,7 +1224,9 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mozillazg/go-httpheader v0.2.1 h1:geV7TrjbL8KXSyvghnFm+NyTux/hxwueTSrwhe88TQQ= +github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= 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 h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -1199,6 +1242,7 @@ github.com/ncw/swift v1.0.53/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= @@ -1209,11 +1253,15 @@ github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:v github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= +github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= +github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= +github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02/go.mod h1:JNdpVEzCpXBgIiv4ds+TzhN1hrtxq6ClLrTlT9OQRSc= github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e h1:4cPxUYdgaGzZIT5/j0IfqOrrXmq6bG8AwvwisMXpdrg= github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= @@ -1231,7 +1279,9 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/oracle/oci-go-sdk/v65 v65.41.1 h1:+lbosOyNiib3TGJDvLq1HwEAuFqkOjPJDIkyxM15WdQ= +github.com/oracle/oci-go-sdk/v65 v65.41.1/go.mod h1:MXMLMzHnnd9wlpgadPkdlkZ9YrwQmCOmbX5kjVEJodw= github.com/ovh/go-ovh v1.4.1 h1:VBGa5wMyQtTP7Zb+w97zRCh9sLtM/2YKRyy+MEJmWaM= +github.com/ovh/go-ovh v1.4.1/go.mod h1:6bL6pPyUT7tBfI0pqOegJgRjgjuO+mOo+MyXd1EEC0M= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= @@ -1320,6 +1370,7 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= 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.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1327,9 +1378,11 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17 h1:1WuWJu7/e8SqK+uQl7lfk/N/oMZTL2NE/TJsNKRNMc4= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.17/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM= +github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/sercand/kuberesolver/v4 v4.0.0-20230228224450-d8a3bdc2c3f7 h1:khQikvG1T9nSa7MLiUEFHSjoSdCop7m5yYDlFUiIkAI= github.com/sercand/kuberesolver/v4 v4.0.0-20230228224450-d8a3bdc2c3f7/go.mod h1:F4RGyuRmMAjeXHKL+w4P7AwUnPceEAPAhxUgXZjKgvM= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= @@ -1370,6 +1423,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -1392,6 +1446,7 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tencentyun/cos-go-sdk-v5 v0.7.40 h1:W6vDGKCHe4wBACI1d2UgE6+50sJFhRWU4O8IB2ozzxM= +github.com/tencentyun/cos-go-sdk-v5 v0.7.40/go.mod h1:4dCEtLHGh8QPxHEkgq+nFaky7yZxQuYwgSJM87icDaw= github.com/thanos-io/objstore v0.0.0-20230816175749-20395bffdf26 h1:q1lin/af0lw+I3sS79ccHs2CLjFOPc190J9saeQ5qQ4= github.com/thanos-io/objstore v0.0.0-20230816175749-20395bffdf26/go.mod h1:oJ82xgcBDzGJrEgUsjlTj6n01+ZWUMMUR8BlZzX5xDE= github.com/thanos-io/thanos v0.32.1-0.20230831143954-f75e44ac929c h1:d5IJk0L61FaewLnGoVLlJb206vMz8WD6ash104tsc2w= @@ -1412,6 +1467,7 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= +github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/weaveworks/common v0.0.0-20230713110358-22cda1cdbe0a h1:ZsUEBQ5z0sMXvn+JFNqqadXzhmqpaVsBF3ZYZUEgDPI= github.com/weaveworks/common v0.0.0-20230713110358-22cda1cdbe0a/go.mod h1:rgbeLfJUtEr+G74cwFPR1k/4N0kDeaeSv/qhUNE4hm8= github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M= @@ -1436,6 +1492,7 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/gopher-lua v1.1.0 h1:BojcDhfyDWgU2f2TOzYK/g5p2gxMrku8oupLDqlnSqE= +github.com/yuin/gopher-lua v1.1.0/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= @@ -1797,6 +1854,7 @@ golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/term v0.11.0 h1:F9tnn/DA/Im8nCwm+fX+1/eBwi4qFjRT++MhtVC4ZX0= +golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2153,12 +2211,15 @@ 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= k8s.io/api v0.27.3 h1:yR6oQXXnUEBWEWcvPWS0jQL575KoAboQPfJAuKNrw5Y= +k8s.io/api v0.27.3/go.mod h1:C4BNvZnQOF7JA/0Xed2S+aUyJSfTGkGFxLXz9MnpIpg= k8s.io/apimachinery v0.27.3 h1:Ubye8oBufD04l9QnNtW05idcOe9Z3GQN8+7PqmuVcUM= k8s.io/apimachinery v0.27.3/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E= k8s.io/client-go v0.27.3 h1:7dnEGHZEJld3lYwxvLl7WoehK6lAq7GvgjxpA3nv1E8= +k8s.io/client-go v0.27.3/go.mod h1:2MBEKuTo6V1lbKy3z1euEGnhPfGZLKTS9tiJ2xodM48= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 h1:OmK1d0WrkD3IPfkskvroRykOulHVHf0s0ZIFRjyt+UI= +k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515/go.mod h1:kzo02I3kQ4BTtEfVLaPbjvCkX97YqGve33wzlb3fofQ= k8s.io/utils v0.0.0-20230711102312-30195339c3c7 h1:ZgnF1KZsYxWIifwSNZFZgNtWE89WI5yiP5WwlfDoIyc= k8s.io/utils v0.0.0-20230711102312-30195339c3c7/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE= @@ -2166,7 +2227,10 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= +sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/vendor/github.com/go-kit/kit/log/README.md b/vendor/github.com/go-kit/kit/log/README.md index 011905ec9..5492dd944 100644 --- a/vendor/github.com/go-kit/kit/log/README.md +++ b/vendor/github.com/go-kit/kit/log/README.md @@ -75,7 +75,7 @@ Redirect stdlib logger to Go kit logger. import ( "os" stdlog "log" - kitlog "github.com/go-kit/log" + kitlog "github.com/go-kit/kit/log" ) func main() { diff --git a/vendor/github.com/gocql/gocql/cluster.go b/vendor/github.com/gocql/gocql/cluster.go index 6dac365eb..948f19686 100644 --- a/vendor/github.com/gocql/gocql/cluster.go +++ b/vendor/github.com/gocql/gocql/cluster.go @@ -10,8 +10,8 @@ import ( "net" "time" - "github.com/go-kit/log" - "github.com/go-kit/log/level" + "github.com/go-kit/kit/log" + "github.com/go-kit/kit/log/level" "github.com/prometheus/client_golang/prometheus" ) diff --git a/vendor/github.com/gocql/gocql/conn.go b/vendor/github.com/gocql/gocql/conn.go index 90276668f..05ae70b2d 100644 --- a/vendor/github.com/gocql/gocql/conn.go +++ b/vendor/github.com/gocql/gocql/conn.go @@ -19,8 +19,8 @@ import ( "sync/atomic" "time" - "github.com/go-kit/log" - "github.com/go-kit/log/level" + "github.com/go-kit/kit/log" + "github.com/go-kit/kit/log/level" "github.com/gocql/gocql/internal/lru" "github.com/gocql/gocql/internal/streams" @@ -47,8 +47,8 @@ func approve(authenticator string) bool { return false } -// JoinHostPort is a utility to return a address string that can be used -// gocql.Conn to form a connection with a host. +//JoinHostPort is a utility to return a address string that can be used +//gocql.Conn to form a connection with a host. func JoinHostPort(addr string, port int) string { addr = strings.TrimSpace(addr) if _, _, err := net.SplitHostPort(addr); err != nil { diff --git a/vendor/github.com/gocql/gocql/connectionpool.go b/vendor/github.com/gocql/gocql/connectionpool.go index bf8c82e0a..6750fa62f 100644 --- a/vendor/github.com/gocql/gocql/connectionpool.go +++ b/vendor/github.com/gocql/gocql/connectionpool.go @@ -16,8 +16,8 @@ import ( "sync/atomic" "time" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) @@ -400,7 +400,7 @@ func (pool *hostConnPool) Pick() *Conn { return leastBusyConn } -// Size returns the number of connections currently active in the pool +//Size returns the number of connections currently active in the pool func (pool *hostConnPool) Size() int { pool.mu.RLock() defer pool.mu.RUnlock() @@ -408,7 +408,7 @@ func (pool *hostConnPool) Size() int { return len(pool.conns) } -// Close the connection pool +//Close the connection pool func (pool *hostConnPool) Close() { pool.mu.Lock() diff --git a/vendor/github.com/gocql/gocql/control.go b/vendor/github.com/gocql/gocql/control.go index 44d29a5e1..892fd3996 100644 --- a/vendor/github.com/gocql/gocql/control.go +++ b/vendor/github.com/gocql/gocql/control.go @@ -14,8 +14,8 @@ import ( "sync/atomic" "time" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/go-kit/log" ) var ( diff --git a/vendor/github.com/gocql/gocql/events.go b/vendor/github.com/gocql/gocql/events.go index 4a75075a3..1ae12aa1c 100644 --- a/vendor/github.com/gocql/gocql/events.go +++ b/vendor/github.com/gocql/gocql/events.go @@ -5,8 +5,8 @@ import ( "sync" "time" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/go-kit/log" ) type eventDebouncer struct { diff --git a/vendor/github.com/gocql/gocql/metadata.go b/vendor/github.com/gocql/gocql/metadata.go index d5f53d67d..489973214 100644 --- a/vendor/github.com/gocql/gocql/metadata.go +++ b/vendor/github.com/gocql/gocql/metadata.go @@ -12,8 +12,8 @@ import ( "strings" "sync" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/go-kit/log" ) // schema metadata for a keyspace diff --git a/vendor/github.com/gocql/gocql/policies.go b/vendor/github.com/gocql/gocql/policies.go index 708278a51..0cc8b7982 100644 --- a/vendor/github.com/gocql/gocql/policies.go +++ b/vendor/github.com/gocql/gocql/policies.go @@ -1,7 +1,7 @@ // Copyright (c) 2012 The gocql Authors. All rights reserved. // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// This file will be the future home for more policies +//This file will be the future home for more policies package gocql import ( @@ -15,8 +15,8 @@ import ( "sync/atomic" "time" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/go-kit/log" "github.com/hailocab/go-hostpool" ) @@ -166,11 +166,12 @@ type RetryPolicy interface { // // See below for examples of usage: // -// //Assign to the cluster -// cluster.RetryPolicy = &gocql.SimpleRetryPolicy{NumRetries: 3} +// //Assign to the cluster +// cluster.RetryPolicy = &gocql.SimpleRetryPolicy{NumRetries: 3} +// +// //Assign to a query +// query.RetryPolicy(&gocql.SimpleRetryPolicy{NumRetries: 1}) // -// //Assign to a query -// query.RetryPolicy(&gocql.SimpleRetryPolicy{NumRetries: 1}) type SimpleRetryPolicy struct { NumRetries int //Number of times to retry a query } @@ -656,13 +657,14 @@ func (t *tokenAwareHostPolicy) Pick(qry ExecutableQuery) NextHost { // use an empty slice of hosts as the hostpool will be populated later by gocql. // See below for examples of usage: // -// // Create host selection policy using a simple host pool -// cluster.PoolConfig.HostSelectionPolicy = HostPoolHostPolicy(hostpool.New(nil)) +// // Create host selection policy using a simple host pool +// cluster.PoolConfig.HostSelectionPolicy = HostPoolHostPolicy(hostpool.New(nil)) +// +// // Create host selection policy using an epsilon greedy pool +// cluster.PoolConfig.HostSelectionPolicy = HostPoolHostPolicy( +// hostpool.NewEpsilonGreedy(nil, 0, &hostpool.LinearEpsilonValueCalculator{}), +// ) // -// // Create host selection policy using an epsilon greedy pool -// cluster.PoolConfig.HostSelectionPolicy = HostPoolHostPolicy( -// hostpool.NewEpsilonGreedy(nil, 0, &hostpool.LinearEpsilonValueCalculator{}), -// ) func HostPoolHostPolicy(hp hostpool.HostPool) HostSelectionPolicy { return &hostPoolHostPolicy{hostMap: map[string]*HostInfo{}, hp: hp} } @@ -902,6 +904,7 @@ func (e *SimpleConvictionPolicy) Reset(host *HostInfo) {} // ReconnectionPolicy interface is used by gocql to determine if reconnection // can be attempted after connection error. The interface allows gocql users // to implement their own logic to determine how to attempt reconnection. +// type ReconnectionPolicy interface { GetInterval(currentRetry int) time.Duration GetMaxRetries() int @@ -911,7 +914,8 @@ type ReconnectionPolicy interface { // // Examples of usage: // -// cluster.ReconnectionPolicy = &gocql.ConstantReconnectionPolicy{MaxRetries: 10, Interval: 8 * time.Second} +// cluster.ReconnectionPolicy = &gocql.ConstantReconnectionPolicy{MaxRetries: 10, Interval: 8 * time.Second} +// type ConstantReconnectionPolicy struct { MaxRetries int Interval time.Duration diff --git a/vendor/github.com/gocql/gocql/session.go b/vendor/github.com/gocql/gocql/session.go index ea8c3ff32..348216b0c 100644 --- a/vendor/github.com/gocql/gocql/session.go +++ b/vendor/github.com/gocql/gocql/session.go @@ -18,8 +18,8 @@ import ( "time" "unicode" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" - "github.com/go-kit/log" "github.com/gocql/gocql/internal/lru" "github.com/prometheus/client_golang/prometheus" ) @@ -871,7 +871,7 @@ func (q Query) String() string { return fmt.Sprintf("[query statement=%q values=%+v consistency=%s]", q.stmt, q.values, q.cons) } -// Attempts returns the number of times the query was executed. +//Attempts returns the number of times the query was executed. func (q *Query) Attempts() int { return q.metrics.attempts() } @@ -880,7 +880,7 @@ func (q *Query) AddAttempts(i int, host *HostInfo) { q.metrics.attempt(i, 0, host, false) } -// Latency returns the average amount of nanoseconds per attempt of the query. +//Latency returns the average amount of nanoseconds per attempt of the query. func (q *Query) Latency() int64 { return q.metrics.latency() } @@ -1249,10 +1249,9 @@ func (q *Query) MapScanCAS(dest map[string]interface{}) (applied bool, err error // cannot be reused. // // Example: -// -// qry := session.Query("SELECT * FROM my_table") -// qry.Exec() -// qry.Release() +// qry := session.Query("SELECT * FROM my_table") +// qry.Exec() +// qry.Release() func (q *Query) Release() { q.reset() queryPool.Put(q) @@ -1617,7 +1616,7 @@ func (b *Batch) AddAttempts(i int, host *HostInfo) { b.metrics.attempt(i, 0, host, false) } -// Latency returns the average number of nanoseconds to execute a single attempt of the batch. +//Latency returns the average number of nanoseconds to execute a single attempt of the batch. func (b *Batch) Latency() int64 { return b.metrics.latency() } @@ -1878,8 +1877,8 @@ func (r *routingKeyInfoLRU) Remove(key string) { r.mu.Unlock() } -// Max adjusts the maximum size of the cache and cleans up the oldest records if -// the new max is lower than the previous value. Not concurrency safe. +//Max adjusts the maximum size of the cache and cleans up the oldest records if +//the new max is lower than the previous value. Not concurrency safe. func (r *routingKeyInfoLRU) Max(max int) { r.mu.Lock() for r.lru.Len() > max { diff --git a/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.go b/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.go index 0d6488779..f5a7704c1 100644 --- a/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.go +++ b/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.go @@ -20,14 +20,14 @@ import ( // gRPC, and can eventually be converted back to a HTTP response with // HTTPResponseFromError. func Errorf(code int, tmpl string, args ...interface{}) error { - return ErrorFromHTTPResponse(&HTTPResponse{ + return ErrorFromHTTPResponse(&DHTTPResponse{ Code: int32(code), Body: []byte(fmt.Sprintf(tmpl, args...)), }) } // ErrorFromHTTPResponse converts an HTTP response into a grpc error -func ErrorFromHTTPResponse(resp *HTTPResponse) error { +func ErrorFromHTTPResponse(resp *DHTTPResponse) error { a, err := types.MarshalAny(resp) if err != nil { return err @@ -41,7 +41,7 @@ func ErrorFromHTTPResponse(resp *HTTPResponse) error { } // HTTPResponseFromError converts a grpc error into an HTTP response -func HTTPResponseFromError(err error) (*HTTPResponse, bool) { +func HTTPResponseFromError(err error) (*DHTTPResponse, bool) { s, ok := status.FromError(err) if !ok { return nil, false @@ -52,7 +52,7 @@ func HTTPResponseFromError(err error) (*HTTPResponse, bool) { return nil, false } - var resp HTTPResponse + var resp DHTTPResponse if err := types.UnmarshalAny(status.Details[0], &resp); err != nil { level.Error(log.Global()).Log("msg", "got error containing non-response", "err", err) return nil, false diff --git a/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.pb.go b/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.pb.go index bab0efd53..211b69589 100644 --- a/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.pb.go +++ b/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.pb.go @@ -30,24 +30,24 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type HTTPRequest struct { - Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"` - Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` - Headers []*Header `protobuf:"bytes,3,rep,name=headers,proto3" json:"headers,omitempty"` - Body []byte `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"` +type DHTTPRequest struct { + Method string `protobuf:"bytes,1,opt,name=method,proto3" json:"method,omitempty"` + Url string `protobuf:"bytes,2,opt,name=url,proto3" json:"url,omitempty"` + Headers []*DHeader `protobuf:"bytes,3,rep,name=headers,proto3" json:"headers,omitempty"` + Body []byte `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"` } -func (m *HTTPRequest) Reset() { *m = HTTPRequest{} } -func (*HTTPRequest) ProtoMessage() {} -func (*HTTPRequest) Descriptor() ([]byte, []int) { +func (m *DHTTPRequest) Reset() { *m = DHTTPRequest{} } +func (*DHTTPRequest) ProtoMessage() {} +func (*DHTTPRequest) Descriptor() ([]byte, []int) { return fileDescriptor_c50820dbc814fcdd, []int{0} } -func (m *HTTPRequest) XXX_Unmarshal(b []byte) error { +func (m *DHTTPRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *HTTPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *DHTTPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_HTTPRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_DHTTPRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -57,63 +57,63 @@ func (m *HTTPRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *HTTPRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_HTTPRequest.Merge(m, src) +func (m *DHTTPRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DHTTPRequest.Merge(m, src) } -func (m *HTTPRequest) XXX_Size() int { +func (m *DHTTPRequest) XXX_Size() int { return m.Size() } -func (m *HTTPRequest) XXX_DiscardUnknown() { - xxx_messageInfo_HTTPRequest.DiscardUnknown(m) +func (m *DHTTPRequest) XXX_DiscardUnknown() { + xxx_messageInfo_DHTTPRequest.DiscardUnknown(m) } -var xxx_messageInfo_HTTPRequest proto.InternalMessageInfo +var xxx_messageInfo_DHTTPRequest proto.InternalMessageInfo -func (m *HTTPRequest) GetMethod() string { +func (m *DHTTPRequest) GetMethod() string { if m != nil { return m.Method } return "" } -func (m *HTTPRequest) GetUrl() string { +func (m *DHTTPRequest) GetUrl() string { if m != nil { return m.Url } return "" } -func (m *HTTPRequest) GetHeaders() []*Header { +func (m *DHTTPRequest) GetHeaders() []*DHeader { if m != nil { return m.Headers } return nil } -func (m *HTTPRequest) GetBody() []byte { +func (m *DHTTPRequest) GetBody() []byte { if m != nil { return m.Body } return nil } -type HTTPResponse struct { - Code int32 `protobuf:"varint,1,opt,name=Code,proto3" json:"Code,omitempty"` - Headers []*Header `protobuf:"bytes,2,rep,name=headers,proto3" json:"headers,omitempty"` - Body []byte `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"` +type DHTTPResponse struct { + Code int32 `protobuf:"varint,1,opt,name=Code,proto3" json:"Code,omitempty"` + Headers []*DHeader `protobuf:"bytes,2,rep,name=headers,proto3" json:"headers,omitempty"` + Body []byte `protobuf:"bytes,3,opt,name=body,proto3" json:"body,omitempty"` } -func (m *HTTPResponse) Reset() { *m = HTTPResponse{} } -func (*HTTPResponse) ProtoMessage() {} -func (*HTTPResponse) Descriptor() ([]byte, []int) { +func (m *DHTTPResponse) Reset() { *m = DHTTPResponse{} } +func (*DHTTPResponse) ProtoMessage() {} +func (*DHTTPResponse) Descriptor() ([]byte, []int) { return fileDescriptor_c50820dbc814fcdd, []int{1} } -func (m *HTTPResponse) XXX_Unmarshal(b []byte) error { +func (m *DHTTPResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *HTTPResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *DHTTPResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_HTTPResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_DHTTPResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -123,55 +123,55 @@ func (m *HTTPResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) return b[:n], nil } } -func (m *HTTPResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_HTTPResponse.Merge(m, src) +func (m *DHTTPResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_DHTTPResponse.Merge(m, src) } -func (m *HTTPResponse) XXX_Size() int { +func (m *DHTTPResponse) XXX_Size() int { return m.Size() } -func (m *HTTPResponse) XXX_DiscardUnknown() { - xxx_messageInfo_HTTPResponse.DiscardUnknown(m) +func (m *DHTTPResponse) XXX_DiscardUnknown() { + xxx_messageInfo_DHTTPResponse.DiscardUnknown(m) } -var xxx_messageInfo_HTTPResponse proto.InternalMessageInfo +var xxx_messageInfo_DHTTPResponse proto.InternalMessageInfo -func (m *HTTPResponse) GetCode() int32 { +func (m *DHTTPResponse) GetCode() int32 { if m != nil { return m.Code } return 0 } -func (m *HTTPResponse) GetHeaders() []*Header { +func (m *DHTTPResponse) GetHeaders() []*DHeader { if m != nil { return m.Headers } return nil } -func (m *HTTPResponse) GetBody() []byte { +func (m *DHTTPResponse) GetBody() []byte { if m != nil { return m.Body } return nil } -type Header struct { +type DHeader struct { Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` Values []string `protobuf:"bytes,2,rep,name=values,proto3" json:"values,omitempty"` } -func (m *Header) Reset() { *m = Header{} } -func (*Header) ProtoMessage() {} -func (*Header) Descriptor() ([]byte, []int) { +func (m *DHeader) Reset() { *m = DHeader{} } +func (*DHeader) ProtoMessage() {} +func (*DHeader) Descriptor() ([]byte, []int) { return fileDescriptor_c50820dbc814fcdd, []int{2} } -func (m *Header) XXX_Unmarshal(b []byte) error { +func (m *DHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *DHeader) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_Header.Marshal(b, m, deterministic) + return xxx_messageInfo_DHeader.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -181,26 +181,26 @@ func (m *Header) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return b[:n], nil } } -func (m *Header) XXX_Merge(src proto.Message) { - xxx_messageInfo_Header.Merge(m, src) +func (m *DHeader) XXX_Merge(src proto.Message) { + xxx_messageInfo_DHeader.Merge(m, src) } -func (m *Header) XXX_Size() int { +func (m *DHeader) XXX_Size() int { return m.Size() } -func (m *Header) XXX_DiscardUnknown() { - xxx_messageInfo_Header.DiscardUnknown(m) +func (m *DHeader) XXX_DiscardUnknown() { + xxx_messageInfo_DHeader.DiscardUnknown(m) } -var xxx_messageInfo_Header proto.InternalMessageInfo +var xxx_messageInfo_DHeader proto.InternalMessageInfo -func (m *Header) GetKey() string { +func (m *DHeader) GetKey() string { if m != nil { return m.Key } return "" } -func (m *Header) GetValues() []string { +func (m *DHeader) GetValues() []string { if m != nil { return m.Values } @@ -208,44 +208,44 @@ func (m *Header) GetValues() []string { } func init() { - proto.RegisterType((*HTTPRequest)(nil), "httpgrpc.HTTPRequest") - proto.RegisterType((*HTTPResponse)(nil), "httpgrpc.HTTPResponse") - proto.RegisterType((*Header)(nil), "httpgrpc.Header") + proto.RegisterType((*DHTTPRequest)(nil), "httpgrpc.DHTTPRequest") + proto.RegisterType((*DHTTPResponse)(nil), "httpgrpc.DHTTPResponse") + proto.RegisterType((*DHeader)(nil), "httpgrpc.DHeader") } func init() { proto.RegisterFile("httpgrpc.proto", fileDescriptor_c50820dbc814fcdd) } var fileDescriptor_c50820dbc814fcdd = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xbd, 0x4e, 0xc3, 0x30, - 0x14, 0x85, 0xed, 0xa6, 0x04, 0xea, 0x56, 0xa8, 0xb2, 0xa0, 0x8a, 0x3a, 0x5c, 0x55, 0x99, 0x22, - 0x86, 0x22, 0x05, 0x16, 0x46, 0x60, 0xc9, 0x88, 0xac, 0xbe, 0x40, 0x42, 0xac, 0x44, 0x22, 0xd4, - 0x21, 0x3f, 0xa0, 0x6e, 0x3c, 0x02, 0x8f, 0xc1, 0xa3, 0x30, 0x66, 0xec, 0x48, 0x9c, 0x85, 0xb1, - 0x8f, 0x80, 0xec, 0xa4, 0x10, 0x31, 0xb1, 0x9d, 0x7b, 0xee, 0x51, 0xbe, 0x7b, 0x62, 0x72, 0x1c, - 0x17, 0x45, 0x1a, 0x65, 0xe9, 0xfd, 0x32, 0xcd, 0x44, 0x21, 0xe8, 0xd1, 0x7e, 0x9e, 0x9f, 0x44, - 0x22, 0x12, 0xda, 0x3c, 0x57, 0xaa, 0xdd, 0xdb, 0x2f, 0x64, 0xec, 0xad, 0x56, 0x77, 0x8c, 0x3f, - 0x95, 0x3c, 0x2f, 0xe8, 0x8c, 0x98, 0x8f, 0xbc, 0x88, 0x45, 0x68, 0xe1, 0x05, 0x76, 0x46, 0xac, - 0x9b, 0xe8, 0x94, 0x18, 0x65, 0x96, 0x58, 0x03, 0x6d, 0x2a, 0x49, 0xcf, 0xc8, 0x61, 0xcc, 0xfd, - 0x90, 0x67, 0xb9, 0x65, 0x2c, 0x0c, 0x67, 0xec, 0x4e, 0x97, 0x3f, 0x68, 0x4f, 0x2f, 0xd8, 0x3e, - 0x40, 0x29, 0x19, 0x06, 0x22, 0xdc, 0x58, 0xc3, 0x05, 0x76, 0x26, 0x4c, 0x6b, 0x3b, 0x20, 0x93, - 0x16, 0x9c, 0xa7, 0x62, 0x9d, 0x73, 0x95, 0xb9, 0x15, 0x21, 0xd7, 0xdc, 0x03, 0xa6, 0x75, 0x9f, - 0x31, 0xf8, 0x2f, 0xc3, 0xe8, 0x31, 0x5c, 0x62, 0xb6, 0x31, 0x75, 0xff, 0x03, 0xdf, 0x74, 0xa5, - 0x94, 0x54, 0x4d, 0x9f, 0xfd, 0xa4, 0xe4, 0xed, 0xa7, 0x47, 0xac, 0x9b, 0xdc, 0x6b, 0x32, 0x54, - 0x77, 0xd1, 0x2b, 0x62, 0x7a, 0xfe, 0x3a, 0x4c, 0x38, 0x3d, 0xed, 0x41, 0x7f, 0x7f, 0xd5, 0x7c, - 0xf6, 0xd7, 0x6e, 0x8b, 0xd8, 0xe8, 0xe6, 0xb2, 0xaa, 0x01, 0x6d, 0x6b, 0x40, 0xbb, 0x1a, 0xf0, - 0xab, 0x04, 0xfc, 0x2e, 0x01, 0x7f, 0x48, 0xc0, 0x95, 0x04, 0xfc, 0x29, 0x01, 0x7f, 0x49, 0x40, - 0x3b, 0x09, 0xf8, 0xad, 0x01, 0x54, 0x35, 0x80, 0xb6, 0x0d, 0xa0, 0xc0, 0xd4, 0x0f, 0x72, 0xf1, - 0x1d, 0x00, 0x00, 0xff, 0xff, 0x44, 0x0e, 0x7c, 0xff, 0xc2, 0x01, 0x00, 0x00, + // 303 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0x28, 0x29, 0x29, + 0x48, 0x2f, 0x2a, 0x48, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x80, 0xf1, 0xa5, 0x44, + 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x82, 0xfa, 0x20, 0x16, 0x44, 0x5e, 0xa9, 0x92, 0x8b, 0xc7, 0xc5, + 0x23, 0x24, 0x24, 0x20, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0x48, 0x8c, 0x8b, 0x2d, 0x37, + 0xb5, 0x24, 0x23, 0x3f, 0x45, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x08, 0xca, 0x13, 0x12, 0xe0, + 0x62, 0x2e, 0x2d, 0xca, 0x91, 0x60, 0x02, 0x0b, 0x82, 0x98, 0x42, 0xda, 0x5c, 0xec, 0x19, 0xa9, + 0x89, 0x29, 0xa9, 0x45, 0xc5, 0x12, 0xcc, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x82, 0x7a, 0x70, 0xbb, + 0x5d, 0x3c, 0xc0, 0x32, 0x41, 0x30, 0x15, 0x42, 0x42, 0x5c, 0x2c, 0x49, 0xf9, 0x29, 0x95, 0x12, + 0x2c, 0x0a, 0x8c, 0x1a, 0x3c, 0x41, 0x60, 0xb6, 0x52, 0x0a, 0x17, 0x2f, 0xd4, 0xea, 0xe2, 0x82, + 0xfc, 0xbc, 0xe2, 0x54, 0x90, 0x22, 0xe7, 0xfc, 0x94, 0x54, 0xb0, 0xcd, 0xac, 0x41, 0x60, 0x36, + 0xb2, 0x2d, 0x4c, 0x44, 0xdb, 0xc2, 0x8c, 0x64, 0x8b, 0x31, 0x17, 0x3b, 0x54, 0x1d, 0xc8, 0x0f, + 0xd9, 0xa9, 0x95, 0x50, 0x8f, 0x81, 0x98, 0x20, 0xdf, 0x96, 0x25, 0xe6, 0x94, 0xa6, 0x42, 0x0c, + 0xe7, 0x0c, 0x82, 0xf2, 0x8c, 0x5c, 0xb8, 0x58, 0xc1, 0x4e, 0x13, 0xb2, 0xe6, 0x62, 0xf3, 0x48, + 0xcc, 0x4b, 0xc9, 0x49, 0x15, 0x12, 0x43, 0xb6, 0x17, 0x11, 0x60, 0x52, 0xe2, 0x18, 0xe2, 0x10, + 0xdf, 0x28, 0x31, 0x38, 0x99, 0x5c, 0x78, 0x28, 0xc7, 0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, + 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x57, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, + 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x5f, 0x3c, 0x92, 0x63, 0xf8, 0xf0, 0x48, 0x8e, 0x71, + 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x48, 0x62, 0x03, 0x47, + 0x8c, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x33, 0xb2, 0xfa, 0xca, 0x01, 0x00, 0x00, } -func (this *HTTPRequest) Equal(that interface{}) bool { +func (this *DHTTPRequest) Equal(that interface{}) bool { if that == nil { return this == nil } - that1, ok := that.(*HTTPRequest) + that1, ok := that.(*DHTTPRequest) if !ok { - that2, ok := that.(HTTPRequest) + that2, ok := that.(DHTTPRequest) if ok { that1 = &that2 } else { @@ -276,14 +276,14 @@ func (this *HTTPRequest) Equal(that interface{}) bool { } return true } -func (this *HTTPResponse) Equal(that interface{}) bool { +func (this *DHTTPResponse) Equal(that interface{}) bool { if that == nil { return this == nil } - that1, ok := that.(*HTTPResponse) + that1, ok := that.(*DHTTPResponse) if !ok { - that2, ok := that.(HTTPResponse) + that2, ok := that.(DHTTPResponse) if ok { that1 = &that2 } else { @@ -311,14 +311,14 @@ func (this *HTTPResponse) Equal(that interface{}) bool { } return true } -func (this *Header) Equal(that interface{}) bool { +func (this *DHeader) Equal(that interface{}) bool { if that == nil { return this == nil } - that1, ok := that.(*Header) + that1, ok := that.(*DHeader) if !ok { - that2, ok := that.(Header) + that2, ok := that.(DHeader) if ok { that1 = &that2 } else { @@ -343,12 +343,12 @@ func (this *Header) Equal(that interface{}) bool { } return true } -func (this *HTTPRequest) GoString() string { +func (this *DHTTPRequest) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 8) - s = append(s, "&httpgrpc.HTTPRequest{") + s = append(s, "&httpgrpc.DHTTPRequest{") s = append(s, "Method: "+fmt.Sprintf("%#v", this.Method)+",\n") s = append(s, "Url: "+fmt.Sprintf("%#v", this.Url)+",\n") if this.Headers != nil { @@ -358,12 +358,12 @@ func (this *HTTPRequest) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *HTTPResponse) GoString() string { +func (this *DHTTPResponse) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 7) - s = append(s, "&httpgrpc.HTTPResponse{") + s = append(s, "&httpgrpc.DHTTPResponse{") s = append(s, "Code: "+fmt.Sprintf("%#v", this.Code)+",\n") if this.Headers != nil { s = append(s, "Headers: "+fmt.Sprintf("%#v", this.Headers)+",\n") @@ -372,12 +372,12 @@ func (this *HTTPResponse) GoString() string { s = append(s, "}") return strings.Join(s, "") } -func (this *Header) GoString() string { +func (this *DHeader) GoString() string { if this == nil { return "nil" } s := make([]string, 0, 6) - s = append(s, "&httpgrpc.Header{") + s = append(s, "&httpgrpc.DHeader{") s = append(s, "Key: "+fmt.Sprintf("%#v", this.Key)+",\n") s = append(s, "Values: "+fmt.Sprintf("%#v", this.Values)+",\n") s = append(s, "}") @@ -400,79 +400,79 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// HTTPClient is the client API for HTTP service. +// DHTTPClient is the client API for DHTTP service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. -type HTTPClient interface { - Handle(ctx context.Context, in *HTTPRequest, opts ...grpc.CallOption) (*HTTPResponse, error) +type DHTTPClient interface { + Handle(ctx context.Context, in *DHTTPRequest, opts ...grpc.CallOption) (*DHTTPResponse, error) } -type hTTPClient struct { +type dHTTPClient struct { cc *grpc.ClientConn } -func NewHTTPClient(cc *grpc.ClientConn) HTTPClient { - return &hTTPClient{cc} +func NewDHTTPClient(cc *grpc.ClientConn) DHTTPClient { + return &dHTTPClient{cc} } -func (c *hTTPClient) Handle(ctx context.Context, in *HTTPRequest, opts ...grpc.CallOption) (*HTTPResponse, error) { - out := new(HTTPResponse) - err := c.cc.Invoke(ctx, "/httpgrpc.HTTP/Handle", in, out, opts...) +func (c *dHTTPClient) Handle(ctx context.Context, in *DHTTPRequest, opts ...grpc.CallOption) (*DHTTPResponse, error) { + out := new(DHTTPResponse) + err := c.cc.Invoke(ctx, "/httpgrpc.DHTTP/Handle", in, out, opts...) if err != nil { return nil, err } return out, nil } -// HTTPServer is the server API for HTTP service. -type HTTPServer interface { - Handle(context.Context, *HTTPRequest) (*HTTPResponse, error) +// DHTTPServer is the server API for DHTTP service. +type DHTTPServer interface { + Handle(context.Context, *DHTTPRequest) (*DHTTPResponse, error) } -// UnimplementedHTTPServer can be embedded to have forward compatible implementations. -type UnimplementedHTTPServer struct { +// UnimplementedDHTTPServer can be embedded to have forward compatible implementations. +type UnimplementedDHTTPServer struct { } -func (*UnimplementedHTTPServer) Handle(ctx context.Context, req *HTTPRequest) (*HTTPResponse, error) { +func (*UnimplementedDHTTPServer) Handle(ctx context.Context, req *DHTTPRequest) (*DHTTPResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Handle not implemented") } -func RegisterHTTPServer(s *grpc.Server, srv HTTPServer) { - s.RegisterService(&_HTTP_serviceDesc, srv) +func RegisterDHTTPServer(s *grpc.Server, srv DHTTPServer) { + s.RegisterService(&_DHTTP_serviceDesc, srv) } -func _HTTP_Handle_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(HTTPRequest) +func _DHTTP_Handle_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(DHTTPRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(HTTPServer).Handle(ctx, in) + return srv.(DHTTPServer).Handle(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/httpgrpc.HTTP/Handle", + FullMethod: "/httpgrpc.DHTTP/Handle", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(HTTPServer).Handle(ctx, req.(*HTTPRequest)) + return srv.(DHTTPServer).Handle(ctx, req.(*DHTTPRequest)) } return interceptor(ctx, in, info, handler) } -var _HTTP_serviceDesc = grpc.ServiceDesc{ - ServiceName: "httpgrpc.HTTP", - HandlerType: (*HTTPServer)(nil), +var _DHTTP_serviceDesc = grpc.ServiceDesc{ + ServiceName: "httpgrpc.DHTTP", + HandlerType: (*DHTTPServer)(nil), Methods: []grpc.MethodDesc{ { MethodName: "Handle", - Handler: _HTTP_Handle_Handler, + Handler: _DHTTP_Handle_Handler, }, }, Streams: []grpc.StreamDesc{}, Metadata: "httpgrpc.proto", } -func (m *HTTPRequest) Marshal() (dAtA []byte, err error) { +func (m *DHTTPRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -482,12 +482,12 @@ func (m *HTTPRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *HTTPRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *DHTTPRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *HTTPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *DHTTPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -530,7 +530,7 @@ func (m *HTTPRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *HTTPResponse) Marshal() (dAtA []byte, err error) { +func (m *DHTTPResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -540,12 +540,12 @@ func (m *HTTPResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *HTTPResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *DHTTPResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *HTTPResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *DHTTPResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -579,7 +579,7 @@ func (m *HTTPResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *Header) Marshal() (dAtA []byte, err error) { +func (m *DHeader) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -589,12 +589,12 @@ func (m *Header) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Header) MarshalTo(dAtA []byte) (int, error) { +func (m *DHeader) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *DHeader) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -629,7 +629,7 @@ func encodeVarintHttpgrpc(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *HTTPRequest) Size() (n int) { +func (m *DHTTPRequest) Size() (n int) { if m == nil { return 0 } @@ -656,7 +656,7 @@ func (m *HTTPRequest) Size() (n int) { return n } -func (m *HTTPResponse) Size() (n int) { +func (m *DHTTPResponse) Size() (n int) { if m == nil { return 0 } @@ -678,7 +678,7 @@ func (m *HTTPResponse) Size() (n int) { return n } -func (m *Header) Size() (n int) { +func (m *DHeader) Size() (n int) { if m == nil { return 0 } @@ -703,16 +703,16 @@ func sovHttpgrpc(x uint64) (n int) { func sozHttpgrpc(x uint64) (n int) { return sovHttpgrpc(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (this *HTTPRequest) String() string { +func (this *DHTTPRequest) String() string { if this == nil { return "nil" } - repeatedStringForHeaders := "[]*Header{" + repeatedStringForHeaders := "[]*DHeader{" for _, f := range this.Headers { - repeatedStringForHeaders += strings.Replace(f.String(), "Header", "Header", 1) + "," + repeatedStringForHeaders += strings.Replace(f.String(), "DHeader", "DHeader", 1) + "," } repeatedStringForHeaders += "}" - s := strings.Join([]string{`&HTTPRequest{`, + s := strings.Join([]string{`&DHTTPRequest{`, `Method:` + fmt.Sprintf("%v", this.Method) + `,`, `Url:` + fmt.Sprintf("%v", this.Url) + `,`, `Headers:` + repeatedStringForHeaders + `,`, @@ -721,16 +721,16 @@ func (this *HTTPRequest) String() string { }, "") return s } -func (this *HTTPResponse) String() string { +func (this *DHTTPResponse) String() string { if this == nil { return "nil" } - repeatedStringForHeaders := "[]*Header{" + repeatedStringForHeaders := "[]*DHeader{" for _, f := range this.Headers { - repeatedStringForHeaders += strings.Replace(f.String(), "Header", "Header", 1) + "," + repeatedStringForHeaders += strings.Replace(f.String(), "DHeader", "DHeader", 1) + "," } repeatedStringForHeaders += "}" - s := strings.Join([]string{`&HTTPResponse{`, + s := strings.Join([]string{`&DHTTPResponse{`, `Code:` + fmt.Sprintf("%v", this.Code) + `,`, `Headers:` + repeatedStringForHeaders + `,`, `Body:` + fmt.Sprintf("%v", this.Body) + `,`, @@ -738,11 +738,11 @@ func (this *HTTPResponse) String() string { }, "") return s } -func (this *Header) String() string { +func (this *DHeader) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&Header{`, + s := strings.Join([]string{`&DHeader{`, `Key:` + fmt.Sprintf("%v", this.Key) + `,`, `Values:` + fmt.Sprintf("%v", this.Values) + `,`, `}`, @@ -757,7 +757,7 @@ func valueToStringHttpgrpc(v interface{}) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("*%v", pv) } -func (m *HTTPRequest) Unmarshal(dAtA []byte) error { +func (m *DHTTPRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -780,10 +780,10 @@ func (m *HTTPRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: HTTPRequest: wiretype end group for non-group") + return fmt.Errorf("proto: DHTTPRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: HTTPRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DHTTPRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -879,7 +879,7 @@ func (m *HTTPRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, &Header{}) + m.Headers = append(m.Headers, &DHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -942,7 +942,7 @@ func (m *HTTPRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *HTTPResponse) Unmarshal(dAtA []byte) error { +func (m *DHTTPResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -965,10 +965,10 @@ func (m *HTTPResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: HTTPResponse: wiretype end group for non-group") + return fmt.Errorf("proto: DHTTPResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: HTTPResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DHTTPResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -1019,7 +1019,7 @@ func (m *HTTPResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, &Header{}) + m.Headers = append(m.Headers, &DHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1082,7 +1082,7 @@ func (m *HTTPResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *Header) Unmarshal(dAtA []byte) error { +func (m *DHeader) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1105,10 +1105,10 @@ func (m *Header) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: Header: wiretype end group for non-group") + return fmt.Errorf("proto: DHeader: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: Header: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: DHeader: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.proto b/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.proto index 8f546330a..f1a1feb05 100644 --- a/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.proto +++ b/vendor/github.com/grafana/dskit/httpgrpc/httpgrpc.proto @@ -12,24 +12,24 @@ option (gogoproto.goproto_unkeyed_all) = false; option (gogoproto.goproto_unrecognized_all) = false; option (gogoproto.goproto_sizecache_all) = false; -service HTTP { - rpc Handle(HTTPRequest) returns (HTTPResponse) {}; +service DHTTP { + rpc Handle(DHTTPRequest) returns (DHTTPResponse) {}; } -message HTTPRequest { +message DHTTPRequest { string method = 1; string url = 2; - repeated Header headers = 3; + repeated DHeader headers = 3; bytes body = 4; } -message HTTPResponse { +message DHTTPResponse { int32 Code = 1; - repeated Header headers = 2; + repeated DHeader headers = 2; bytes body = 3; } -message Header { +message DHeader { string key = 1; repeated string values = 2; } diff --git a/vendor/github.com/grafana/dskit/httpgrpc/server/server.go b/vendor/github.com/grafana/dskit/httpgrpc/server/server.go index 0fab46a8a..ca9e616f9 100644 --- a/vendor/github.com/grafana/dskit/httpgrpc/server/server.go +++ b/vendor/github.com/grafana/dskit/httpgrpc/server/server.go @@ -50,7 +50,7 @@ func (nopCloser) Close() error { return nil } func (n nopCloser) BytesBuffer() *bytes.Buffer { return n.Buffer } // Handle implements HTTPServer. -func (s Server) Handle(ctx context.Context, r *httpgrpc.HTTPRequest) (*httpgrpc.HTTPResponse, error) { +func (s Server) Handle(ctx context.Context, r *httpgrpc.DHTTPRequest) (*httpgrpc.DHTTPResponse, error) { req, err := http.NewRequest(r.Method, r.Url, nopCloser{Buffer: bytes.NewBuffer(r.Body)}) if err != nil { return nil, err @@ -62,7 +62,7 @@ func (s Server) Handle(ctx context.Context, r *httpgrpc.HTTPRequest) (*httpgrpc. recorder := httptest.NewRecorder() s.handler.ServeHTTP(recorder, req) - resp := &httpgrpc.HTTPResponse{ + resp := &httpgrpc.DHTTPResponse{ Code: int32(recorder.Code), Headers: fromHeader(recorder.Header()), Body: recorder.Body.Bytes(), @@ -75,7 +75,7 @@ func (s Server) Handle(ctx context.Context, r *httpgrpc.HTTPRequest) (*httpgrpc. // Client is a http.Handler that forwards the request over gRPC. type Client struct { - client httpgrpc.HTTPClient + client httpgrpc.DHTTPClient conn *grpc.ClientConn } @@ -148,18 +148,18 @@ func NewClient(address string) (*Client, error) { } return &Client{ - client: httpgrpc.NewHTTPClient(conn), + client: httpgrpc.NewDHTTPClient(conn), conn: conn, }, nil } // HTTPRequest wraps an ordinary HTTPRequest with a gRPC one -func HTTPRequest(r *http.Request) (*httpgrpc.HTTPRequest, error) { +func HTTPRequest(r *http.Request) (*httpgrpc.DHTTPRequest, error) { body, err := io.ReadAll(r.Body) if err != nil { return nil, err } - return &httpgrpc.HTTPRequest{ + return &httpgrpc.DHTTPRequest{ Method: r.Method, Url: r.RequestURI, Body: body, @@ -168,7 +168,7 @@ func HTTPRequest(r *http.Request) (*httpgrpc.HTTPRequest, error) { } // WriteResponse converts an httpgrpc response to an HTTP one -func WriteResponse(w http.ResponseWriter, resp *httpgrpc.HTTPResponse) error { +func WriteResponse(w http.ResponseWriter, resp *httpgrpc.DHTTPResponse) error { toHeader(resp.Headers, w.Header()) w.WriteHeader(int(resp.Code)) _, err := w.Write(resp.Body) @@ -218,16 +218,16 @@ func (c *Client) ServeHTTP(w http.ResponseWriter, r *http.Request) { } } -func toHeader(hs []*httpgrpc.Header, header http.Header) { +func toHeader(hs []*httpgrpc.DHeader, header http.Header) { for _, h := range hs { header[h.Key] = h.Values } } -func fromHeader(hs http.Header) []*httpgrpc.Header { - result := make([]*httpgrpc.Header, 0, len(hs)) +func fromHeader(hs http.Header) []*httpgrpc.DHeader { + result := make([]*httpgrpc.DHeader, 0, len(hs)) for k, vs := range hs { - result = append(result, &httpgrpc.Header{ + result = append(result, &httpgrpc.DHeader{ Key: k, Values: vs, }) diff --git a/vendor/github.com/grafana/dskit/server/server.go b/vendor/github.com/grafana/dskit/server/server.go index 726d62b48..e2bc173f6 100644 --- a/vendor/github.com/grafana/dskit/server/server.go +++ b/vendor/github.com/grafana/dskit/server/server.go @@ -515,7 +515,7 @@ func (s *Server) Run() error { // Setup gRPC server // for HTTP over gRPC, ensure we don't double-count the middleware - httpgrpc.RegisterHTTPServer(s.GRPC, httpgrpc_server.NewServer(s.HTTP)) + httpgrpc.RegisterDHTTPServer(s.GRPC, httpgrpc_server.NewServer(s.HTTP)) go func() { err := s.GRPC.Serve(s.grpcListener) diff --git a/vendor/github.com/grafana/loki/pkg/ruler/evaluator_remote.go b/vendor/github.com/grafana/loki/pkg/ruler/evaluator_remote.go index 451057fb6..9554396d6 100644 --- a/vendor/github.com/grafana/loki/pkg/ruler/evaluator_remote.go +++ b/vendor/github.com/grafana/loki/pkg/ruler/evaluator_remote.go @@ -68,14 +68,14 @@ type metrics struct { } type RemoteEvaluator struct { - client httpgrpc.HTTPClient + client httpgrpc.DHTTPClient overrides RulesLimits logger log.Logger metrics *metrics } -func NewRemoteEvaluator(client httpgrpc.HTTPClient, overrides RulesLimits, logger log.Logger, registerer prometheus.Registerer) (*RemoteEvaluator, error) { +func NewRemoteEvaluator(client httpgrpc.DHTTPClient, overrides RulesLimits, logger log.Logger, registerer prometheus.Registerer) (*RemoteEvaluator, error) { return &RemoteEvaluator{ client: client, overrides: overrides, @@ -167,7 +167,7 @@ func (r *RemoteEvaluator) Eval(ctx context.Context, qs string, now time.Time) (* } // DialQueryFrontend creates and initializes a new httpgrpc.HTTPClient taking a QueryFrontendConfig configuration. -func DialQueryFrontend(cfg *QueryFrontendConfig) (httpgrpc.HTTPClient, error) { +func DialQueryFrontend(cfg *QueryFrontendConfig) (httpgrpc.DHTTPClient, error) { tlsDialOptions, err := cfg.TLS.GetGRPCDialOptions(cfg.TLSEnabled) if err != nil { return nil, err @@ -196,11 +196,11 @@ func DialQueryFrontend(cfg *QueryFrontendConfig) (httpgrpc.HTTPClient, error) { if err != nil { return nil, err } - return httpgrpc.NewHTTPClient(conn), nil + return httpgrpc.NewDHTTPClient(conn), nil } // Middleware provides a mechanism to inspect outgoing remote querier requests. -type Middleware func(ctx context.Context, req *httpgrpc.HTTPRequest) error +type Middleware func(ctx context.Context, req *httpgrpc.DHTTPRequest) error // Query performs a query for the given time. func (r *RemoteEvaluator) Query(ctx context.Context, ch chan<- queryResponse, orgID, qs string, t time.Time) { @@ -221,11 +221,11 @@ func (r *RemoteEvaluator) query(ctx context.Context, orgID, query string, ts tim body := []byte(args.Encode()) hash := logql.HashedQuery(query) - req := httpgrpc.HTTPRequest{ + req := httpgrpc.DHTTPRequest{ Method: http.MethodPost, Url: queryEndpointPath, Body: body, - Headers: []*httpgrpc.Header{ + Headers: []*httpgrpc.DHeader{ {Key: textproto.CanonicalMIMEHeaderKey("User-Agent"), Values: []string{userAgent}}, {Key: textproto.CanonicalMIMEHeaderKey("Content-Type"), Values: []string{mimeTypeFormPost}}, {Key: textproto.CanonicalMIMEHeaderKey("Content-Length"), Values: []string{strconv.Itoa(len(body))}}, @@ -280,7 +280,7 @@ func (r *RemoteEvaluator) query(ctx context.Context, orgID, query string, ts tim return r.decodeResponse(ctx, resp, orgID) } -func (r *RemoteEvaluator) decodeResponse(ctx context.Context, resp *httpgrpc.HTTPResponse, orgID string) (*logqlmodel.Result, error) { +func (r *RemoteEvaluator) decodeResponse(ctx context.Context, resp *httpgrpc.DHTTPResponse, orgID string) (*logqlmodel.Result, error) { fullBody := resp.Body // created a limited reader to avoid logging the entire response body should it be very large limitedBody := io.LimitReader(bytes.NewReader(fullBody), 1024) diff --git a/vendor/github.com/grafana/loki/pkg/storage/store.go b/vendor/github.com/grafana/loki/pkg/storage/store.go index 6b7f74907..9539019c5 100644 --- a/vendor/github.com/grafana/loki/pkg/storage/store.go +++ b/vendor/github.com/grafana/loki/pkg/storage/store.go @@ -46,16 +46,20 @@ var ( errWritingChunkUnsupported = errors.New("writing chunks is not supported while running store in read-only mode") ) +type SelectStore interface { + SelectSamples(ctx context.Context, req logql.SelectSampleParams) (iter.SampleIterator, error) + SelectLogs(ctx context.Context, req logql.SelectLogParams) (iter.EntryIterator, error) + SelectSeries(ctx context.Context, req logql.SelectLogParams) ([]logproto.SeriesIdentifier, error) +} + type Store interface { stores.Store - stores.ChunkReader - index.Filterable + SelectStore GetSchemaConfigs() []config.PeriodConfig } -type store struct { +type LokiStore struct { stores.Store - composite *stores.CompositeStore cfg Config storeCfg config.ChunkStoreConfig @@ -81,7 +85,7 @@ type store struct { // NewStore creates a new Loki Store using configuration supplied. func NewStore(cfg Config, storeCfg config.ChunkStoreConfig, schemaCfg config.SchemaConfig, limits StoreLimits, clientMetrics ClientMetrics, registerer prometheus.Registerer, logger log.Logger, -) (Store, error) { +) (*LokiStore, error) { if len(schemaCfg.Configs) != 0 { if index := config.ActivePeriodConfig(schemaCfg.Configs); index != -1 && index < len(schemaCfg.Configs) { indexTypeStats.Set(schemaCfg.Configs[index].IndexType) @@ -134,9 +138,8 @@ func NewStore(cfg Config, storeCfg config.ChunkStoreConfig, schemaCfg config.Sch } stores := stores.NewCompositeStore(limits) - s := &store{ + s := &LokiStore{ Store: stores, - composite: stores, cfg: cfg, storeCfg: storeCfg, schemaCfg: schemaCfg, @@ -162,7 +165,7 @@ func NewStore(cfg Config, storeCfg config.ChunkStoreConfig, schemaCfg config.Sch return s, nil } -func (s *store) init() error { +func (s *LokiStore) init() error { for i, p := range s.schemaCfg.Configs { p := p chunkClient, err := s.chunkClientForPeriod(p) @@ -183,7 +186,8 @@ func (s *store) init() error { return err } - s.composite.AddStore(p.From.Time, f, idx, w, stop) + // s.Store is always assigned the CompositeStore implementation of the Store interface + s.Store.(*stores.CompositeStore).AddStore(p.From.Time, f, idx, w, stop) } if s.cfg.EnableAsyncStore { @@ -193,7 +197,7 @@ func (s *store) init() error { return nil } -func (s *store) chunkClientForPeriod(p config.PeriodConfig) (client.Client, error) { +func (s *LokiStore) chunkClientForPeriod(p config.PeriodConfig) (client.Client, error) { objectStoreType := p.ObjectType if objectStoreType == "" { objectStoreType = p.IndexType @@ -234,7 +238,7 @@ func shouldUseIndexGatewayClient(cfg indexshipper.Config) bool { return true } -func (s *store) storeForPeriod(p config.PeriodConfig, tableRange config.TableRange, chunkClient client.Client, f *fetcher.Fetcher) (stores.ChunkWriter, index.ReaderWriter, func(), error) { +func (s *LokiStore) storeForPeriod(p config.PeriodConfig, tableRange config.TableRange, chunkClient client.Client, f *fetcher.Fetcher) (stores.ChunkWriter, index.ReaderWriter, func(), error) { indexClientReg := prometheus.WrapRegistererWith( prometheus.Labels{ "component": fmt.Sprintf( @@ -380,13 +384,13 @@ func injectShardLabel(shards []string, matchers []*labels.Matcher) ([]*labels.Ma return matchers, nil } -func (s *store) SetChunkFilterer(chunkFilterer chunk.RequestChunkFilterer) { +func (s *LokiStore) SetChunkFilterer(chunkFilterer chunk.RequestChunkFilterer) { s.chunkFilterer = chunkFilterer s.Store.SetChunkFilterer(chunkFilterer) } // lazyChunks is an internal function used to resolve a set of lazy chunks from the store without actually loading them. It's used internally by `LazyQuery` and `GetSeries` -func (s *store) lazyChunks(ctx context.Context, matchers []*labels.Matcher, from, through model.Time) ([]*LazyChunk, error) { +func (s *LokiStore) lazyChunks(ctx context.Context, matchers []*labels.Matcher, from, through model.Time) ([]*LazyChunk, error) { userID, err := tenant.TenantID(ctx) if err != nil { return nil, err @@ -424,7 +428,7 @@ func (s *store) lazyChunks(ctx context.Context, matchers []*labels.Matcher, from return lazyChunks, nil } -func (s *store) Series(ctx context.Context, req logql.SelectLogParams) ([]logproto.SeriesIdentifier, error) { +func (s *LokiStore) SelectSeries(ctx context.Context, req logql.SelectLogParams) ([]logproto.SeriesIdentifier, error) { userID, err := tenant.TenantID(ctx) if err != nil { return nil, err @@ -467,7 +471,7 @@ func (s *store) Series(ctx context.Context, req logql.SelectLogParams) ([]logpro // SelectLogs returns an iterator that will query the store for more chunks while iterating instead of fetching all chunks upfront // for that request. -func (s *store) SelectLogs(ctx context.Context, req logql.SelectLogParams) (iter.EntryIterator, error) { +func (s *LokiStore) SelectLogs(ctx context.Context, req logql.SelectLogParams) (iter.EntryIterator, error) { matchers, from, through, err := decodeReq(req) if err != nil { return nil, err @@ -505,7 +509,7 @@ func (s *store) SelectLogs(ctx context.Context, req logql.SelectLogParams) (iter return newLogBatchIterator(ctx, s.schemaCfg, s.chunkMetrics, lazyChunks, s.cfg.MaxChunkBatchSize, matchers, pipeline, req.Direction, req.Start, req.End, chunkFilterer) } -func (s *store) SelectSamples(ctx context.Context, req logql.SelectSampleParams) (iter.SampleIterator, error) { +func (s *LokiStore) SelectSamples(ctx context.Context, req logql.SelectSampleParams) (iter.SampleIterator, error) { matchers, from, through, err := decodeReq(req) if err != nil { return nil, err @@ -543,7 +547,7 @@ func (s *store) SelectSamples(ctx context.Context, req logql.SelectSampleParams) return newSampleBatchIterator(ctx, s.schemaCfg, s.chunkMetrics, lazyChunks, s.cfg.MaxChunkBatchSize, matchers, extractor, req.Start, req.End, chunkFilterer) } -func (s *store) GetSchemaConfigs() []config.PeriodConfig { +func (s *LokiStore) GetSchemaConfigs() []config.PeriodConfig { return s.schemaCfg.Configs } diff --git a/vendor/github.com/grafana/loki/pkg/storage/stores/composite_store.go b/vendor/github.com/grafana/loki/pkg/storage/stores/composite_store.go index 419c6a719..81fb4eb58 100644 --- a/vendor/github.com/grafana/loki/pkg/storage/stores/composite_store.go +++ b/vendor/github.com/grafana/loki/pkg/storage/stores/composite_store.go @@ -9,9 +9,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/iter" "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" "github.com/grafana/loki/pkg/storage/chunk" "github.com/grafana/loki/pkg/storage/chunk/fetcher" "github.com/grafana/loki/pkg/storage/stores/index" @@ -19,12 +17,6 @@ import ( "github.com/grafana/loki/pkg/util" ) -type ChunkReader interface { - SelectSamples(ctx context.Context, req logql.SelectSampleParams) (iter.SampleIterator, error) - SelectLogs(ctx context.Context, req logql.SelectLogParams) (iter.EntryIterator, error) - Series(ctx context.Context, req logql.SelectLogParams) ([]logproto.SeriesIdentifier, error) -} - type ChunkWriter interface { Put(ctx context.Context, chunks []chunk.Chunk) error PutOne(ctx context.Context, from, through model.Time, chunk chunk.Chunk) error @@ -46,21 +38,20 @@ type Store interface { // CompositeStore is a Store which delegates to various stores depending // on when they were activated. type CompositeStore struct { - compositeStore limits StoreLimits -} - -type compositeStore struct { stores []compositeStoreEntry } -// Ensure interface implementation of compositStore -var _ Store = &compositeStore{} +// Ensure interface implementation of CompositeStore +var _ Store = &CompositeStore{} // NewCompositeStore creates a new Store which delegates to different stores depending // on time. func NewCompositeStore(limits StoreLimits) *CompositeStore { - return &CompositeStore{compositeStore{}, limits} + return &CompositeStore{ + stores: make([]compositeStoreEntry, 0), + limits: limits, + } } func (c *CompositeStore) AddStore(start model.Time, fetcher *fetcher.Fetcher, index index.Reader, writer ChunkWriter, stop func()) { @@ -84,7 +75,7 @@ func (c *CompositeStore) Stores() []Store { return stores } -func (c compositeStore) Put(ctx context.Context, chunks []chunk.Chunk) error { +func (c CompositeStore) Put(ctx context.Context, chunks []chunk.Chunk) error { for _, chunk := range chunks { err := c.forStores(ctx, chunk.From, chunk.Through, func(innerCtx context.Context, from, through model.Time, store Store) error { return store.PutOne(innerCtx, from, through, chunk) @@ -96,19 +87,19 @@ func (c compositeStore) Put(ctx context.Context, chunks []chunk.Chunk) error { return nil } -func (c compositeStore) PutOne(ctx context.Context, from, through model.Time, chunk chunk.Chunk) error { +func (c CompositeStore) PutOne(ctx context.Context, from, through model.Time, chunk chunk.Chunk) error { return c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { return store.PutOne(innerCtx, from, through, chunk) }) } -func (c compositeStore) SetChunkFilterer(chunkFilter chunk.RequestChunkFilterer) { +func (c CompositeStore) SetChunkFilterer(chunkFilter chunk.RequestChunkFilterer) { for _, store := range c.stores { store.Store.SetChunkFilterer(chunkFilter) } } -func (c compositeStore) GetSeries(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) ([]labels.Labels, error) { +func (c CompositeStore) GetSeries(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) ([]labels.Labels, error) { var results []labels.Labels found := map[uint64]struct{}{} err := c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { @@ -131,7 +122,7 @@ func (c compositeStore) GetSeries(ctx context.Context, userID string, from, thro } // LabelValuesForMetricName retrieves all label values for a single label name and metric name. -func (c compositeStore) LabelValuesForMetricName(ctx context.Context, userID string, from, through model.Time, metricName string, labelName string, matchers ...*labels.Matcher) ([]string, error) { +func (c CompositeStore) LabelValuesForMetricName(ctx context.Context, userID string, from, through model.Time, metricName string, labelName string, matchers ...*labels.Matcher) ([]string, error) { var result util.UniqueStrings err := c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { labelValues, err := store.LabelValuesForMetricName(innerCtx, userID, from, through, metricName, labelName, matchers...) @@ -145,7 +136,7 @@ func (c compositeStore) LabelValuesForMetricName(ctx context.Context, userID str } // LabelNamesForMetricName retrieves all label names for a metric name. -func (c compositeStore) LabelNamesForMetricName(ctx context.Context, userID string, from, through model.Time, metricName string) ([]string, error) { +func (c CompositeStore) LabelNamesForMetricName(ctx context.Context, userID string, from, through model.Time, metricName string) ([]string, error) { var result util.UniqueStrings err := c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { labelNames, err := store.LabelNamesForMetricName(innerCtx, userID, from, through, metricName) @@ -158,7 +149,7 @@ func (c compositeStore) LabelNamesForMetricName(ctx context.Context, userID stri return result.Strings(), err } -func (c compositeStore) GetChunkRefs(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) ([][]chunk.Chunk, []*fetcher.Fetcher, error) { +func (c CompositeStore) GetChunkRefs(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) ([][]chunk.Chunk, []*fetcher.Fetcher, error) { chunkIDs := [][]chunk.Chunk{} fetchers := []*fetcher.Fetcher{} err := c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { @@ -179,7 +170,7 @@ func (c compositeStore) GetChunkRefs(ctx context.Context, userID string, from, t return chunkIDs, fetchers, err } -func (c compositeStore) Stats(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) (*stats.Stats, error) { +func (c CompositeStore) Stats(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) (*stats.Stats, error) { xs := make([]*stats.Stats, 0, len(c.stores)) err := c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { x, err := store.Stats(innerCtx, userID, from, through, matchers...) @@ -195,7 +186,7 @@ func (c compositeStore) Stats(ctx context.Context, userID string, from, through return &res, err } -func (c compositeStore) Volume(ctx context.Context, userID string, from, through model.Time, limit int32, targetLabels []string, aggregateBy string, matchers ...*labels.Matcher) (*logproto.VolumeResponse, error) { +func (c CompositeStore) Volume(ctx context.Context, userID string, from, through model.Time, limit int32, targetLabels []string, aggregateBy string, matchers ...*labels.Matcher) (*logproto.VolumeResponse, error) { volumes := make([]*logproto.VolumeResponse, 0, len(c.stores)) err := c.forStores(ctx, from, through, func(innerCtx context.Context, from, through model.Time, store Store) error { volume, err := store.Volume(innerCtx, userID, from, through, limit, targetLabels, aggregateBy, matchers...) @@ -211,7 +202,7 @@ func (c compositeStore) Volume(ctx context.Context, userID string, from, through return res, err } -func (c compositeStore) GetChunkFetcher(tm model.Time) *fetcher.Fetcher { +func (c CompositeStore) GetChunkFetcher(tm model.Time) *fetcher.Fetcher { // find the schema with the lowest start _after_ tm j := sort.Search(len(c.stores), func(j int) bool { return c.stores[j].start > tm @@ -227,13 +218,13 @@ func (c compositeStore) GetChunkFetcher(tm model.Time) *fetcher.Fetcher { return nil } -func (c compositeStore) Stop() { +func (c CompositeStore) Stop() { for _, store := range c.stores { store.Stop() } } -func (c compositeStore) forStores(ctx context.Context, from, through model.Time, callback func(innerCtx context.Context, from, through model.Time, store Store) error) error { +func (c CompositeStore) forStores(ctx context.Context, from, through model.Time, callback func(innerCtx context.Context, from, through model.Time, store Store) error) error { if len(c.stores) == 0 { return nil } diff --git a/vendor/github.com/grafana/loki/pkg/validation/limits.go b/vendor/github.com/grafana/loki/pkg/validation/limits.go index 4e1897a00..c38358fc4 100644 --- a/vendor/github.com/grafana/loki/pkg/validation/limits.go +++ b/vendor/github.com/grafana/loki/pkg/validation/limits.go @@ -179,6 +179,8 @@ type Limits struct { RequiredNumberLabels int `yaml:"minimum_labels_number,omitempty" json:"minimum_labels_number,omitempty" doc:"description=Minimum number of label matchers a query should contain."` IndexGatewayShardSize int `yaml:"index_gateway_shard_size" json:"index_gateway_shard_size"` + + AllowStructuredMetadata bool `yaml:"allow_structured_metadata,omitempty" json:"allow_structured_metadata,omitempty" doc:"description=Allow user to send structured metadata (non-indexed labels) in push payload."` } type StreamRetention struct { @@ -288,6 +290,8 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) { l.ShardStreams.RegisterFlagsWithPrefix("shard-streams", f) f.IntVar(&l.VolumeMaxSeries, "limits.volume-max-series", 1000, "The default number of aggregated series or labels that can be returned from a log-volume endpoint") + + f.BoolVar(&l.AllowStructuredMetadata, "validation.allow-structured-metadata", false, "Allow user to send structured metadata (non-indexed labels) in push payload.") } // UnmarshalYAML implements the yaml.Unmarshaler interface. @@ -763,6 +767,10 @@ func (o *Overrides) IndexGatewayShardSize(userID string) int { return o.getOverridesForUser(userID).IndexGatewayShardSize } +func (o *Overrides) AllowStructuredMetadata(userID string) bool { + return o.getOverridesForUser(userID).AllowStructuredMetadata +} + func (o *Overrides) getOverridesForUser(userID string) *Limits { if o.tenantLimits != nil { l := o.tenantLimits.TenantLimits(userID) diff --git a/vendor/github.com/grafana/loki/pkg/validation/validate.go b/vendor/github.com/grafana/loki/pkg/validation/validate.go index a21825118..51915f972 100644 --- a/vendor/github.com/grafana/loki/pkg/validation/validate.go +++ b/vendor/github.com/grafana/loki/pkg/validation/validate.go @@ -58,8 +58,10 @@ const ( LabelValueTooLong = "label_value_too_long" LabelValueTooLongErrorMsg = "stream '%s' has label value too long: '%s'" // DuplicateLabelNames is a reason for discarding a log line which has duplicate label names - DuplicateLabelNames = "duplicate_label_names" - DuplicateLabelNamesErrorMsg = "stream '%s' has duplicate label name: '%s'" + DuplicateLabelNames = "duplicate_label_names" + DuplicateLabelNamesErrorMsg = "stream '%s' has duplicate label name: '%s'" + DisallowedStructuredMetadata = "disallowed_structured_metadata" + DisallowedStructuredMetadataErrorMsg = "stream '%s' includes structured metadata, but this feature is disallowed. Please see `limits_config.structured_metadata` or contact your Loki administrator to enable it." ) type ErrStreamRateLimit struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 6bc498121..613d369b7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -754,7 +754,7 @@ github.com/gosimple/slug # github.com/grafana-tools/sdk v0.0.0-20220203092117-edae16afa87b => github.com/colega/grafana-tools-sdk v0.0.0-20220323154849-711bca56d13f ## explicit; go 1.13 github.com/grafana-tools/sdk -# github.com/grafana/dskit v0.0.0-20230905112532-e4f33b342cb6 +# github.com/grafana/dskit v0.0.0-20230907071146-cc0661f32e42 ## explicit; go 1.19 github.com/grafana/dskit/aws github.com/grafana/dskit/backoff @@ -797,7 +797,7 @@ github.com/grafana/dskit/user # github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 ## explicit; go 1.18 github.com/grafana/gomemcache/memcache -# github.com/grafana/loki v1.6.2-0.20230905071424-a60c1777ce15 +# github.com/grafana/loki v1.6.2-0.20230907070655-40d5d6c744d1 ## explicit; go 1.20 github.com/grafana/loki/pkg/analytics github.com/grafana/loki/pkg/chunkenc