Initialize the copying of these proto files from Google's internal code repo.
These changes were generated automatically based on the internal version
of these files.
Bug: 43972
PiperOrigin-RevId: 290312071
Change-Id: I899789793a543fdacc17242d684af85fc2cc6153
diff --git a/src/pb/encrypted_message.proto b/src/pb/encrypted_message.proto
index 7837d85..925faa5 100644
--- a/src/pb/encrypted_message.proto
+++ b/src/pb/encrypted_message.proto
@@ -1,20 +1,23 @@
-// Copyright 2016 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
syntax = "proto3";
package cobalt;
+
+
option go_package = "cobalt";
+
////////////////////////////////////////////////////////////////////////////////
//
-// NOTE: This copy of encrypted_message.proto is used by the Cobalt client.
-// A second copy of this file is used by the Cobalt Shuffler and Analyzer
-// running in Google production. It is necessary to have two copies due to
-// requirements by the Google Logs Privacy team regarding the location of
-// of .proto files used in logs processing pipelines. Any changes to this
-// file must be replicated in the other copy of the file.
+// NOTE: The encrypted_message.proto is used by the Cobalt client and the Cobalt
+// Shuffler and Analyzers. The canonical version of this file is located in
+// Google's internal code repository, and the file is automatically copied to
+// Cobalt's open source Git repo where it is used by the Cobalt client code. Do
+// not edit the copy of this file in the open-source Cobalt Git repo as those
+// edits will be overwritten when the file is next copied. It is necessary to
+// have two copies due to requirements of the Google Logs Privacy team regarding
+// the location of .proto files used in logs processing pipelines, and because
+// one copy must be open source.
//
////////////////////////////////////////////////////////////////////////////////
@@ -25,6 +28,7 @@
// message is encrypted to the Analyzer that will process it. Second each
// Envelope containing many observations is encrypted to the Shuffler. We use
// the EncryptedMessage proto to carry the ciphertext in both cases.
+//
message EncryptedMessage {
// The different schemes used in Cobalt to encrypt a message.
enum EncryptionScheme {
@@ -57,10 +61,10 @@
// The |ciphertext| field contains the bytes of the encryption of the standard
// serialization of one of the following types of proto messages:
//
- // - A cobalt.Envelope, as defined in envelope.proto.
+ // - A cobalt.Envelope, as defined in Cobalt's envelope.proto.
// EncryptedMessages containing Envelopes are the input to the Shuffler.
//
- // - A cobalt.Observation2, as defined in observation2.proto.
+ // - A cobalt.Observation2, as defined in Cobalt's observation2.proto.
// An ObservationBatch (defined in observation_batch.proto) contains
// EncryptedMessages of this type. ObservationBatches are output from the
// Shuffler.
diff --git a/src/pb/observation_batch.proto b/src/pb/observation_batch.proto
index 3ac9b58..ca322d4 100644
--- a/src/pb/observation_batch.proto
+++ b/src/pb/observation_batch.proto
@@ -1,22 +1,24 @@
-// Copyright 2018 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
syntax = "proto3";
package cobalt;
+import "src/pb/encrypted_message.proto";
+
+
option go_package = "cobalt";
-import "src/pb/encrypted_message.proto";
////////////////////////////////////////////////////////////////////////////////
//
-// NOTE: This copy of observation_batch.proto is used by the Cobalt client.
-// A second copy of this file is used by the Cobalt Shuffler and Analyzer
-// running in Google production. It is necessary to have two copies due to
-// requirements by the Google Logs Privacy team regarding the location of
-// of .proto files used in logs processing pipelines. Any changes to this
-// file must be replicated in the other copy of the file.
+// NOTE: The observation_batch.proto is used by the Cobalt client and the Cobalt
+// Shuffler and Analyzers. The canonical version of this file is located in
+// Google's internal code repository, and the file is automatically copied to
+// Cobalt's open source Git repo where it is used by the Cobalt client code. Do
+// not edit the copy of this file in the open-source Cobalt Git repo as those
+// edits will be overwritten when the file is next copied. It is necessary to
+// have two copies due to requirements of the Google Logs Privacy team regarding
+// the location of .proto files used in logs processing pipelines, and because
+// one copy must be open source.
//
////////////////////////////////////////////////////////////////////////////////
@@ -120,21 +122,24 @@
// The profile of the client system on which the Observation was collected.
SystemProfile system_profile = 5;
- // We used to have a field called |backend|.
+ // We used to have a field called |backend|.
reserved 6;
reserved "backend";
}
// A batch of encrypted Observations with common metadata.
// The Observations are encrypted to the public key of an Analyzer so the
-// Shuffler cannot read them. |Observation| is defined in observation.proto.
+// Shuffler cannot read them. |Observation2| is defined in Cobalt's
+// observation2.proto.
//
// ObservationBatches are used for both input to and output from the Shuffler.
// As input they are organized into Envelopes, each Envelope coming from some
-// client device. |Envelope| is defined in envelope.proto
+// client device. |Envelope| is defined in Cobalt's envelope.proto.
//
-// The output from the Shuffler consists of shuffled ObservationBatches, each
-// ObservationBatch consisting of Observations from many clients.
+// The output from the Shuffler consists of shuffled
+// ObservationBatches, each ObservationBatch consisting of Observations
+// from many clients.
+//
message ObservationBatch {
// The common Metadata for all of the encrypted observations in this batch.
ObservationMetadata meta_data = 1;
diff --git a/src/pb/report_row.proto b/src/pb/report_row.proto
index 7e9dee8..8b59b51 100644
--- a/src/pb/report_row.proto
+++ b/src/pb/report_row.proto
@@ -1,6 +1,3 @@
-// Copyright 2018 The Fuchsia Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
syntax = "proto3";
package cobalt;
@@ -394,4 +391,4 @@
// the ReportGenerator for this report, aggregation window size, and date with
// the same SystemProfile.
int64 fleet_size = 9;
-}
\ No newline at end of file
+}
