From 6ff3e72a5581a2b5d9cb9e09c00bd15d1b04e804 Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Mon, 9 Oct 2023 09:53:36 -0700 Subject: [PATCH] Update pyroscope dependency I'm having issues building with pyroscope 1.1. 1.2 fixes it, but it appears the current location we're using has been archived. The new location is: github.com/grafana/pyroscope-go This updates the dependencies to use the latest version there. --- external/pyroscope.go | 5 +++-- go.mod | 4 ++-- go.sum | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/external/pyroscope.go b/external/pyroscope.go index 16d8568..0f182b2 100644 --- a/external/pyroscope.go +++ b/external/pyroscope.go @@ -2,10 +2,11 @@ package external import ( "flygon/config" - "github.com/pyroscope-io/client/pyroscope" - log "github.com/sirupsen/logrus" "os" "runtime" + + "github.com/grafana/pyroscope-go" + log "github.com/sirupsen/logrus" ) func InitPyroscope() { diff --git a/go.mod b/go.mod index 3f06e16..c527688 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/go-sql-driver/mysql v1.7.1 github.com/golang-migrate/migrate/v4 v4.16.2 + github.com/grafana/pyroscope-go v1.0.4 github.com/jellydator/ttlcache/v3 v3.0.1 github.com/jmoiron/sqlx v1.3.5 github.com/knadh/koanf/maps v0.1.1 @@ -17,7 +18,6 @@ require ( github.com/knadh/koanf/v2 v2.0.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.15.1 - github.com/pyroscope-io/client v0.7.1 github.com/ringsaturn/tzf v0.13.0 github.com/ringsaturn/tzf-rel v0.0.2023-b github.com/sirupsen/logrus v1.9.3 @@ -41,6 +41,7 @@ require ( github.com/go-playground/validator/v10 v10.14.1 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -59,7 +60,6 @@ require ( github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - github.com/pyroscope-io/godeltaprof v0.1.1 // indirect github.com/tidwall/geoindex v1.7.0 // indirect github.com/tidwall/geojson v1.4.3 // indirect github.com/tidwall/rtree v1.10.0 // indirect diff --git a/go.sum b/go.sum index 169822b..b1bd233 100644 --- a/go.sum +++ b/go.sum @@ -60,6 +60,10 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/grafana/pyroscope-go v1.0.4 h1:oyQX0BOkL+iARXzHuCdIF5TQ7/sRSel1YFViMHC7Bm0= +github.com/grafana/pyroscope-go v1.0.4/go.mod h1:0d7ftwSMBV/Awm7CCiYmHQEG8Y44Ma3YSjt+nWcWztY= +github.com/grafana/pyroscope-go/godeltaprof v0.1.4 h1:mDsJ3ngul7UfrHibGQpV66PbZ3q1T8glz/tK3bQKKEk= +github.com/grafana/pyroscope-go/godeltaprof v0.1.4/go.mod h1:1HSPtjU8vLG0jE9JrTdzjgFqdJ/VgN7fvxBNq3luJko= 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= @@ -139,10 +143,6 @@ github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdO github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -github.com/pyroscope-io/client v0.7.1 h1:yFRhj3vbgjBxehvxQmedmUWJQ4CAfCHhn+itPsuWsHw= -github.com/pyroscope-io/client v0.7.1/go.mod h1:4h21iOU4pUOq0prKyDlvYRL+SCKsBc5wKiEtV+rJGqU= -github.com/pyroscope-io/godeltaprof v0.1.1 h1:+Mmi+b9gR3s/qufuQSxOBjyXZR1fmvS/C12Q73PIPvw= -github.com/pyroscope-io/godeltaprof v0.1.1/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE= github.com/ringsaturn/go-cities.json v0.3.5 h1:MCRHTdXyXwh6EVbHp17otHrktDulK0Vu/UPd7tX0Inc= github.com/ringsaturn/tzf v0.13.0 h1:a2A5XXcXq8PmzaXzrBDtqFKUq8BbfgSV5bBG7AkTIdE= github.com/ringsaturn/tzf v0.13.0/go.mod h1:5ujpU1Z4p8wnXsDOU73ieHG2saFwqF3aXpwWlXuUins=