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

Commit 2a66d06

Browse files
author
JBD
authored
Move plugin/grpc to plugin/ocgrpc (#434)
Due to the conflict between the gRPC Go package and this plugin package name, rename the package.
1 parent 522b0ff commit 2a66d06

21 files changed

+20
-20
lines changed

examples/grpc/helloworld_client/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"go.opencensus.io/examples/grpc/exporter"
2424
pb "go.opencensus.io/examples/grpc/proto"
25-
ocgrpc "go.opencensus.io/plugin/grpc"
26-
"go.opencensus.io/plugin/grpc/grpcstats"
25+
"go.opencensus.io/plugin/ocgrpc"
26+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
2727
"go.opencensus.io/stats/view"
2828
"go.opencensus.io/zpages"
2929
"golang.org/x/net/context"

examples/grpc/helloworld_server/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"go.opencensus.io/examples/grpc/exporter"
2525
pb "go.opencensus.io/examples/grpc/proto"
26-
ocgrpc "go.opencensus.io/plugin/grpc"
27-
"go.opencensus.io/plugin/grpc/grpcstats"
26+
"go.opencensus.io/plugin/ocgrpc"
27+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
2828
"go.opencensus.io/stats/view"
2929
"go.opencensus.io/zpages"
3030
"golang.org/x/net/context"

plugin/grpc/example_test.go plugin/ocgrpc/example_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package grpc_test
15+
package ocgrpc_test
1616

1717
import (
1818
"log"
1919

20-
ocgrpc "go.opencensus.io/plugin/grpc"
21-
"go.opencensus.io/plugin/grpc/grpcstats"
20+
"go.opencensus.io/plugin/ocgrpc"
21+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
2222
"google.golang.org/grpc"
2323
)
2424

plugin/grpc/grpc.go plugin/ocgrpc/grpc.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// Package grpc contains OpenCensus stats and trace
15+
// Package ocgrpc contains OpenCensus stats and trace
1616
// integrations with gRPC.
17-
package grpc
17+
package ocgrpc // import "go.opencensus.io/plugin/ocgrpc"
1818

1919
import (
2020
"golang.org/x/net/context"
2121

22-
"go.opencensus.io/plugin/grpc/grpcstats"
23-
"go.opencensus.io/plugin/grpc/grpctrace"
22+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
23+
"go.opencensus.io/plugin/ocgrpc/grpctrace"
2424

2525
"google.golang.org/grpc/stats"
2626
)

plugin/grpc/grpc_test.go plugin/ocgrpc/grpc_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
package grpc
15+
package ocgrpc
1616

1717
import (
1818
"testing"
1919
"time"
2020

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

23-
"go.opencensus.io/plugin/grpc/grpcstats"
23+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
2424
"go.opencensus.io/trace"
2525

2626
"google.golang.org/grpc/stats"

plugin/grpc/grpcstats/example_test.go plugin/ocgrpc/grpcstats/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package grpcstats_test
1717
import (
1818
"log"
1919

20-
"go.opencensus.io/plugin/grpc/grpcstats"
20+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
2121
"google.golang.org/grpc"
2222
)
2323

plugin/grpc/grpcstats/grpcstats.go plugin/ocgrpc/grpcstats/grpcstats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//
1515

1616
// Package grpcstats provides OpenCensus stats support for gRPC clients and servers.
17-
package grpcstats // import "go.opencensus.io/plugin/grpc/grpcstats"
17+
package grpcstats // import "go.opencensus.io/plugin/ocgrpc/grpcstats"
1818

1919
import (
2020
"log"

plugin/grpc/grpctrace/example_test.go plugin/ocgrpc/grpctrace/example_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package grpctrace_test
1717
import (
1818
"log"
1919

20-
"go.opencensus.io/plugin/grpc/grpctrace"
20+
"go.opencensus.io/plugin/ocgrpc/grpctrace"
2121
"google.golang.org/grpc"
2222
)
2323

plugin/grpc/grpctrace/grpc.go plugin/ocgrpc/grpctrace/grpc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
// Package grpctrace is a package to assist with tracing incoming and outgoing gRPC requests.
16-
package grpctrace
16+
package grpctrace // import "go.opencensus.io/plugin/ocgrpc/grpctrace"
1717

1818
import (
1919
"strings"

plugin/grpc/grpctrace/grpc_test.go plugin/ocgrpc/grpctrace/grpc_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"testing"
2222
"time"
2323

24-
"go.opencensus.io/plugin/grpc/grpctrace"
25-
testpb "go.opencensus.io/plugin/grpc/grpctrace/testdata"
24+
"go.opencensus.io/plugin/ocgrpc/grpctrace"
25+
testpb "go.opencensus.io/plugin/ocgrpc/grpctrace/testdata"
2626
"go.opencensus.io/trace"
2727
"golang.org/x/net/context"
2828
"google.golang.org/grpc"

zpages/rpcz.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"time"
2828

2929
"go.opencensus.io/internal"
30-
"go.opencensus.io/plugin/grpc/grpcstats"
30+
"go.opencensus.io/plugin/ocgrpc/grpcstats"
3131
"go.opencensus.io/stats/view"
3232
)
3333

0 commit comments

Comments
 (0)