use context over golang.org/x/net/context

pkg/api/login_oauth.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"crypto/rand"
 	"crypto/tls"
 	"crypto/x509"
@@ -11,7 +12,6 @@ import (
 	"net/http"
 	"net/url"
 
-	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/bus"

pkg/metrics/graphitebridge/graphite.go

@@ -26,9 +26,10 @@ import (
 	"strings"
 	"time"
 
+	"context"
+
 	"github.com/prometheus/common/expfmt"
 	"github.com/prometheus/common/model"
-	"golang.org/x/net/context"
 
 	dto "github.com/prometheus/client_model/go"
 

pkg/plugins/datasource/tsdb/datasource_plugin_wrapper.go

@@ -1,13 +1,14 @@
 package tsdb
 
 import (
+	"context"
 	"fmt"
+
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
 	proto "github.com/grafana/grafana/pkg/tsdb/models"
-	"golang.org/x/net/context"
 )
 
 func NewDatasourcePluginWrapper(log log.Logger, plugin TsdbPlugin) *DatasourcePluginWrapper {

pkg/plugins/datasource/tsdb/grpc.go

@@ -1,8 +1,9 @@
 package tsdb
 
 import (
+	"context"
+
 	proto "github.com/grafana/grafana/pkg/tsdb/models"
-	"golang.org/x/net/context"
 )
 
 type GRPCClient struct {

pkg/plugins/datasource/tsdb/interface.go

@@ -1,7 +1,7 @@
 package tsdb
 
 import (
-	"golang.org/x/net/context"
+	"context"
 
 	proto "github.com/grafana/grafana/pkg/tsdb/models"
 	plugin "github.com/hashicorp/go-plugin"

pkg/social/social.go

@@ -4,7 +4,8 @@ import (
 	"net/http"
 	"strings"
 
-	"golang.org/x/net/context"
+	"context"
+
 	"golang.org/x/oauth2"
 
 	"github.com/grafana/grafana/pkg/setting"