From 4e513dbead497839af168efcdf9ba7ff18d10f10 Mon Sep 17 00:00:00 2001
From: Caleb Gilmour <caleb.gilmour@datadoghq.com>
Date: Mon, 18 Mar 2019 02:56:13 +0000
Subject: [PATCH] Add Datadog tracing to proxy config

Signed-off-by: Caleb Gilmour <caleb.gilmour@datadoghq.com>
---
 mesh/v1alpha1/istio.mesh.v1alpha1.pb.html   |  34 +-
 mesh/v1alpha1/proxy.pb.go                   | 407 ++++++++++++++++----
 mesh/v1alpha1/proxy.proto                   |   8 +
 proto.lock                                  |  15 +
 python/istio_api/mesh/v1alpha1/proxy_pb2.py |  76 +++-
 5 files changed, 459 insertions(+), 81 deletions(-)

diff --git a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
index 150a426ec9..5f14da296e 100644
--- a/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
+++ b/mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
@@ -4,7 +4,7 @@
 location: https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html
 layout: protoc-gen-docs
 generator: protoc-gen-docs
-number_of_entries: 19
+number_of_entries: 20
 ---
 <p>Configuration affecting the service mesh as a whole.</p>
 
@@ -1052,6 +1052,38 @@ <h2 id="Tracing">Tracing</h2>
 <td>
 <p>Use a LightStep tracer.</p>
 
+</td>
+</tr>
+<tr id="Tracing-datadog" class="oneof">
+<td><code>datadog</code></td>
+<td><code><a href="#Tracing-Datadog">Tracing.Datadog (oneof)</a></code></td>
+<td>
+<p>Use a Datadog tracer.</p>
+
+</td>
+</tr>
+</tbody>
+</table>
+</section>
+<h2 id="Tracing-Datadog">Tracing.Datadog</h2>
+<section>
+<p>Datadog defines configuration for a Datadog tracer.</p>
+
+<table class="message-fields">
+<thead>
+<tr>
+<th>Field</th>
+<th>Type</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr id="Tracing-Datadog-address">
+<td><code>address</code></td>
+<td><code>string</code></td>
+<td>
+<p>Address of the Datadog Agent.</p>
+
 </td>
 </tr>
 </tbody>
diff --git a/mesh/v1alpha1/proxy.pb.go b/mesh/v1alpha1/proxy.pb.go
index 10950ac4c8..9b935085fc 100644
--- a/mesh/v1alpha1/proxy.pb.go
+++ b/mesh/v1alpha1/proxy.pb.go
@@ -99,6 +99,7 @@ type Tracing struct {
 	// Types that are valid to be assigned to Tracer:
 	//	*Tracing_Zipkin_
 	//	*Tracing_Lightstep_
+	//	*Tracing_Datadog_
 	Tracer               isTracing_Tracer `protobuf_oneof:"tracer"`
 	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
 	XXX_unrecognized     []byte           `json:"-"`
@@ -150,9 +151,13 @@ type Tracing_Zipkin_ struct {
 type Tracing_Lightstep_ struct {
 	Lightstep *Tracing_Lightstep `protobuf:"bytes,2,opt,name=lightstep,proto3,oneof"`
 }
+type Tracing_Datadog_ struct {
+	Datadog *Tracing_Datadog `protobuf:"bytes,3,opt,name=datadog,proto3,oneof"`
+}
 
 func (*Tracing_Zipkin_) isTracing_Tracer()    {}
 func (*Tracing_Lightstep_) isTracing_Tracer() {}
+func (*Tracing_Datadog_) isTracing_Tracer()   {}
 
 func (m *Tracing) GetTracer() isTracing_Tracer {
 	if m != nil {
@@ -175,11 +180,19 @@ func (m *Tracing) GetLightstep() *Tracing_Lightstep {
 	return nil
 }
 
+func (m *Tracing) GetDatadog() *Tracing_Datadog {
+	if x, ok := m.GetTracer().(*Tracing_Datadog_); ok {
+		return x.Datadog
+	}
+	return nil
+}
+
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*Tracing) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _Tracing_OneofMarshaler, _Tracing_OneofUnmarshaler, _Tracing_OneofSizer, []interface{}{
 		(*Tracing_Zipkin_)(nil),
 		(*Tracing_Lightstep_)(nil),
+		(*Tracing_Datadog_)(nil),
 	}
 }
 
@@ -197,6 +210,11 @@ func _Tracing_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		if err := b.EncodeMessage(x.Lightstep); err != nil {
 			return err
 		}
+	case *Tracing_Datadog_:
+		_ = b.EncodeVarint(3<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.Datadog); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("Tracing.Tracer has unexpected type %T", x)
@@ -223,6 +241,14 @@ func _Tracing_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer
 		err := b.DecodeMessage(msg)
 		m.Tracer = &Tracing_Lightstep_{msg}
 		return true, err
+	case 3: // tracer.datadog
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(Tracing_Datadog)
+		err := b.DecodeMessage(msg)
+		m.Tracer = &Tracing_Datadog_{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -242,6 +268,11 @@ func _Tracing_OneofSizer(msg proto.Message) (n int) {
 		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
+	case *Tracing_Datadog_:
+		s := proto.Size(x.Datadog)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -374,6 +405,55 @@ func (m *Tracing_Lightstep) GetCacertPath() string {
 	return ""
 }
 
+// Datadog defines configuration for a Datadog tracer.
+type Tracing_Datadog struct {
+	// Address of the Datadog Agent.
+	Address              string   `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Tracing_Datadog) Reset()         { *m = Tracing_Datadog{} }
+func (m *Tracing_Datadog) String() string { return proto.CompactTextString(m) }
+func (*Tracing_Datadog) ProtoMessage()    {}
+func (*Tracing_Datadog) Descriptor() ([]byte, []int) {
+	return fileDescriptor_5efecd978cf3d28d, []int{0, 2}
+}
+func (m *Tracing_Datadog) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *Tracing_Datadog) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	if deterministic {
+		return xxx_messageInfo_Tracing_Datadog.Marshal(b, m, deterministic)
+	} else {
+		b = b[:cap(b)]
+		n, err := m.MarshalTo(b)
+		if err != nil {
+			return nil, err
+		}
+		return b[:n], nil
+	}
+}
+func (m *Tracing_Datadog) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Tracing_Datadog.Merge(m, src)
+}
+func (m *Tracing_Datadog) XXX_Size() int {
+	return m.Size()
+}
+func (m *Tracing_Datadog) XXX_DiscardUnknown() {
+	xxx_messageInfo_Tracing_Datadog.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Tracing_Datadog proto.InternalMessageInfo
+
+func (m *Tracing_Datadog) GetAddress() string {
+	if m != nil {
+		return m.Address
+	}
+	return ""
+}
+
 // ProxyConfig defines variables for individual Envoy instances.
 type ProxyConfig struct {
 	// Path to the generated configuration file directory.
@@ -628,69 +708,72 @@ func init() {
 	proto.RegisterType((*Tracing)(nil), "istio.mesh.v1alpha1.Tracing")
 	proto.RegisterType((*Tracing_Zipkin)(nil), "istio.mesh.v1alpha1.Tracing.Zipkin")
 	proto.RegisterType((*Tracing_Lightstep)(nil), "istio.mesh.v1alpha1.Tracing.Lightstep")
+	proto.RegisterType((*Tracing_Datadog)(nil), "istio.mesh.v1alpha1.Tracing.Datadog")
 	proto.RegisterType((*ProxyConfig)(nil), "istio.mesh.v1alpha1.ProxyConfig")
 }
 
 func init() { proto.RegisterFile("mesh/v1alpha1/proxy.proto", fileDescriptor_5efecd978cf3d28d) }
 
 var fileDescriptor_5efecd978cf3d28d = []byte{
-	// 890 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5f, 0x6f, 0xe3, 0xc4,
-	0x17, 0xad, 0xfb, 0xdb, 0xcd, 0x9f, 0x9b, 0x36, 0x75, 0x67, 0xf7, 0xd7, 0x75, 0x23, 0x28, 0xa1,
-	0x48, 0x90, 0x05, 0xe4, 0x68, 0xbb, 0x12, 0xe2, 0x05, 0x44, 0xd2, 0x76, 0xd5, 0x48, 0x6d, 0x37,
-	0x72, 0x53, 0x09, 0xfa, 0x32, 0x9a, 0xd8, 0xb7, 0xf1, 0x68, 0x9d, 0x19, 0x6b, 0x3c, 0x0e, 0x64,
-	0xdf, 0xf8, 0x6a, 0x48, 0x48, 0x3c, 0xf2, 0x11, 0x50, 0x9f, 0xf8, 0x18, 0xc8, 0x33, 0x76, 0x36,
-	0xa0, 0xee, 0xf6, 0x2d, 0x73, 0xee, 0x39, 0x67, 0xee, 0x1f, 0xdf, 0x09, 0xec, 0xcf, 0x31, 0x8b,
-	0xfb, 0x8b, 0x17, 0x2c, 0x49, 0x63, 0xf6, 0xa2, 0x9f, 0x2a, 0xf9, 0xcb, 0xd2, 0x4f, 0x95, 0xd4,
-	0x92, 0x3c, 0xe1, 0x99, 0xe6, 0xd2, 0x2f, 0x08, 0x7e, 0x45, 0xe8, 0x1c, 0xcc, 0xa4, 0x9c, 0x25,
-	0xd8, 0x37, 0x94, 0x69, 0x7e, 0xdb, 0x8f, 0x72, 0xc5, 0x34, 0x97, 0xc2, 0x8a, 0x0e, 0x7f, 0xdb,
-	0x84, 0xfa, 0x44, 0xb1, 0x90, 0x8b, 0x19, 0xf9, 0x0e, 0x6a, 0x6f, 0x79, 0xfa, 0x86, 0x0b, 0xcf,
-	0xe9, 0x3a, 0xbd, 0xd6, 0xd1, 0x67, 0xfe, 0x3d, 0x8e, 0x7e, 0xc9, 0xf6, 0x6f, 0x0c, 0xf5, 0x6c,
-	0x23, 0x28, 0x45, 0xe4, 0x15, 0x34, 0x13, 0x3e, 0x8b, 0x75, 0xa6, 0x31, 0xf5, 0x36, 0x8d, 0xc3,
-	0xe7, 0x1f, 0x74, 0x38, 0xaf, 0xd8, 0x67, 0x1b, 0xc1, 0x3b, 0x69, 0xe7, 0x10, 0x6a, 0xd6, 0x9b,
-	0x78, 0x50, 0x67, 0x51, 0xa4, 0x30, 0xcb, 0x4c, 0x46, 0xcd, 0xa0, 0x3a, 0x76, 0x7e, 0x75, 0xa0,
-	0xb9, 0x92, 0xbf, 0x9f, 0x47, 0x3e, 0x85, 0x2d, 0x16, 0x86, 0x98, 0x65, 0x54, 0xcb, 0x37, 0x28,
-	0x4c, 0x5a, 0xcd, 0xa0, 0x65, 0xb1, 0x49, 0x01, 0x91, 0x3d, 0xa8, 0x65, 0x18, 0xe6, 0x0a, 0xbd,
-	0xff, 0x75, 0x9d, 0x5e, 0x23, 0x28, 0x4f, 0xe4, 0x13, 0x68, 0x85, 0x2c, 0x44, 0xa5, 0x69, 0xca,
-	0x74, 0xec, 0x3d, 0x32, 0x4a, 0xb0, 0xd0, 0x98, 0xe9, 0x78, 0xd8, 0x80, 0x9a, 0x56, 0xc5, 0xf1,
-	0xf0, 0xf7, 0x26, 0xb4, 0xc6, 0xc5, 0x24, 0x8e, 0xa5, 0xb8, 0xe5, 0x33, 0x23, 0x35, 0xbf, 0xac,
-	0xd4, 0x29, 0xa5, 0x06, 0x2a, 0xa4, 0x05, 0x61, 0xca, 0x05, 0x53, 0x4b, 0x4b, 0xb0, 0x59, 0x81,
-	0x85, 0x0c, 0xe1, 0x0b, 0xd8, 0xc9, 0x50, 0x2d, 0x78, 0x88, 0x34, 0x4c, 0xf2, 0x4c, 0xa3, 0x32,
-	0xd9, 0x35, 0x83, 0x76, 0x09, 0x1f, 0x5b, 0x94, 0xfc, 0x00, 0xed, 0x48, 0x31, 0x2e, 0x68, 0x35,
-	0x57, 0x93, 0x68, 0xeb, 0x68, 0xdf, 0xb7, 0x83, 0xf7, 0xab, 0xc1, 0xfb, 0x27, 0x25, 0x21, 0xd8,
-	0x36, 0x82, 0xea, 0x48, 0xae, 0xc0, 0x4b, 0x99, 0x42, 0xa1, 0x69, 0x16, 0xe7, 0x3a, 0x92, 0x3f,
-	0xaf, 0x79, 0x3d, 0x7e, 0xc8, 0x6b, 0xcf, 0x4a, 0xaf, 0x4a, 0xe5, 0xca, 0xf4, 0x2b, 0xd8, 0x8d,
-	0x78, 0x16, 0xca, 0x05, 0xaa, 0x25, 0xad, 0x66, 0x53, 0x33, 0x15, 0xb8, 0xab, 0xc0, 0xa0, 0x1c,
-	0xd2, 0x35, 0x3c, 0x7b, 0x47, 0x56, 0x78, 0xab, 0x30, 0x8b, 0x69, 0x84, 0x09, 0x5b, 0x7a, 0xf5,
-	0x07, 0x12, 0x18, 0x6e, 0x7a, 0x4e, 0xf0, 0xff, 0x95, 0x3a, 0xb0, 0xe2, 0x93, 0x42, 0x4b, 0x9e,
-	0x43, 0xdb, 0x7e, 0x99, 0xab, 0x04, 0x1a, 0x45, 0x02, 0x46, 0xb2, 0x6d, 0x23, 0x55, 0x06, 0x43,
-	0xd8, 0x09, 0xa5, 0x10, 0x18, 0x6a, 0xaa, 0xf9, 0x1c, 0x65, 0xae, 0xbd, 0xe6, 0x43, 0xa5, 0xb7,
-	0x4b, 0xc5, 0xc4, 0x0a, 0xc8, 0xd7, 0x40, 0x32, 0xcd, 0x74, 0x16, 0xd1, 0x3c, 0x4a, 0x57, 0x57,
-	0x82, 0xad, 0xd9, 0x46, 0xae, 0xa3, 0xb4, 0xba, 0x71, 0x00, 0x1f, 0xa3, 0x58, 0xc8, 0x25, 0x9d,
-	0xa3, 0x56, 0x3c, 0xcc, 0x68, 0x35, 0xee, 0x4a, 0xf8, 0xd4, 0x08, 0x3b, 0x86, 0x74, 0x61, 0x39,
-	0x57, 0x96, 0x52, 0x59, 0xf4, 0xc0, 0x35, 0xeb, 0x4f, 0x59, 0x34, 0xe7, 0x82, 0xa6, 0x52, 0x69,
-	0xaf, 0xd5, 0x75, 0x7a, 0x8f, 0x83, 0xb6, 0xc1, 0x07, 0x05, 0x3c, 0x96, 0x4a, 0x93, 0x3e, 0xec,
-	0xb2, 0x05, 0xe3, 0x09, 0x9b, 0xf2, 0x84, 0xeb, 0x25, 0x7d, 0x2b, 0x05, 0x7a, 0x5b, 0xab, 0x66,
-	0xb8, 0xeb, 0xc1, 0x1b, 0x29, 0x90, 0x44, 0xb0, 0x1f, 0x4a, 0xa1, 0x95, 0x4c, 0x68, 0x9a, 0x30,
-	0x81, 0x94, 0xe5, 0x3a, 0xa6, 0xa9, 0x4c, 0x78, 0xb8, 0xf4, 0xb6, 0xbb, 0x4e, 0xaf, 0x7d, 0xf4,
-	0xfc, 0xde, 0xd5, 0x1e, 0xe4, 0x3a, 0x46, 0xa1, 0x79, 0x68, 0x7a, 0x34, 0x36, 0x82, 0x60, 0xaf,
-	0xf4, 0x1a, 0x17, 0x56, 0x05, 0xc3, 0xe2, 0x45, 0xc7, 0xc2, 0x3c, 0xd3, 0x72, 0x4e, 0xcb, 0x6d,
-	0xb9, 0xe5, 0x09, 0x7a, 0x6d, 0xdb, 0x31, 0x1b, 0xb1, 0x0b, 0xf5, 0x8a, 0x27, 0x58, 0x94, 0x5b,
-	0x74, 0x91, 0x0a, 0x36, 0x47, 0x9a, 0xa0, 0x98, 0xe9, 0xd8, 0xdb, 0xb1, 0xe5, 0x16, 0xf8, 0x25,
-	0x9b, 0xe3, 0xb9, 0x41, 0x49, 0xd7, 0xac, 0x5f, 0x98, 0x2b, 0x85, 0x22, 0x5c, 0x7a, 0xae, 0x21,
-	0xad, 0x43, 0x45, 0xf7, 0x6d, 0xeb, 0xa6, 0x52, 0xea, 0x4c, 0x2b, 0x96, 0x52, 0x8d, 0xf3, 0x34,
-	0x61, 0x1a, 0xed, 0x46, 0xee, 0xda, 0xee, 0x1b, 0xd2, 0xb0, 0xe2, 0x4c, 0x4a, 0x8a, 0xd9, 0x50,
-	0x84, 0x5d, 0x2e, 0x34, 0xaa, 0x10, 0xd3, 0xa2, 0x54, 0x3a, 0x97, 0x11, 0x7a, 0xc4, 0xb4, 0xe6,
-	0xdb, 0x7b, 0x5b, 0xb3, 0xf6, 0x40, 0xf8, 0x23, 0x31, 0x95, 0xb9, 0x88, 0x46, 0x6b, 0x06, 0x17,
-	0x32, 0xc2, 0xc0, 0xe5, 0xff, 0x41, 0xc8, 0x37, 0x50, 0xd7, 0xf6, 0xb9, 0xf4, 0x9e, 0x98, 0x2f,
-	0xf2, 0xa3, 0x0f, 0x3d, 0xa9, 0x41, 0x45, 0x3e, 0x7c, 0x09, 0xcf, 0xde, 0x73, 0x09, 0xd9, 0x82,
-	0x46, 0x70, 0x7a, 0x32, 0x0a, 0x4e, 0x8f, 0x27, 0xee, 0x06, 0x01, 0xa8, 0x4d, 0xc6, 0xc1, 0xeb,
-	0x1f, 0x7f, 0x72, 0x9d, 0x2f, 0xbf, 0x87, 0xa7, 0xf7, 0x0d, 0x90, 0x34, 0xe0, 0xd1, 0xe5, 0xeb,
-	0xcb, 0x53, 0x77, 0x83, 0xb4, 0x01, 0x2e, 0xae, 0x27, 0xd7, 0x83, 0x73, 0x3a, 0x39, 0xbf, 0x72,
-	0x1d, 0xb2, 0x05, 0xf5, 0xd1, 0xe5, 0xd9, 0x69, 0x30, 0x9a, 0xb8, 0x7f, 0xd7, 0x87, 0xbd, 0x3f,
-	0xee, 0x0e, 0x9c, 0x3f, 0xef, 0x0e, 0x9c, 0xbf, 0xee, 0x0e, 0x9c, 0x9b, 0x8e, 0x4d, 0x94, 0xcb,
-	0x3e, 0x4b, 0x79, 0xff, 0x5f, 0xff, 0x5b, 0xd3, 0x9a, 0xd9, 0xa7, 0x97, 0xff, 0x04, 0x00, 0x00,
-	0xff, 0xff, 0x92, 0x7b, 0x1a, 0x92, 0xcf, 0x06, 0x00, 0x00,
+	// 919 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x5d, 0x6f, 0xdb, 0x36,
+	0x14, 0x8d, 0xfa, 0x61, 0xc7, 0xd7, 0x89, 0xa3, 0xb0, 0x5d, 0xaa, 0x18, 0x5b, 0x96, 0xa5, 0xc3,
+	0xe6, 0x6e, 0x83, 0x8c, 0xa6, 0xc0, 0xb0, 0x97, 0x0d, 0xb5, 0x93, 0x14, 0x31, 0x90, 0xa4, 0x86,
+	0xe2, 0x00, 0x5b, 0x5e, 0x08, 0x5a, 0xba, 0xb1, 0x88, 0xca, 0xa4, 0x40, 0x51, 0xde, 0xdc, 0xb7,
+	0xfd, 0x9c, 0xfd, 0x90, 0x01, 0x7b, 0xdc, 0x4f, 0x18, 0xf2, 0xb4, 0x9f, 0x31, 0x88, 0x94, 0x5c,
+	0xaf, 0xc8, 0xc7, 0x9b, 0x75, 0x78, 0xce, 0xe1, 0xbd, 0x87, 0xbc, 0x34, 0x6c, 0x4f, 0x31, 0x8b,
+	0xbb, 0xb3, 0x97, 0x2c, 0x49, 0x63, 0xf6, 0xb2, 0x9b, 0x2a, 0xf9, 0xdb, 0xdc, 0x4f, 0x95, 0xd4,
+	0x92, 0x3c, 0xe1, 0x99, 0xe6, 0xd2, 0x2f, 0x08, 0x7e, 0x45, 0x68, 0xef, 0x4c, 0xa4, 0x9c, 0x24,
+	0xd8, 0x35, 0x94, 0x71, 0x7e, 0xd5, 0x8d, 0x72, 0xc5, 0x34, 0x97, 0xc2, 0x8a, 0xf6, 0xfe, 0x78,
+	0x08, 0xf5, 0x91, 0x62, 0x21, 0x17, 0x13, 0xf2, 0x23, 0xd4, 0xde, 0xf3, 0xf4, 0x1d, 0x17, 0x9e,
+	0xb3, 0xeb, 0x74, 0x9a, 0xfb, 0xcf, 0xfd, 0x1b, 0x1c, 0xfd, 0x92, 0xed, 0x5f, 0x1a, 0xea, 0xf1,
+	0x4a, 0x50, 0x8a, 0xc8, 0x1b, 0x68, 0x24, 0x7c, 0x12, 0xeb, 0x4c, 0x63, 0xea, 0x3d, 0x30, 0x0e,
+	0x5f, 0xdd, 0xe9, 0x70, 0x52, 0xb1, 0x8f, 0x57, 0x82, 0x0f, 0x52, 0xf2, 0x1a, 0xea, 0x11, 0xd3,
+	0x2c, 0x92, 0x13, 0xef, 0xa1, 0x71, 0xf9, 0xf2, 0x4e, 0x97, 0x43, 0xcb, 0x3d, 0x5e, 0x09, 0x2a,
+	0x59, 0x7b, 0x0f, 0x6a, 0xb6, 0x3a, 0xe2, 0x41, 0x9d, 0x45, 0x91, 0xc2, 0x2c, 0x33, 0x3d, 0x35,
+	0x82, 0xea, 0xb3, 0xfd, 0xbb, 0x03, 0x8d, 0x45, 0x01, 0xb7, 0xf3, 0xc8, 0x17, 0xb0, 0xc6, 0xc2,
+	0x10, 0xb3, 0x8c, 0x6a, 0xf9, 0x0e, 0x85, 0x69, 0xac, 0x11, 0x34, 0x2d, 0x36, 0x2a, 0x20, 0xb2,
+	0x05, 0xb5, 0x0c, 0xc3, 0x5c, 0xa1, 0xa9, 0x77, 0x35, 0x28, 0xbf, 0xc8, 0xe7, 0xd0, 0x0c, 0x59,
+	0x88, 0x4a, 0xd3, 0x94, 0xe9, 0xd8, 0x7b, 0x64, 0x94, 0x60, 0xa1, 0x21, 0xd3, 0x71, 0xfb, 0x39,
+	0xd4, 0xcb, 0xea, 0x6f, 0x2f, 0xa0, 0xbf, 0x0a, 0x35, 0xad, 0x0a, 0xcd, 0xde, 0x9f, 0x0d, 0x68,
+	0x0e, 0x8b, 0x03, 0x3f, 0x90, 0xe2, 0x8a, 0x4f, 0x8c, 0xbf, 0xf9, 0x65, 0xfd, 0x9d, 0xd2, 0xdf,
+	0x40, 0x85, 0x7f, 0x41, 0x18, 0x73, 0xc1, 0xd4, 0xdc, 0x12, 0x6c, 0xe9, 0x60, 0x21, 0x43, 0xf8,
+	0x1a, 0x36, 0x32, 0x54, 0x33, 0x1e, 0x22, 0x0d, 0x93, 0x3c, 0xd3, 0xa8, 0x4c, 0x0b, 0x8d, 0xa0,
+	0x55, 0xc2, 0x07, 0x16, 0x25, 0xaf, 0xa1, 0x15, 0x29, 0xc6, 0x05, 0xad, 0xae, 0x8f, 0xe9, 0xa6,
+	0xb9, 0xbf, 0xed, 0xdb, 0xfb, 0xe5, 0x57, 0xf7, 0xcb, 0x3f, 0x2c, 0x09, 0xc1, 0xba, 0x11, 0x54,
+	0x9f, 0xe4, 0x1c, 0xbc, 0x94, 0x29, 0x14, 0x9a, 0x66, 0x71, 0xae, 0x23, 0xf9, 0xeb, 0x92, 0xd7,
+	0xe3, 0xfb, 0xbc, 0xb6, 0xac, 0xf4, 0xbc, 0x54, 0x2e, 0x4c, 0xbf, 0x85, 0xcd, 0x88, 0x67, 0xa1,
+	0x9c, 0xa1, 0x9a, 0xd3, 0x2a, 0xbf, 0x9a, 0xe9, 0xc0, 0x5d, 0x2c, 0xf4, 0xca, 0x93, 0xbc, 0x80,
+	0x67, 0x1f, 0xc8, 0x0a, 0xaf, 0x14, 0x66, 0x31, 0x8d, 0x30, 0x61, 0x73, 0xaf, 0x7e, 0x4f, 0x01,
+	0xfd, 0x07, 0x9e, 0x13, 0x7c, 0xb2, 0x50, 0x07, 0x56, 0x7c, 0x58, 0x68, 0xc9, 0x0b, 0x68, 0xd9,
+	0x01, 0x58, 0x14, 0xb0, 0x5a, 0x14, 0x60, 0x24, 0xeb, 0x76, 0xa5, 0xaa, 0xa0, 0x0f, 0x1b, 0xa1,
+	0x14, 0x02, 0x43, 0x4d, 0x35, 0x9f, 0xa2, 0xcc, 0xb5, 0xd7, 0xb8, 0xaf, 0xf5, 0x56, 0xa9, 0x18,
+	0x59, 0x01, 0xf9, 0x0e, 0x48, 0xa6, 0x99, 0xce, 0x22, 0x9a, 0x47, 0xe9, 0x62, 0x4b, 0xb0, 0x3d,
+	0xdb, 0x95, 0x8b, 0x28, 0xad, 0x76, 0xec, 0xc1, 0x67, 0x28, 0x66, 0x72, 0x4e, 0xa7, 0xa8, 0x15,
+	0x0f, 0x33, 0x5a, 0x1d, 0x77, 0x25, 0x7c, 0x6a, 0x84, 0x6d, 0x43, 0x3a, 0xb5, 0x9c, 0x73, 0x4b,
+	0xa9, 0x2c, 0x3a, 0xe0, 0x9a, 0x57, 0x86, 0xb2, 0x68, 0xca, 0x05, 0x4d, 0xa5, 0xd2, 0x5e, 0x73,
+	0xd7, 0xe9, 0x3c, 0x0e, 0x5a, 0x06, 0xef, 0x15, 0xf0, 0x50, 0x2a, 0x4d, 0xba, 0xb0, 0xc9, 0x66,
+	0x8c, 0x27, 0x6c, 0xcc, 0x13, 0xae, 0xe7, 0xf4, 0xbd, 0x14, 0xe8, 0xad, 0x2d, 0xc2, 0x70, 0x97,
+	0x17, 0x2f, 0xa5, 0x40, 0x12, 0xc1, 0x76, 0x28, 0x85, 0x56, 0x32, 0xa1, 0x69, 0xc2, 0x04, 0x52,
+	0x96, 0xeb, 0x98, 0xa6, 0x32, 0xe1, 0xe1, 0xdc, 0x5b, 0xdf, 0x75, 0x3a, 0xad, 0xfd, 0x17, 0x37,
+	0xce, 0x7e, 0x2f, 0xd7, 0x31, 0x0a, 0xcd, 0x43, 0x93, 0xd1, 0xd0, 0x08, 0x82, 0xad, 0xd2, 0x6b,
+	0x58, 0x58, 0x15, 0x0c, 0x8b, 0x17, 0x89, 0x85, 0x79, 0xa6, 0xe5, 0x94, 0x96, 0xd3, 0x72, 0xc5,
+	0x13, 0xf4, 0x5a, 0x36, 0x31, 0xbb, 0x62, 0x07, 0xea, 0x0d, 0x4f, 0xb0, 0x68, 0xb7, 0x48, 0x91,
+	0x0a, 0x36, 0x45, 0x9a, 0xa0, 0x98, 0xe8, 0xd8, 0xdb, 0xb0, 0xed, 0x16, 0xf8, 0x19, 0x9b, 0xe2,
+	0x89, 0x41, 0xc9, 0xae, 0x19, 0xbf, 0x30, 0x57, 0x0a, 0x45, 0x38, 0xf7, 0x5c, 0x43, 0x5a, 0x86,
+	0x8a, 0xf4, 0x6d, 0x74, 0x63, 0x29, 0x75, 0xa6, 0x15, 0x4b, 0xa9, 0xc6, 0x69, 0x9a, 0x30, 0x8d,
+	0x76, 0x22, 0x37, 0x6d, 0xfa, 0x86, 0xd4, 0xaf, 0x38, 0xa3, 0x92, 0x62, 0x26, 0x14, 0x61, 0x93,
+	0x0b, 0x8d, 0x2a, 0xc4, 0xb4, 0x68, 0x95, 0x4e, 0x65, 0x84, 0x1e, 0x31, 0xd1, 0xfc, 0x70, 0x63,
+	0x34, 0x4b, 0x0f, 0x84, 0x3f, 0x10, 0x63, 0x99, 0x8b, 0x68, 0xb0, 0x64, 0x70, 0x2a, 0x23, 0x0c,
+	0x5c, 0xfe, 0x11, 0x42, 0xbe, 0x87, 0xba, 0xb6, 0xef, 0xa9, 0xf7, 0xc4, 0xdc, 0xc8, 0x4f, 0xef,
+	0x7a, 0x73, 0x83, 0x8a, 0xbc, 0xf7, 0x0a, 0x9e, 0xdd, 0xb2, 0x09, 0x59, 0x83, 0xd5, 0xe0, 0xe8,
+	0x70, 0x10, 0x1c, 0x1d, 0x8c, 0xdc, 0x15, 0x02, 0x50, 0x1b, 0x0d, 0x83, 0xb7, 0x3f, 0xff, 0xe2,
+	0x3a, 0xdf, 0xfc, 0x04, 0x4f, 0x6f, 0x3a, 0x40, 0xb2, 0x0a, 0x8f, 0xce, 0xde, 0x9e, 0x1d, 0xb9,
+	0x2b, 0xa4, 0x05, 0x70, 0x7a, 0x31, 0xba, 0xe8, 0x9d, 0xd0, 0xd1, 0xc9, 0xb9, 0xeb, 0x90, 0x35,
+	0xa8, 0x0f, 0xce, 0x8e, 0x8f, 0x82, 0xc1, 0xc8, 0xfd, 0xb7, 0xde, 0xef, 0xfc, 0x75, 0xbd, 0xe3,
+	0xfc, 0x7d, 0xbd, 0xe3, 0xfc, 0x73, 0xbd, 0xe3, 0x5c, 0xb6, 0x6d, 0xa1, 0x5c, 0x76, 0x59, 0xca,
+	0xbb, 0xff, 0xfb, 0x7b, 0x1c, 0xd7, 0xcc, 0x3c, 0xbd, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x38,
+	0x0f, 0xe1, 0x8f, 0x36, 0x07, 0x00, 0x00,
 }
 
 func (m *Tracing) Marshal() (dAtA []byte, err error) {
@@ -749,6 +832,20 @@ func (m *Tracing_Lightstep_) MarshalTo(dAtA []byte) (int, error) {
 	}
 	return i, nil
 }
+func (m *Tracing_Datadog_) MarshalTo(dAtA []byte) (int, error) {
+	i := 0
+	if m.Datadog != nil {
+		dAtA[i] = 0x1a
+		i++
+		i = encodeVarintProxy(dAtA, i, uint64(m.Datadog.Size()))
+		n4, err := m.Datadog.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n4
+	}
+	return i, nil
+}
 func (m *Tracing_Zipkin) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -825,6 +922,33 @@ func (m *Tracing_Lightstep) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }
 
+func (m *Tracing_Datadog) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *Tracing_Datadog) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.Address) > 0 {
+		dAtA[i] = 0xa
+		i++
+		i = encodeVarintProxy(dAtA, i, uint64(len(m.Address)))
+		i += copy(dAtA[i:], m.Address)
+	}
+	if m.XXX_unrecognized != nil {
+		i += copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	return i, nil
+}
+
 func (m *ProxyConfig) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -862,21 +986,21 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x22
 		i++
 		i = encodeVarintProxy(dAtA, i, uint64(m.DrainDuration.Size()))
-		n4, err := m.DrainDuration.MarshalTo(dAtA[i:])
+		n5, err := m.DrainDuration.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n4
+		i += n5
 	}
 	if m.ParentShutdownDuration != nil {
 		dAtA[i] = 0x2a
 		i++
 		i = encodeVarintProxy(dAtA, i, uint64(m.ParentShutdownDuration.Size()))
-		n5, err := m.ParentShutdownDuration.MarshalTo(dAtA[i:])
+		n6, err := m.ParentShutdownDuration.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n5
+		i += n6
 	}
 	if len(m.DiscoveryAddress) > 0 {
 		dAtA[i] = 0x32
@@ -888,11 +1012,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x3a
 		i++
 		i = encodeVarintProxy(dAtA, i, uint64(m.DiscoveryRefreshDelay.Size()))
-		n6, err := m.DiscoveryRefreshDelay.MarshalTo(dAtA[i:])
+		n7, err := m.DiscoveryRefreshDelay.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n6
+		i += n7
 	}
 	if len(m.ZipkinAddress) > 0 {
 		dAtA[i] = 0x42
@@ -904,11 +1028,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x4a
 		i++
 		i = encodeVarintProxy(dAtA, i, uint64(m.ConnectTimeout.Size()))
-		n7, err := m.ConnectTimeout.MarshalTo(dAtA[i:])
+		n8, err := m.ConnectTimeout.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n7
+		i += n8
 	}
 	if len(m.StatsdUdpAddress) > 0 {
 		dAtA[i] = 0x52
@@ -971,11 +1095,11 @@ func (m *ProxyConfig) MarshalTo(dAtA []byte) (int, error) {
 		dAtA[i] = 0x1
 		i++
 		i = encodeVarintProxy(dAtA, i, uint64(m.Tracing.Size()))
-		n8, err := m.Tracing.MarshalTo(dAtA[i:])
+		n9, err := m.Tracing.MarshalTo(dAtA[i:])
 		if err != nil {
 			return 0, err
 		}
-		i += n8
+		i += n9
 	}
 	if len(m.EnvoyMetricsServiceAddress) > 0 {
 		dAtA[i] = 0xa2
@@ -1039,6 +1163,18 @@ func (m *Tracing_Lightstep_) Size() (n int) {
 	}
 	return n
 }
+func (m *Tracing_Datadog_) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	if m.Datadog != nil {
+		l = m.Datadog.Size()
+		n += 1 + l + sovProxy(uint64(l))
+	}
+	return n
+}
 func (m *Tracing_Zipkin) Size() (n int) {
 	if m == nil {
 		return 0
@@ -1082,6 +1218,22 @@ func (m *Tracing_Lightstep) Size() (n int) {
 	return n
 }
 
+func (m *Tracing_Datadog) Size() (n int) {
+	if m == nil {
+		return 0
+	}
+	var l int
+	_ = l
+	l = len(m.Address)
+	if l > 0 {
+		n += 1 + l + sovProxy(uint64(l))
+	}
+	if m.XXX_unrecognized != nil {
+		n += len(m.XXX_unrecognized)
+	}
+	return n
+}
+
 func (m *ProxyConfig) Size() (n int) {
 	if m == nil {
 		return 0
@@ -1281,6 +1433,41 @@ func (m *Tracing) Unmarshal(dAtA []byte) error {
 			}
 			m.Tracer = &Tracing_Lightstep_{v}
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Datadog", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProxy
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthProxy
+			}
+			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthProxy
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			v := &Tracing_Datadog{}
+			if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			m.Tracer = &Tracing_Datadog_{v}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipProxy(dAtA[iNdEx:])
@@ -1562,6 +1749,92 @@ func (m *Tracing_Lightstep) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *Tracing_Datadog) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowProxy
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= uint64(b&0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Datadog: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Datadog: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowProxy
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= uint64(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthProxy
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex < 0 {
+				return ErrInvalidLengthProxy
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Address = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipProxy(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthProxy
+			}
+			if (iNdEx + skippy) < 0 {
+				return ErrInvalidLengthProxy
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func (m *ProxyConfig) Unmarshal(dAtA []byte) error {
 	l := len(dAtA)
 	iNdEx := 0
diff --git a/mesh/v1alpha1/proxy.proto b/mesh/v1alpha1/proxy.proto
index a08d122c59..ef0cd19882 100644
--- a/mesh/v1alpha1/proxy.proto
+++ b/mesh/v1alpha1/proxy.proto
@@ -60,12 +60,20 @@ message Tracing {
     string cacert_path = 4;
   }
 
+  // Datadog defines configuration for a Datadog tracer.
+  message Datadog {
+    // Address of the Datadog Agent.
+    string address = 1;
+  }
+
   // The tracer implementation to be used by Envoy.
   oneof tracer {
     // Use a Zipkin tracer.
     Zipkin zipkin = 1;
     // Use a LightStep tracer.
     Lightstep lightstep = 2;
+    // Use a Datadog tracer.
+    Datadog datadog = 3;
   }
 }
 
diff --git a/proto.lock b/proto.lock
index 6aeb94677d..2e1ac32613 100644
--- a/proto.lock
+++ b/proto.lock
@@ -1223,6 +1223,11 @@
                 "id": 2,
                 "name": "lightstep",
                 "type": "Lightstep"
+              },
+              {
+                "id": 3,
+                "name": "datadog",
+                "type": "Datadog"
               }
             ],
             "messages": [
@@ -1260,6 +1265,16 @@
                     "type": "string"
                   }
                 ]
+              },
+              {
+                "name": "Datadog",
+                "fields": [
+                  {
+                    "id": 1,
+                    "name": "address",
+                    "type": "string"
+                  }
+                ]
               }
             ]
           },
diff --git a/python/istio_api/mesh/v1alpha1/proxy_pb2.py b/python/istio_api/mesh/v1alpha1/proxy_pb2.py
index 00f6ff7741..77e8305155 100644
--- a/python/istio_api/mesh/v1alpha1/proxy_pb2.py
+++ b/python/istio_api/mesh/v1alpha1/proxy_pb2.py
@@ -21,7 +21,7 @@
   name='mesh/v1alpha1/proxy.proto',
   package='istio.mesh.v1alpha1',
   syntax='proto3',
-  serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xfb\x01\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\tB\x08\n\x06tracer\"\xe0\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12%\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3')
+  serialized_pb=_b('\n\x19mesh/v1alpha1/proxy.proto\x12\x13istio.mesh.v1alpha1\x1a\x1egoogle/protobuf/duration.proto\"\xd0\x02\n\x07Tracing\x12\x35\n\x06zipkin\x18\x01 \x01(\x0b\x32#.istio.mesh.v1alpha1.Tracing.ZipkinH\x00\x12;\n\tlightstep\x18\x02 \x01(\x0b\x32&.istio.mesh.v1alpha1.Tracing.LightstepH\x00\x12\x37\n\x07\x64\x61tadog\x18\x03 \x01(\x0b\x32$.istio.mesh.v1alpha1.Tracing.DatadogH\x00\x1a\x19\n\x06Zipkin\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x1aW\n\tLightstep\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\t\x12\x14\n\x0c\x61\x63\x63\x65ss_token\x18\x02 \x01(\t\x12\x0e\n\x06secure\x18\x03 \x01(\x08\x12\x13\n\x0b\x63\x61\x63\x65rt_path\x18\x04 \x01(\t\x1a\x1a\n\x07\x44\x61tadog\x12\x0f\n\x07\x61\x64\x64ress\x18\x01 \x01(\tB\x08\n\x06tracer\"\xe0\x06\n\x0bProxyConfig\x12\x13\n\x0b\x63onfig_path\x18\x01 \x01(\t\x12\x13\n\x0b\x62inary_path\x18\x02 \x01(\t\x12\x17\n\x0fservice_cluster\x18\x03 \x01(\t\x12\x31\n\x0e\x64rain_duration\x18\x04 \x01(\x0b\x32\x19.google.protobuf.Duration\x12;\n\x18parent_shutdown_duration\x18\x05 \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x19\n\x11\x64iscovery_address\x18\x06 \x01(\t\x12>\n\x17\x64iscovery_refresh_delay\x18\x07 \x01(\x0b\x32\x19.google.protobuf.DurationB\x02\x18\x01\x12\x1a\n\x0ezipkin_address\x18\x08 \x01(\tB\x02\x18\x01\x12\x32\n\x0f\x63onnect_timeout\x18\t \x01(\x0b\x32\x19.google.protobuf.Duration\x12\x1a\n\x12statsd_udp_address\x18\n \x01(\t\x12%\n\x1d\x65nvoy_metrics_service_address\x18\x14 \x01(\t\x12\x18\n\x10proxy_admin_port\x18\x0b \x01(\x05\x12\x1d\n\x11\x61vailability_zone\x18\x0c \x01(\tB\x02\x18\x01\x12L\n\x19\x63ontrol_plane_auth_policy\x18\r \x01(\x0e\x32).istio.mesh.v1alpha1.AuthenticationPolicy\x12\x1a\n\x12\x63ustom_config_file\x18\x0e \x01(\t\x12\x18\n\x10stat_name_length\x18\x0f \x01(\x05\x12\x13\n\x0b\x63oncurrency\x18\x10 \x01(\x05\x12%\n\x1dproxy_bootstrap_template_path\x18\x11 \x01(\t\x12S\n\x11interception_mode\x18\x12 \x01(\x0e\x32\x38.istio.mesh.v1alpha1.ProxyConfig.InboundInterceptionMode\x12-\n\x07tracing\x18\x13 \x01(\x0b\x32\x1c.istio.mesh.v1alpha1.Tracing\"3\n\x17InboundInterceptionMode\x12\x0c\n\x08REDIRECT\x10\x00\x12\n\n\x06TPROXY\x10\x01*>\n\x14\x41uthenticationPolicy\x12\x08\n\x04NONE\x10\x00\x12\x0e\n\nMUTUAL_TLS\x10\x01\x12\x0c\n\x07INHERIT\x10\xe8\x07\x42\x1cZ\x1aistio.io/api/mesh/v1alpha1b\x06proto3')
   ,
   dependencies=[google_dot_protobuf_dot_duration__pb2.DESCRIPTOR,])
 
@@ -46,8 +46,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=1203,
-  serialized_end=1265,
+  serialized_start=1288,
+  serialized_end=1350,
 )
 _sym_db.RegisterEnumDescriptor(_AUTHENTICATIONPOLICY)
 
@@ -74,8 +74,8 @@
   ],
   containing_type=None,
   options=None,
-  serialized_start=1150,
-  serialized_end=1201,
+  serialized_start=1235,
+  serialized_end=1286,
 )
 _sym_db.RegisterEnumDescriptor(_PROXYCONFIG_INBOUNDINTERCEPTIONMODE)
 
@@ -106,8 +106,8 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=210,
-  serialized_end=235,
+  serialized_start=267,
+  serialized_end=292,
 )
 
 _TRACING_LIGHTSTEP = _descriptor.Descriptor(
@@ -157,8 +157,38 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=237,
-  serialized_end=324,
+  serialized_start=294,
+  serialized_end=381,
+)
+
+_TRACING_DATADOG = _descriptor.Descriptor(
+  name='Datadog',
+  full_name='istio.mesh.v1alpha1.Tracing.Datadog',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='address', full_name='istio.mesh.v1alpha1.Tracing.Datadog.address', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=_b("").decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None, file=DESCRIPTOR),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=383,
+  serialized_end=409,
 )
 
 _TRACING = _descriptor.Descriptor(
@@ -182,10 +212,17 @@
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
       options=None, file=DESCRIPTOR),
+    _descriptor.FieldDescriptor(
+      name='datadog', full_name='istio.mesh.v1alpha1.Tracing.datadog', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
-  nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, ],
+  nested_types=[_TRACING_ZIPKIN, _TRACING_LIGHTSTEP, _TRACING_DATADOG, ],
   enum_types=[
   ],
   options=None,
@@ -198,7 +235,7 @@
       index=0, containing_type=None, fields=[]),
   ],
   serialized_start=83,
-  serialized_end=334,
+  serialized_end=419,
 )
 
 
@@ -362,20 +399,25 @@
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=337,
-  serialized_end=1201,
+  serialized_start=422,
+  serialized_end=1286,
 )
 
 _TRACING_ZIPKIN.containing_type = _TRACING
 _TRACING_LIGHTSTEP.containing_type = _TRACING
+_TRACING_DATADOG.containing_type = _TRACING
 _TRACING.fields_by_name['zipkin'].message_type = _TRACING_ZIPKIN
 _TRACING.fields_by_name['lightstep'].message_type = _TRACING_LIGHTSTEP
+_TRACING.fields_by_name['datadog'].message_type = _TRACING_DATADOG
 _TRACING.oneofs_by_name['tracer'].fields.append(
   _TRACING.fields_by_name['zipkin'])
 _TRACING.fields_by_name['zipkin'].containing_oneof = _TRACING.oneofs_by_name['tracer']
 _TRACING.oneofs_by_name['tracer'].fields.append(
   _TRACING.fields_by_name['lightstep'])
 _TRACING.fields_by_name['lightstep'].containing_oneof = _TRACING.oneofs_by_name['tracer']
+_TRACING.oneofs_by_name['tracer'].fields.append(
+  _TRACING.fields_by_name['datadog'])
+_TRACING.fields_by_name['datadog'].containing_oneof = _TRACING.oneofs_by_name['tracer']
 _PROXYCONFIG.fields_by_name['drain_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
 _PROXYCONFIG.fields_by_name['parent_shutdown_duration'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
 _PROXYCONFIG.fields_by_name['discovery_refresh_delay'].message_type = google_dot_protobuf_dot_duration__pb2._DURATION
@@ -404,6 +446,13 @@
     # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.Lightstep)
     ))
   ,
+
+  Datadog = _reflection.GeneratedProtocolMessageType('Datadog', (_message.Message,), dict(
+    DESCRIPTOR = _TRACING_DATADOG,
+    __module__ = 'mesh.v1alpha1.proxy_pb2'
+    # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing.Datadog)
+    ))
+  ,
   DESCRIPTOR = _TRACING,
   __module__ = 'mesh.v1alpha1.proxy_pb2'
   # @@protoc_insertion_point(class_scope:istio.mesh.v1alpha1.Tracing)
@@ -411,6 +460,7 @@
 _sym_db.RegisterMessage(Tracing)
 _sym_db.RegisterMessage(Tracing.Zipkin)
 _sym_db.RegisterMessage(Tracing.Lightstep)
+_sym_db.RegisterMessage(Tracing.Datadog)
 
 ProxyConfig = _reflection.GeneratedProtocolMessageType('ProxyConfig', (_message.Message,), dict(
   DESCRIPTOR = _PROXYCONFIG,