From 164e654d1c9a0fbd7abb30e33f008b7fb18280ed Mon Sep 17 00:00:00 2001
From: Gary Brown <gary@brownuk.com>
Date: Tue, 12 Sep 2017 09:02:23 +0100
Subject: [PATCH 1/3] tracing: Add decorator with operation name to Route

---
 api/rds.proto | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/api/rds.proto b/api/rds.proto
index 84471e1a2..6fbe92429 100644
--- a/api/rds.proto
+++ b/api/rds.proto
@@ -262,6 +262,11 @@ message RedirectAction {
   string path_redirect = 2;
 }
 
+message TracingDecorator {
+  // The operation (or span name) to be used for the matched route.
+  string operation = 1;
+}
+
 // The match/action distinction in Route is surfaced explicitly in the v2 API
 // [V2-API-DIFF].
 message Route {
@@ -276,6 +281,9 @@ message Route {
 
   // See base.Metadata description.
   Metadata metadata = 4;
+
+  // Tracing decorator for matched route
+  TracingDecorator tracing = 5;
 }
 
 // A virtual cluster is a way of specifying a regex matching rule against

From 3a9bff356ca256288c733ee11f5ab1f32a97cb2d Mon Sep 17 00:00:00 2001
From: Gary Brown <gary@brownuk.com>
Date: Tue, 12 Sep 2017 17:21:06 +0100
Subject: [PATCH 2/3] Rename to be more generic decorator

---
 api/rds.proto | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/rds.proto b/api/rds.proto
index 6fbe92429..e431dc0ba 100644
--- a/api/rds.proto
+++ b/api/rds.proto
@@ -262,8 +262,8 @@ message RedirectAction {
   string path_redirect = 2;
 }
 
-message TracingDecorator {
-  // The operation (or span name) to be used for the matched route.
+message Decorator {
+  // The tracing operation (or span name) to be used for the matched route.
   string operation = 1;
 }
 
@@ -282,8 +282,8 @@ message Route {
   // See base.Metadata description.
   Metadata metadata = 4;
 
-  // Tracing decorator for matched route
-  TracingDecorator tracing = 5;
+  // Decorator for matched route
+  Decorator decorator = 5;
 }
 
 // A virtual cluster is a way of specifying a regex matching rule against

From 3585f92bc70dacbff09ee16d0b4de637c49c1143 Mon Sep 17 00:00:00 2001
From: Gary Brown <gary@brownuk.com>
Date: Tue, 12 Sep 2017 17:35:12 +0100
Subject: [PATCH 3/3] Minor changes to comments

---
 api/rds.proto | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/api/rds.proto b/api/rds.proto
index e431dc0ba..e4d94d4eb 100644
--- a/api/rds.proto
+++ b/api/rds.proto
@@ -263,7 +263,7 @@ message RedirectAction {
 }
 
 message Decorator {
-  // The tracing operation (or span name) to be used for the matched route.
+  // The operation (or span name) to be used for the matched route.
   string operation = 1;
 }
 
@@ -282,7 +282,7 @@ message Route {
   // See base.Metadata description.
   Metadata metadata = 4;
 
-  // Decorator for matched route
+  // Decorator for matched route.
   Decorator decorator = 5;
 }