From 45dc4bb7e32d7ca0bb809f224b5a8a8f11589846 Mon Sep 17 00:00:00 2001 From: raghavTayal Date: Mon, 20 Feb 2023 11:17:51 +0530 Subject: [PATCH 1/2] updated hystrix-go --- go.mod | 3 +-- go.sum | 7 ++----- hystrix/hystrix_client.go | 6 +++--- hystrix/options.go | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 57b691f..8cf8576 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,10 @@ go 1.14 require ( github.com/DataDog/datadog-go v3.7.1+incompatible // indirect - github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c // indirect github.com/gojek/valkyrie v0.0.0-20180215180059-6aee720afcdf github.com/pkg/errors v0.9.1 - github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/raghavTayal/hystrix-go v0.0.0-20230220053637-c02aa80a8548 github.com/smartystreets/goconvey v1.6.4 // indirect github.com/stretchr/objx v0.3.0 // indirect github.com/stretchr/testify v1.3.0 diff --git a/go.sum b/go.sum index 953d375..d98c94c 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,7 @@ github.com/DataDog/datadog-go v3.7.1+incompatible h1:HmA9qHVrHIAqpSvoCYJ+c6qst0lgqEhNW6/KwfkHbS8= github.com/DataDog/datadog-go v3.7.1+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 h1:rFw4nCn9iMW+Vajsk51NtYIcwSTkXr+JGrMd36kTDJw= -github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c h1:HIGF0r/56+7fuIZw2V4isE22MK6xpxWx7BbV8dJ290w= github.com/cactus/go-statsd-client/statsd v0.0.0-20200423205355-cb0885a1018c/go.mod h1:l/bIBLeOl9eX+wxJAzxS4TveKRtAqlyDpHjhkfO0MEI= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -18,8 +15,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/raghavTayal/hystrix-go v0.0.0-20230220053637-c02aa80a8548 h1:8oWV7LuMdSxN9B8f4nkRTqu7xcsMvvabqnjcA88EIXo= +github.com/raghavTayal/hystrix-go v0.0.0-20230220053637-c02aa80a8548/go.mod h1:psFjOB6pLiSYeF5UyzWEOokoyTl+BvKxhal7O7ZiVY8= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= diff --git a/hystrix/hystrix_client.go b/hystrix/hystrix_client.go index 563aa7c..dd36b42 100644 --- a/hystrix/hystrix_client.go +++ b/hystrix/hystrix_client.go @@ -7,12 +7,12 @@ import ( "net/http" "time" - "github.com/afex/hystrix-go/hystrix" - metricCollector "github.com/afex/hystrix-go/hystrix/metric_collector" - "github.com/afex/hystrix-go/plugins" "github.com/gojek/heimdall/v7" "github.com/gojek/heimdall/v7/httpclient" "github.com/pkg/errors" + "github.com/raghavTayal/hystrix-go/hystrix" + metricCollector "github.com/raghavTayal/hystrix-go/hystrix/metric_collector" + "github.com/raghavTayal/hystrix-go/plugins" ) type fallbackFunc func(error) error diff --git a/hystrix/options.go b/hystrix/options.go index d5f5639..8e9fe0a 100644 --- a/hystrix/options.go +++ b/hystrix/options.go @@ -3,9 +3,9 @@ package hystrix import ( "time" - "github.com/afex/hystrix-go/plugins" "github.com/gojek/heimdall/v7" "github.com/gojek/heimdall/v7/httpclient" + "github.com/raghavTayal/hystrix-go/plugins" ) // Option represents the hystrix client options From d47aabc8ed5379733e3959c78ce5d6b7e055fb3e Mon Sep 17 00:00:00 2001 From: raghavTayal Date: Mon, 20 Feb 2023 11:36:41 +0530 Subject: [PATCH 2/2] updated go module --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8cf8576..491e6fc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gojek/heimdall/v7 +module github.com/raghavTayal/heimdall/v7 go 1.14