moving to request headers

Author: minond

lib/protobuf/rpc/rpc.pb.rb

@@ -31,8 +31,7 @@ class ErrorReason < ::Protobuf::Enum
     #
     class Request < ::Protobuf::Message; end
     class Response < ::Protobuf::Message; end
-    class Trace < ::Protobuf::Message; end
-    class MapEntry < ::Protobuf::Message; end
+    class Header < ::Protobuf::Message; end
 
 
     ##
@@ -43,9 +42,9 @@ class Request
       required :string, :method_name, 2
       optional :bytes, :request_proto, 3
       optional :string, :caller, 4
+      repeated ::Protobuf::Socketrpc::Header, :headers, 5
       # Extension Fields
       extensions 200...536870912
-      optional ::Protobuf::Socketrpc::Trace, :".protobuf.socketrpc.Request.trace", 200, :extension => true
     end
 
     class Response
@@ -56,12 +55,8 @@ class Response
       optional :string, :server, 5
     end
 
-    class Trace
-      repeated ::Protobuf::Socketrpc::MapEntry, :headers, 1
-    end
-
-    class MapEntry
-      optional :string, :key, 1
+    class Header
+      required :string, :key, 1
       optional :string, :value, 2
     end
 

proto/rpc.proto

@@ -32,10 +32,7 @@ message Request
   required string method_name = 2;              // Service method to invoke
   optional bytes request_proto = 3;             // Serialized request bytes
   optional string caller = 4;                   // Calling hostname or address
-
-  extend Request {
-    optional Trace trace = 200;
-  }
+  repeated Header headers = 5;                  // General purpose request headers
 }
 
 message Response
@@ -47,12 +44,8 @@ message Response
   optional string server = 5;                   // Server hostname or address
 }
 
-message Trace {
-  repeated MapEntry headers = 1;
-}
-
-message MapEntry {
-  optional string key = 1;
+message Header {
+  required string key = 1;
   optional string value = 2;
 }