change log package references to grpc/log

benchmark/benchmark.go

@@ -38,7 +38,6 @@ package benchmark
 
 import (
 	"io"
-	"log"
 	"math"
 	"net"
 	"time"
@@ -47,6 +46,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	testpb "google.golang.org/grpc/interop/grpc_testing"
+	"google.golang.org/grpc/log"
 )
 
 func newPayload(t testpb.PayloadType, size int) *testpb.Payload {

benchmark/client/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"log"
 	"math"
 	"net"
 	"net/http"
@@ -13,6 +12,7 @@ import (
 	"google.golang.org/grpc/benchmark"
 	"google.golang.org/grpc/benchmark/stats"
 	testpb "google.golang.org/grpc/interop/grpc_testing"
+	"google.golang.org/grpc/log"
 )
 
 var (

benchmark/server/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"log"
 	"math"
 	"net"
 	"net/http"
@@ -10,6 +9,7 @@ import (
 	"time"
 
 	"google.golang.org/grpc/benchmark"
+	"google.golang.org/grpc/log"
 )
 
 var (

clientconn.go

@@ -35,7 +35,6 @@ package grpc
 
 import (
 	"errors"
-	"log"
 	"net"
 	"strings"
 	"sync"
@@ -43,6 +42,7 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/transport"
 )
 

examples/route_guide/client/client.go

@@ -40,7 +40,6 @@ package main
 import (
 	"flag"
 	"io"
-	"log"
 	"math/rand"
 	"time"
 
@@ -48,6 +47,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	pb "google.golang.org/grpc/examples/route_guide/proto"
+	"google.golang.org/grpc/log"
 )
 
 var (

examples/route_guide/server/server.go

@@ -43,7 +43,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"math"
 	"net"
 	"time"
@@ -52,6 +51,7 @@ import (
 	"google.golang.org/grpc"
 
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/log"
 
 	proto "github.com/golang/protobuf/proto"
 

interop/client/client.go

@@ -37,7 +37,6 @@ import (
 	"flag"
 	"io"
 	"io/ioutil"
-	"log"
 	"net"
 	"strconv"
 	"strings"
@@ -48,6 +47,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
 	testpb "google.golang.org/grpc/interop/grpc_testing"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/metadata"
 )
 

interop/server/server.go

@@ -37,7 +37,6 @@ import (
 	"flag"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"strconv"
 	"time"
@@ -47,6 +46,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	testpb "google.golang.org/grpc/interop/grpc_testing"
+	"google.golang.org/grpc/log"
 )
 
 var (

server.go

@@ -37,7 +37,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"reflect"
 	"strings"
@@ -45,6 +44,7 @@ import (
 
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/transport"
 )

test/end2end_test.go

@@ -36,7 +36,6 @@ package grpc_test
 import (
 	"fmt"
 	"io"
-	"log"
 	"math"
 	"net"
 	"reflect"
@@ -51,6 +50,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/metadata"
 	testpb "google.golang.org/grpc/test/grpc_testing"
 )

transport/http2_client.go

@@ -37,7 +37,6 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"log"
 	"math"
 	"net"
 	"sync"
@@ -48,6 +47,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/metadata"
 )
 

transport/http2_server.go

@@ -37,7 +37,6 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"log"
 	"math"
 	"net"
 	"strconv"
@@ -47,6 +46,7 @@ import (
 	"github.com/bradfitz/http2/hpack"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/metadata"
 )
 

transport/http_util.go

@@ -37,7 +37,6 @@ import (
 	"bufio"
 	"fmt"
 	"io"
-	"log"
 	"net"
 	"strconv"
 	"sync/atomic"
@@ -46,6 +45,7 @@ import (
 	"github.com/bradfitz/http2"
 	"github.com/bradfitz/http2/hpack"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/log"
 	"google.golang.org/grpc/metadata"
 )
 

transport/transport_test.go

@@ -36,7 +36,6 @@ package transport
 import (
 	"bytes"
 	"io"
-	"log"
 	"math"
 	"net"
 	"reflect"
@@ -49,6 +48,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/log"
 )
 
 type server struct {