tracing: google grpc service support for ocagent/opencensus (#9955)

Signed-off-by: michael.wozniak <michael.wozniak@snapchat.com>

Mirrored from https://github.com/envoyproxy/envoy @ 4423dcd8528d65a2f6aa919e89301efddd53e8f2

envoy/config/trace/v2/trace.proto

@@ -142,7 +142,7 @@ message DatadogConfig {
 }
 
 // Configuration for the OpenCensus tracer.
-// [#next-free-field: 14]
+// [#next-free-field: 15]
 // [#extension: envoy.tracers.opencensus]
 message OpenCensusConfig {
   enum TraceContext {
@@ -196,14 +196,19 @@ message OpenCensusConfig {
   // The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans"
   string zipkin_url = 6;
 
-  // Enables the OpenCensus Agent exporter if set to true. The address must also
-  // be set.
+  // Enables the OpenCensus Agent exporter if set to true. The ocagent_address or
+  // ocagent_grpc_service must also be set.
   bool ocagent_exporter_enabled = 11;
 
   // The address of the OpenCensus Agent, if its exporter is enabled, in gRPC
   // format: https://github.com/grpc/grpc/blob/master/doc/naming.md
+  // [#comment:TODO: deprecate this field]
   string ocagent_address = 12;
 
+  // (optional) The gRPC server hosted by the OpenCensus Agent. Only Google gRPC is supported.
+  // This is only used if the ocagent_address is left empty.
+  api.v2.core.GrpcService ocagent_grpc_service = 14;
+
   // List of incoming trace context headers we will accept. First one found
   // wins.
   repeated TraceContext incoming_trace_context = 8;

envoy/config/trace/v3/trace.proto

@@ -162,7 +162,7 @@ message DatadogConfig {
 }
 
 // Configuration for the OpenCensus tracer.
-// [#next-free-field: 14]
+// [#next-free-field: 15]
 // [#extension: envoy.tracers.opencensus]
 message OpenCensusConfig {
   option (udpa.annotations.versioning).previous_message_type =
@@ -219,14 +219,19 @@ message OpenCensusConfig {
   // The URL to Zipkin, e.g. "http://127.0.0.1:9411/api/v2/spans"
   string zipkin_url = 6;
 
-  // Enables the OpenCensus Agent exporter if set to true. The address must also
-  // be set.
+  // Enables the OpenCensus Agent exporter if set to true. The ocagent_address or
+  // ocagent_grpc_service must also be set.
   bool ocagent_exporter_enabled = 11;
 
   // The address of the OpenCensus Agent, if its exporter is enabled, in gRPC
   // format: https://github.com/grpc/grpc/blob/master/doc/naming.md
+  // [#comment:TODO: deprecate this field]
   string ocagent_address = 12;
 
+  // (optional) The gRPC server hosted by the OpenCensus Agent. Only Google gRPC is supported.
+  // This is only used if the ocagent_address is left empty.
+  core.v3.GrpcService ocagent_grpc_service = 14;
+
   // List of incoming trace context headers we will accept. First one found
   // wins.
   repeated TraceContext incoming_trace_context = 8;