Replace use of golang.org/x/net/context with context

grafana · Aug 3, 2023 · 2ea3a37 · 2ea3a37
1 parent cf8bdc1
commit 2ea3a37
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 29 deletions.
diff --git a/httpgrpc/server/server.go b/httpgrpc/server/server.go
@@ -6,6 +6,7 @@ package server
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -17,7 +18,6 @@ import (
 	otgrpc "github.com/opentracing-contrib/go-grpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/sercand/kuberesolver/v4"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 

diff --git a/instrument/instrument.go b/instrument/instrument.go
@@ -12,7 +12,6 @@ import (
 	"github.com/opentracing/opentracing-go/ext"
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/prometheus/client_golang/prometheus"
-	oldcontext "golang.org/x/net/context"
 
 	"github.com/grafana/dskit/grpcutil"
 	"github.com/grafana/dskit/tracing"
@@ -189,21 +188,3 @@ func ErrorCode(err error) string {
 	}
 	return "500"
 }
-
-// TimeRequestHistogram runs 'f' and records how long it took in the given Prometheus
-// histogram metric. If 'f' returns successfully, record a "200". Otherwise, record
-// "500".  It will also emit an OpenTracing span if you have a global tracer configured.
-//
-// Deprecated: Use CollectedRequest()
-func TimeRequestHistogram(ctx oldcontext.Context, method string, metric *prometheus.HistogramVec, f func(context.Context) error) error {
-	return CollectedRequest(ctx, method, NewHistogramCollector(metric), ErrorCode, f)
-}
-
-// TimeRequestHistogramStatus runs 'f' and records how long it took in the given Prometheus
-// histogram metric. If 'f' returns successfully, record a "200". Otherwise, record
-// "500".  It will also emit an OpenTracing span if you have a global tracer configured.
-//
-// Deprecated: Use CollectedRequest()
-func TimeRequestHistogramStatus(ctx oldcontext.Context, method string, metric *prometheus.HistogramVec, toStatusCode func(error) string, f func(context.Context) error) error {
-	return CollectedRequest(ctx, method, NewHistogramCollector(metric), toStatusCode, f)
-}
diff --git a/middleware/grpc_auth.go b/middleware/grpc_auth.go
@@ -5,7 +5,8 @@
 package middleware
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/grpc"
 
 	"github.com/grafana/dskit/user"

diff --git a/middleware/grpc_logging.go b/middleware/grpc_logging.go
@@ -5,10 +5,10 @@
 package middleware
 
 import (
+	"context"
 	"errors"
 	"time"
 
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
 	grpcUtils "github.com/grafana/dskit/grpcutil"

diff --git a/server/server.go b/server/server.go
@@ -5,6 +5,7 @@
 package server
 
 import (
+	"context"
 	"crypto/tls"
 	"flag"
 	"fmt"
@@ -22,7 +23,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/exporter-toolkit/web"
 	"github.com/soheilhy/cmux"
-	"golang.org/x/net/context"
 	"golang.org/x/net/netutil"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"

diff --git a/server/server_test.go b/server/server_test.go
@@ -6,6 +6,7 @@ package server
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"crypto/x509"
 	"errors"
@@ -28,7 +29,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 
 	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/log"

diff --git a/user/grpc.go b/user/grpc.go
@@ -5,7 +5,8 @@
 package user
 
 import (
-	"golang.org/x/net/context"
+	"context"
+
 	"google.golang.org/grpc/metadata"
 )
 

diff --git a/user/http.go b/user/http.go
@@ -5,9 +5,8 @@
 package user
 
 import (
+	"context"
 	"net/http"
-
-	"golang.org/x/net/context"
 )
 
 const (

diff --git a/user/id.go b/user/id.go
@@ -5,7 +5,7 @@
 package user
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/grafana/dskit/errors"
 )

diff --git a/user/logging.go b/user/logging.go
@@ -5,7 +5,7 @@
 package user
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	"github.com/grafana/dskit/log"
 )