From 06ebead0b06f2948536f4cc9cbe3ed74d446f648 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:06:38 +0000 Subject: [PATCH 1/2] build(deps): bump github.com/grafana/pyroscope-go from 1.1.1 to 1.1.2 Bumps [github.com/grafana/pyroscope-go](https://github.com/grafana/pyroscope-go) from 1.1.1 to 1.1.2. - [Release notes](https://github.com/grafana/pyroscope-go/releases) - [Commits](https://github.com/grafana/pyroscope-go/compare/v1.1.1...v1.1.2) --- updated-dependencies: - dependency-name: github.com/grafana/pyroscope-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 066f077..fa4294d 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/go-kod/kod v0.13.0 github.com/go-kod/kod/ext v0.12.0 github.com/golang-jwt/jwt/v5 v5.2.1 - github.com/grafana/pyroscope-go v1.1.1 + github.com/grafana/pyroscope-go v1.1.2 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/jhump/protoreflect/v2 v2.0.0-20240207013822-c9ae7caed596 github.com/nautilus/gateway v0.3.18 @@ -40,12 +40,12 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/graph-gophers/dataloader v5.0.0+incompatible // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/klauspost/compress v1.17.3 // indirect + github.com/klauspost/compress v1.17.8 // indirect github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/go.sum b/go.sum index b911d35..e477b5e 100644 --- a/go.sum +++ b/go.sum @@ -58,10 +58,10 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grafana/pyroscope-go v1.1.1 h1:PQoUU9oWtO3ve/fgIiklYuGilvsm8qaGhlY4Vw6MAcQ= -github.com/grafana/pyroscope-go v1.1.1/go.mod h1:Mw26jU7jsL/KStNSGGuuVYdUq7Qghem5P8aXYXSXG88= -github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo= -github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE= +github.com/grafana/pyroscope-go v1.1.2 h1:7vCfdORYQMCxIzI3NlYAs3FcBP760+gWuYWOyiVyYx8= +github.com/grafana/pyroscope-go v1.1.2/go.mod h1:HSSmHo2KRn6FasBA4vK7BMiQqyQq8KSuBKvrhkXxYPU= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg= +github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU= github.com/graph-gophers/dataloader v5.0.0+incompatible h1:R+yjsbrNq1Mo3aPG+Z/EKYrXrXXUNJHOgbRt+U6jOug= github.com/graph-gophers/dataloader v5.0.0+incompatible/go.mod h1:jk4jk0c5ZISbKaMe8WsVopGB5/15GvGHMdMdPtwlRp4= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= @@ -76,8 +76,8 @@ github.com/jhump/protoreflect/v2 v2.0.0-20240207013822-c9ae7caed596 h1:iFogf83Hb github.com/jhump/protoreflect/v2 v2.0.0-20240207013822-c9ae7caed596/go.mod h1:H3njxouLe2ZGLFwYfmtEZ0YwhCI8iZlvt1lX5O+SfAQ= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA= -github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= +github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= From dd0c2064b006dc4115221aaf4ed6e00a09d8b63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Sat, 17 Aug 2024 19:17:30 +0800 Subject: [PATCH 2/2] fix: lint error --- internal/config/kod_gen_mock.go | 1 - internal/server/caller.go | 4 +++- internal/server/kod_gen_mock.go | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/config/kod_gen_mock.go b/internal/config/kod_gen_mock.go index 6501afc..54bd1da 100644 --- a/internal/config/kod_gen_mock.go +++ b/internal/config/kod_gen_mock.go @@ -5,7 +5,6 @@ // // mockgen -source internal/config/kod_gen_interface.go -destination internal/config/kod_gen_mock.go -package config // - // Package config is a generated GoMock package. package config diff --git a/internal/server/caller.go b/internal/server/caller.go index 15c3c25..19c8d1e 100644 --- a/internal/server/caller.go +++ b/internal/server/caller.go @@ -95,4 +95,6 @@ func (c *caller) Interceptors() []interceptor.Interceptor { return nil } -var allowSingleFlightKey struct{} +type allowSingleFlightType struct{} + +var allowSingleFlightKey allowSingleFlightType diff --git a/internal/server/kod_gen_mock.go b/internal/server/kod_gen_mock.go index b7cd5a7..ca3aba4 100644 --- a/internal/server/kod_gen_mock.go +++ b/internal/server/kod_gen_mock.go @@ -5,7 +5,6 @@ // // mockgen -source internal/server/kod_gen_interface.go -destination internal/server/kod_gen_mock.go -package server // - // Package server is a generated GoMock package. package server