LogDog: Add project namespace to Butler/Collector.

common/proto/logdog/logpb/butler.pb.go

Index: common/proto/logdog/logpb/butler.pb.go
diff --git a/common/proto/logdog/logpb/butler.pb.go b/common/proto/logdog/logpb/butler.pb.go
index 24bb1856518302a9057be0e540825dd3c3df363e..c2eaf16a3496e39a131dbfc11e77934d7773a14d 100644
--- a/common/proto/logdog/logpb/butler.pb.go
+++ b/common/proto/logdog/logpb/butler.pb.go
@@ -128,6 +128,28 @@ type ButlerLogBundle struct {
 	// *
 	// Each Entry is an individual set of log records for a given log stream.
 	Entries []*ButlerLogBundle_Entry `protobuf:"bytes,3,rep,name=entries" json:"entries,omitempty"`
+	// * Project specifies which luci-config project this stream belongs to.
+	Project string `protobuf:"bytes,4,opt,name=project" json:"project,omitempty"`
+	// *
+	// The log stream prefix that is shared by all bundled streams.
+	//
+	// This prefix is valid within the supplied project scope.
+	Prefix string `protobuf:"bytes,5,opt,name=prefix" json:"prefix,omitempty"`
+	//
+	// The log prefix's secret value (required).
+	//
+	// The secret is bound to all log streams that share the supplied Prefix, and
+	// The Coordinator will record the secret associated with a given log Prefix,
+	// but will not expose the secret to users.
+	//
+	// The Collector will check the secret prior to ingesting logs. If the
+	// secret doesn't match the value recorded by the Coordinator, the log
+	// will be discarded.
+	//
+	// This ensures that only the Butler instance that generated the log stream
+	// can emit log data for that stream. It also ensures that only authenticated
+	// users can write to a Prefix.
+	Secret []byte `protobuf:"bytes,6,opt,name=secret,proto3" json:"secret,omitempty"`
 }
 
 func (m *ButlerLogBundle) Reset()                    { *m = ButlerLogBundle{} }
@@ -158,20 +180,8 @@ type ButlerLogBundle_Entry struct {
 	//
 	// Each LogEntry in the "logs" field is shares this common descriptor.
 	Desc *LogStreamDescriptor `protobuf:"bytes,1,opt,name=desc" json:"desc,omitempty"`
-	//
-	// The log prefix's secret value (required).
-	//
-	// The secret is generated by the Butler and unique to this specific log
-	// stream. The Coordinator will record the secret associated with a given
-	// log Prefix/Stream, but will not share the secret with a client.
-	//
-	// The Collector will check the secret prior to ingesting logs. If the
-	// secret doesn't match the value recorded by the Coordinator, the log
-	// will be discarded.
-	//
-	// This ensures that only the Butler instance that generated the log stream
-	// can emit log data for that stream.
-	Secret []byte `protobuf:"bytes,2,opt,name=secret,proto3" json:"secret,omitempty"`
+	// (DEPRECATED) Per-entry secret replaced with Butler-wide secret.
+	DeprecatedEntrySecret []byte `protobuf:"bytes,2,opt,name=deprecated_entry_secret,json=deprecatedEntrySecret,proto3" json:"deprecated_entry_secret,omitempty"`
 	//
 	// Whether this log entry terminates its stream.
 	//
@@ -223,31 +233,34 @@ func init() {
 }
 
 var fileDescriptor0 = []byte{
-	// 406 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x91, 0xdf, 0x8a, 0xd3, 0x40,
-	0x14, 0xc6, 0x4d, 0x37, 0xdd, 0x6d, 0x4e, 0xba, 0xdd, 0x65, 0x04, 0x09, 0x41, 0xd0, 0xad, 0x08,
-	0x5e, 0x4d, 0x61, 0x45, 0xf1, 0xba, 0xeb, 0x5e, 0x14, 0x6a, 0x85, 0xb1, 0x78, 0xe1, 0x4d, 0xc9,
-	0x9f, 0x63, 0x08, 0x24, 0x99, 0x30, 0x99, 0x14, 0xfb, 0x00, 0x3e, 0x93, 0x4f, 0xe2, 0xfb, 0x38,
-	0x3d, 0xd3, 0xa4, 0x2d, 0xc2, 0x5e, 0x35, 0xe7, 0xcc, 0xef, 0x3b, 0xe7, 0x3b, 0x5f, 0x61, 0x1c,
-	0xb7, 0xba, 0x40, 0xc5, 0x6b, 0x25, 0xb5, 0x64, 0xc3, 0x42, 0x66, 0x75, 0x1c, 0x7a, 0xe6, 0xc7,
-	0x76, 0xc2, 0x57, 0x99, 0x94, 0x59, 0x81, 0x33, 0xaa, 0xe2, 0xf6, 0xe7, 0x4c, 0xe7, 0x25, 0x36,
-	0x3a, 0x2a, 0x6b, 0x0b, 0x4c, 0x7f, 0x0f, 0x60, 0x32, 0xa7, 0x19, 0x5f, 0x50, 0x47, 0x69, 0xa4,
-	0x23, 0xf6, 0x01, 0x5c, 0xbd, 0xab, 0x31, 0x70, 0x5e, 0x3b, 0xef, 0x26, 0xf7, 0x77, 0x9c, 0x86,
-	0xf2, 0x73, 0x88, 0x3f, 0xc8, 0x4a, 0x63, 0xa5, 0xd7, 0x06, 0x14, 0x84, 0xb3, 0x07, 0xf0, 0x13,
-	0x59, 0xd6, 0x0a, 0x9b, 0x26, 0x97, 0x55, 0x30, 0x78, 0x5a, 0xdd, 0x83, 0xe2, 0x54, 0xc5, 0xde,
-	0xc0, 0x35, 0xf9, 0xda, 0x6c, 0x51, 0xd1, 0x98, 0x0b, 0x33, 0xc6, 0x13, 0x63, 0x6a, 0x7e, 0xb7,
-	0xbd, 0xe9, 0x0c, 0xfc, 0x93, 0xf5, 0xcc, 0x87, 0xab, 0x45, 0xb5, 0x8d, 0x8a, 0x3c, 0xbd, 0x7d,
-	0xc6, 0x9e, 0xc3, 0x8d, 0xdd, 0xb5, 0x94, 0xd9, 0xbc, 0xad, 0xd2, 0x02, 0x6f, 0x9d, 0xe9, 0xdd,
-	0x5e, 0x70, 0x5c, 0x32, 0x02, 0x77, 0xf5, 0x75, 0xf5, 0x68, 0x68, 0xf3, 0xf5, 0x63, 0xb9, 0x98,
-	0x1b, 0xe4, 0xef, 0xe0, 0x3f, 0x21, 0x7b, 0x01, 0x97, 0x8d, 0x6c, 0x55, 0x62, 0xa3, 0xf0, 0xc4,
-	0xa1, 0x62, 0x9f, 0xc0, 0xeb, 0x63, 0xa4, 0x3b, 0xfd, 0xfb, 0x90, 0xdb, 0xa0, 0x79, 0x17, 0x34,
-	0x5f, 0x77, 0x84, 0x38, 0xc2, 0xec, 0x23, 0x5c, 0x19, 0xd7, 0x2a, 0xc7, 0xc6, 0x1c, 0x76, 0x61,
-	0x74, 0x2f, 0xcf, 0xf2, 0xe9, 0x57, 0xf3, 0x47, 0x43, 0xed, 0x44, 0x07, 0x87, 0x7f, 0x1c, 0x18,
-	0x52, 0x8b, 0x71, 0x70, 0x53, 0x6c, 0x12, 0x72, 0xb4, 0x5f, 0x6b, 0xe5, 0x46, 0xf8, 0x4d, 0x2b,
-	0x8c, 0xca, 0xcf, 0xe6, 0x4d, 0xe5, 0xb5, 0x96, 0x4a, 0x10, 0x47, 0x37, 0x60, 0xa2, 0x50, 0x93,
-	0xd1, 0xb1, 0x38, 0x54, 0x2c, 0x84, 0x91, 0x46, 0x55, 0xe6, 0x55, 0x54, 0x50, 0xc6, 0x23, 0xd1,
-	0xd7, 0xec, 0x2d, 0x4c, 0xba, 0xef, 0x4d, 0x5e, 0xa5, 0xf8, 0x2b, 0x70, 0x0d, 0xe1, 0x8a, 0xeb,
-	0xae, 0xbb, 0xd8, 0x37, 0xcd, 0x7f, 0xe5, 0x9a, 0xed, 0x4d, 0x30, 0xa4, 0x4b, 0x6e, 0x8e, 0x56,
-	0xac, 0x79, 0x7a, 0x8c, 0x2f, 0x29, 0x90, 0xf7, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x62, 0x9f,
-	0xec, 0x36, 0xa9, 0x02, 0x00, 0x00,
+	// 455 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x52, 0xcd, 0x6e, 0xd3, 0x40,
+	0x10, 0x26, 0x89, 0xf3, 0x37, 0x49, 0xd3, 0x6a, 0x11, 0x60, 0x59, 0x48, 0xd0, 0x20, 0x24, 0x4e,
+	0x1b, 0xa9, 0x08, 0xc4, 0x39, 0xa5, 0x87, 0x48, 0xa5, 0x48, 0xdb, 0x8a, 0x03, 0x97, 0xc8, 0xb1,
+	0xa7, 0xd1, 0x22, 0xdb, 0x6b, 0xad, 0x37, 0x55, 0xf3, 0x00, 0x3c, 0x17, 0x8f, 0xc1, 0xeb, 0x30,
+	0x9e, 0x8d, 0x93, 0x56, 0x48, 0x3d, 0x65, 0x67, 0xe6, 0x9b, 0xf9, 0x7e, 0x62, 0x18, 0xaf, 0x36,
+	0x2e, 0x43, 0x2b, 0x4b, 0x6b, 0x9c, 0x11, 0xdd, 0xcc, 0xac, 0xcb, 0x55, 0x34, 0xa4, 0x1f, 0xdf,
+	0x89, 0xde, 0xac, 0x8d, 0x59, 0x67, 0x38, 0xe3, 0x6a, 0xb5, 0xb9, 0x9d, 0x39, 0x9d, 0x63, 0xe5,
+	0xe2, 0xbc, 0xf4, 0x80, 0xe9, 0xef, 0x36, 0x4c, 0xe6, 0x7c, 0xe3, 0x1b, 0xba, 0x38, 0x8d, 0x5d,
+	0x2c, 0x3e, 0x41, 0xe0, 0xb6, 0x25, 0x86, 0xad, 0xb7, 0xad, 0x0f, 0x93, 0xb3, 0x53, 0xc9, 0x47,
+	0xe5, 0x63, 0x90, 0x3c, 0x37, 0x85, 0xc3, 0xc2, 0xdd, 0x10, 0x50, 0x31, 0x5c, 0x9c, 0xc3, 0x28,
+	0x31, 0x79, 0x69, 0xb1, 0xaa, 0xb4, 0x29, 0xc2, 0xf6, 0xd3, 0xdb, 0x7b, 0xa0, 0x7a, 0xb8, 0x25,
+	0xde, 0xc1, 0x11, 0xeb, 0x5a, 0xde, 0xa1, 0xe5, 0x33, 0x1d, 0x3a, 0x33, 0x54, 0x63, 0x6e, 0xfe,
+	0xf0, 0xbd, 0xe9, 0x0c, 0x46, 0x0f, 0xe8, 0xc5, 0x08, 0xfa, 0x8b, 0xe2, 0x2e, 0xce, 0x74, 0x7a,
+	0xf2, 0x4c, 0x3c, 0x87, 0x63, 0xcf, 0x75, 0x69, 0xd6, 0xf3, 0x4d, 0x91, 0x66, 0x78, 0xd2, 0x9a,
+	0x9e, 0xd6, 0x0b, 0x07, 0x92, 0x01, 0x04, 0x57, 0xdf, 0xaf, 0x2e, 0x08, 0x4d, 0xaf, 0x9f, 0x97,
+	0x8b, 0x39, 0x41, 0xfe, 0x74, 0xfe, 0x5b, 0x14, 0x2f, 0xa1, 0x57, 0x99, 0x8d, 0x4d, 0x7c, 0x14,
+	0x43, 0xb5, 0xab, 0xc4, 0x17, 0x18, 0xee, 0x63, 0x64, 0x9f, 0xa3, 0xb3, 0x48, 0xfa, 0xa0, 0x65,
+	0x13, 0xb4, 0xbc, 0x69, 0x10, 0xea, 0x00, 0x16, 0x9f, 0xa1, 0x4f, 0xaa, 0xad, 0xc6, 0x8a, 0x8c,
+	0x75, 0x68, 0xef, 0xf5, 0xa3, 0x7c, 0xf6, 0xd4, 0xf2, 0x82, 0x50, 0x5b, 0xd5, 0x80, 0x45, 0x08,
+	0x7d, 0x3a, 0xfc, 0x0b, 0x13, 0x17, 0x06, 0x2c, 0xa5, 0x29, 0x6b, 0x8d, 0xe4, 0xeb, 0x56, 0xdf,
+	0x87, 0x5d, 0xaf, 0xd1, 0x57, 0xac, 0x1d, 0x13, 0x8b, 0x2e, 0xec, 0x51, 0x7f, 0xac, 0x76, 0x55,
+	0xf4, 0xb7, 0x05, 0x5d, 0x3e, 0x2e, 0x24, 0x04, 0x29, 0x56, 0x09, 0x7b, 0xab, 0x0d, 0x78, 0x21,
+	0x24, 0xe1, 0xda, 0x59, 0x8c, 0xf3, 0xaf, 0x34, 0xb3, 0xba, 0x74, 0xc6, 0x2a, 0xc6, 0x91, 0xf6,
+	0x57, 0x29, 0xd2, 0xf5, 0x24, 0x76, 0x98, 0x2e, 0x6b, 0x65, 0xdb, 0xe5, 0x8e, 0xa2, 0xcd, 0x14,
+	0x2f, 0x0e, 0x63, 0x66, 0xb8, 0xe6, 0xa1, 0x88, 0x60, 0xe0, 0xd0, 0xe6, 0xba, 0x88, 0x33, 0xfe,
+	0x37, 0x07, 0x6a, 0x5f, 0x8b, 0xf7, 0x30, 0x69, 0xde, 0x4b, 0x5d, 0xa4, 0x78, 0xcf, 0xf6, 0x02,
+	0x75, 0xd4, 0x74, 0x17, 0x75, 0x93, 0xbe, 0x8a, 0x80, 0xd4, 0x55, 0x64, 0xb1, 0xce, 0xec, 0xf8,
+	0x20, 0xd5, 0xc7, 0xc4, 0xc3, 0x55, 0x8f, 0xa3, 0xff, 0xf8, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x1e,
+	0xf4, 0xc2, 0x77, 0x13, 0x03, 0x00, 0x00,
 }