Split default client and server views for the HTTP plugin (#601)

Author: rakyll

plugin/ocgrpc/client_metrics.go

@@ -87,17 +87,15 @@ var (
 	}
 )
 
-// All the default client views provided by this package:
-var (
-	DefaultClientViews = []*view.View{
-		ClientErrorCountView,
-		ClientRoundTripLatencyView,
-		ClientRequestBytesView,
-		ClientResponseBytesView,
-		ClientRequestCountView,
-		ClientResponseCountView,
-	}
-)
+// DefaultClientViews are the default client views provided by this package.
+var DefaultClientViews = []*view.View{
+	ClientErrorCountView,
+	ClientRoundTripLatencyView,
+	ClientRequestBytesView,
+	ClientResponseBytesView,
+	ClientRequestCountView,
+	ClientResponseCountView,
+}
 
 // TODO(jbd): Add roundtrip_latency, uncompressed_request_bytes, uncompressed_response_bytes, request_count, response_count.
 // TODO(acetechnologist): This is temporary and will need to be replaced by a

plugin/ocgrpc/server_metrics.go

@@ -91,16 +91,14 @@ var (
 	}
 )
 
-// All default server views provided by this package:
-var (
-	DefaultServerViews = []*view.View{
-		ServerErrorCountView,
-		ServerServerElapsedTimeView,
-		ServerRequestBytesView,
-		ServerResponseBytesView,
-		ServerRequestCountView,
-		ServerResponseCountView,
-	}
-)
+// DefaultServerViews are the default server views provided by this package.
+var DefaultServerViews = []*view.View{
+	ServerErrorCountView,
+	ServerServerElapsedTimeView,
+	ServerRequestBytesView,
+	ServerResponseBytesView,
+	ServerRequestCountView,
+	ServerResponseCountView,
+}
 
 // TODO(jbd): Add roundtrip_latency, uncompressed_request_bytes, uncompressed_response_bytes, request_count, response_count.

plugin/ochttp/client_test.go

@@ -36,7 +36,7 @@ func TestClient(t *testing.T) {
 	}))
 	defer server.Close()
 
-	for _, v := range ochttp.DefaultViews {
+	for _, v := range ochttp.DefaultClientViews {
 		v.Subscribe()
 	}
 

plugin/ochttp/server_test.go

@@ -26,7 +26,7 @@ func updateMean(mean float64, sample, count int) float64 {
 }
 
 func TestHandlerStatsCollection(t *testing.T) {
-	for _, v := range DefaultViews {
+	for _, v := range DefaultServerViews {
 		v.Subscribe()
 	}
 

plugin/ochttp/stats.go

@@ -150,19 +150,24 @@ var (
 		Measure:     ServerLatency,
 		Aggregation: view.CountAggregation{},
 	}
-
-	DefaultViews = []*view.View{
-		ClientRequestCountView,
-		ClientRequestBytesView,
-		ClientResponseBytesView,
-		ClientLatencyView,
-		ClientRequestCountByMethod,
-		ClientResponseCountByStatusCode,
-		ServerRequestCountView,
-		ServerRequestBytesView,
-		ServerResponseBytesView,
-		ServerLatencyView,
-		ServerRequestCountByMethod,
-		ServerResponseCountByStatusCode,
-	}
 )
+
+// DefaultClientViews are the default client views provided by this package.
+var DefaultClientViews = []*view.View{
+	ClientRequestCountView,
+	ClientRequestBytesView,
+	ClientResponseBytesView,
+	ClientLatencyView,
+	ClientRequestCountByMethod,
+	ClientResponseCountByStatusCode,
+}
+
+// DefaultServerViews are the default server views provided by this package.
+var DefaultServerViews = []*view.View{
+	ServerRequestCountView,
+	ServerRequestBytesView,
+	ServerResponseBytesView,
+	ServerLatencyView,
+	ServerRequestCountByMethod,
+	ServerResponseCountByStatusCode,
+}