From 15da21f1e4581dc21b9c5a795d7c06a565eb2bc5 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Tue, 9 Apr 2019 15:10:51 +0200 Subject: [PATCH] *: replace golang.org/x/net/context by context The context package is available since Go 1.7 which is the minimal version supported by client_golang. Signed-off-by: Simon Pasquier --- go.mod | 1 - go.sum | 2 -- prometheus/graphite/bridge.go | 2 +- prometheus/graphite/bridge_test.go | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 0c16bac..a8ca63c 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,5 @@ require ( github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f github.com/prometheus/common v0.2.0 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 - golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect ) diff --git a/go.sum b/go.sum index 3ee56ae..003625a 100644 --- a/go.sum +++ b/go.sum @@ -32,8 +32,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3 h1:ulvT7fqt0yHWzpJwI57MezWnYDVpCAYBVuYst/L+fAY= -golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= diff --git a/prometheus/graphite/bridge.go b/prometheus/graphite/bridge.go index 466e229..43bfd8d 100644 --- a/prometheus/graphite/bridge.go +++ b/prometheus/graphite/bridge.go @@ -17,6 +17,7 @@ package graphite import ( "bufio" + "context" "errors" "fmt" "io" @@ -26,7 +27,6 @@ import ( "github.com/prometheus/common/expfmt" "github.com/prometheus/common/model" - "golang.org/x/net/context" dto "github.com/prometheus/client_model/go" diff --git a/prometheus/graphite/bridge_test.go b/prometheus/graphite/bridge_test.go index 471edfe..7728d05 100644 --- a/prometheus/graphite/bridge_test.go +++ b/prometheus/graphite/bridge_test.go @@ -16,6 +16,7 @@ package graphite import ( "bufio" "bytes" + "context" "fmt" "io" "log" @@ -26,7 +27,6 @@ import ( "time" "github.com/prometheus/common/model" - "golang.org/x/net/context" "github.com/prometheus/client_golang/prometheus" )