updates from review

src/main/proto/wfa/measurement/reporting/v2alpha/basic_report.proto

@@ -42,33 +42,25 @@ message BasicReport {
   // Human readable title of the report.
   string title = 2 [(google.api.field_behavior) = IMMUTABLE];
 
-  // A campaign group is the subject of the report.
-  message CampaignGroup {
-    // This is the resource name of a primitive ReportingSet that includes all
-    // of the EventGroups that may be reported on.
-    //
-    // EventGroups may span DataProviders and MediaTypes.
-    string reporting_set = 1 [
-      (google.api.resource_reference) = {
-        type: "reporting.halo-cmm.org/ReportingSet"
-      },
-      (google.api.field_behavior) = IMMUTABLE
-    ];
+  // This is the resource name of a primitive ReportingSet that includes all
+  // of the EventGroups that may be reported on.
+  //
+  // EventGroups may span DataProviders and MediaTypes.
+  string campaign_group = 3 [
+    (google.api.resource_reference) = {
+      type: "reporting.halo-cmm.org/ReportingSet"
+    },
+    (google.api.field_behavior) = IMMUTABLE
+  ];
 
-    // Human readable name for the campaign group. This is the ReportingSet's
-    // display_name.
-    string display_name = 2 [
-      (google.api.field_behavior) = IMMUTABLE,
-      (google.api.field_behavior) = OUTPUT_ONLY
-    ];
-  }
-  // The campaign group to report on
-  CampaignGroup campaign_group = 3 [(google.api.field_behavior) = IMMUTABLE];
+  // Denormalized. The display_name of the campaign_group
+  string campaign_group_display_name = 4
+      [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // The interval of time that the BasicReport spans
   //
   // Both the start and the end of the interval are immutable.
-  ReportingInterval reporting_interval = 4 [
+  ReportingInterval reporting_interval = 5 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.field_behavior) = IMMUTABLE
   ];
@@ -78,18 +70,15 @@ message BasicReport {
   // The custom criteria and any specific impression_qualification_filter may
   // each be used at most once.
   repeated ReportingImpressionQualificationFilter
-      impression_qualification_filters = 5 [
+      impression_qualification_filters = 6 [
         (google.api.field_behavior) = REQUIRED,
         (google.api.field_behavior) = IMMUTABLE
       ];
 
   // The report results
-  repeated Page pages = 6 [
-    (google.api.field_behavior) = IMMUTABLE,
-    (google.api.field_behavior) = OUTPUT_ONLY
-  ];
+  repeated Page pages = 7 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // The time when the BasicReport was created.
-  google.protobuf.Timestamp create_time = 7
+  google.protobuf.Timestamp create_time = 8
       [(google.api.field_behavior) = OUTPUT_ONLY];
 }

src/main/proto/wfa/measurement/reporting/v2alpha/page.proto

@@ -52,35 +52,6 @@ message WindowingSpec {
   ];
 }
 
-// Defines the dimesions over which metrics are grouped and filtered.
-message DimensionSpec {
-  // Specifies the dimensions on which to Group metrics
-  //
-  // Only those event template fields that are tagged as groupable
-  // and in the common template are supported.
-  message Grouping {
-    // A set field paths that indicate the dimensions to group by.
-    //
-    // Each field path is with respect to the Event message with `.` as the
-    // traversal operator.
-    //
-    // For example, if the Event message had an Event Template `common` with
-    // a field `age_group` then the field path would be `common.age_group`.
-    repeated string event_template_field = 1 [
-      (google.api.field_behavior) = REQUIRED,
-      (google.api.field_behavior) = IMMUTABLE
-    ];
-  }
-  // Metric grouping
-  Grouping grouping = 3 [(google.api.field_behavior) = IMMUTABLE];
-
-  // A conjunction of Event Filters
-  //
-  // Event Template fields that are used by any filter Terms must be
-  // tagged as filterable.
-  repeated EventFilter filters = 4 [(google.api.field_behavior) = IMMUTABLE];
-}
-
 // A page of results.
 message Page {
   // The title of the page.