Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

Replace "x/net/context" import with "context" #1138

Merged
merged 2 commits into from
May 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/grpc/helloworld_client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"os"
"time"

"context"
"go.opencensus.io/examples/exporter"
pb "go.opencensus.io/examples/grpc/proto"
"go.opencensus.io/plugin/ocgrpc"
"go.opencensus.io/stats/view"
"golang.org/x/net/context"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion examples/grpc/helloworld_server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"net/http"
"time"

"context"
"go.opencensus.io/examples/exporter"
pb "go.opencensus.io/examples/grpc/proto"
"go.opencensus.io/plugin/ocgrpc"
"go.opencensus.io/stats/view"
"go.opencensus.io/trace"
"go.opencensus.io/zpages"
"golang.org/x/net/context"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package ocgrpc

import (
"context"
"go.opencensus.io/trace"
"golang.org/x/net/context"

"google.golang.org/grpc/stats"
)
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/client_stats_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package ocgrpc
import (
"time"

"context"
"go.opencensus.io/tag"
"golang.org/x/net/context"
"google.golang.org/grpc/grpclog"
"google.golang.org/grpc/stats"
)
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/client_stats_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"golang.org/x/net/context"
"context"

"go.opencensus.io/metric/metricdata"
"go.opencensus.io/stats/view"
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/grpc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

"context"
"go.opencensus.io/stats/view"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"

"go.opencensus.io/trace"
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package ocgrpc

import (
"context"
"go.opencensus.io/trace"
"golang.org/x/net/context"

"google.golang.org/grpc/stats"
)
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/server_stats_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package ocgrpc
import (
"time"

"golang.org/x/net/context"
"context"

"go.opencensus.io/tag"
"google.golang.org/grpc/grpclog"
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/server_stats_handler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"reflect"
"testing"

"context"
"go.opencensus.io/trace"
"golang.org/x/net/context"

"go.opencensus.io/metric/metricdata"
"go.opencensus.io/stats/view"
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/trace_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (

"google.golang.org/grpc/codes"

"context"
"go.opencensus.io/trace"
"go.opencensus.io/trace/propagation"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/stats"
"google.golang.org/grpc/status"
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/trace_common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package ocgrpc
import (
"testing"

"context"
"go.opencensus.io/trace"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
"google.golang.org/grpc/stats"
)
Expand Down
2 changes: 1 addition & 1 deletion plugin/ocgrpc/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"testing"
"time"

"context"
"go.opencensus.io/internal/testpb"
"go.opencensus.io/trace"
"golang.org/x/net/context"
)

type testExporter struct {
Expand Down
2 changes: 1 addition & 1 deletion trace/examples_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package trace_test
import (
"fmt"

"context"
"go.opencensus.io/trace"
"golang.org/x/net/context"
)

// This example shows how to use StartSpan and (*Span).End to capture
Expand Down