From cfd43f0a854379ad2161c1af8a709ebfb96196bd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 9 Mar 2021 13:42:04 -0800 Subject: [PATCH] fix!: rename the 'page_size', 'page_token', 'total_size' fields to 'limit', 'offset' and 'row_count' respectively (#170) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/cc709e90-a49a-42d6-a4ad-ab9e235da65b/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 361182102 Source-Link: https://github.com/googleapis/googleapis/commit/d4cd8d96ed6eb5dd7c997aab68a1d6bb0825090c Source-Link: https://github.com/googleapis/googleapis-gen/commit/18e181194cd6da98340da7096f2b8df0c2b6aa9b --- .../clirr-ignored-differences.xml | 31 ++ .../data/v1beta/BetaAnalyticsDataClient.java | 159 +------- .../v1beta/BetaAnalyticsDataSettings.java | 15 +- .../analytics/data/v1beta/gapic_metadata.json | 2 +- .../analytics/data/v1beta/package-info.java | 11 +- .../v1beta/stub/BetaAnalyticsDataStub.java | 6 - .../stub/BetaAnalyticsDataStubSettings.java | 84 +--- .../stub/GrpcBetaAnalyticsDataStub.java | 11 - .../v1beta/BetaAnalyticsDataClientTest.java | 43 +- .../clirr-ignored-differences.xml | 45 +++ .../data/v1beta/AnalyticsDataApiProto.java | 248 ++++++------ .../data/v1beta/RunRealtimeReportRequest.java | 116 +++--- .../RunRealtimeReportRequestOrBuilder.java | 20 +- .../v1beta/RunRealtimeReportResponse.java | 92 ++--- .../RunRealtimeReportResponseOrBuilder.java | 14 +- .../data/v1beta/RunReportRequest.java | 342 ++++++---------- .../v1beta/RunReportRequestOrBuilder.java | 58 +-- .../data/v1beta/RunReportResponse.java | 373 ++++-------------- .../v1beta/RunReportResponseOrBuilder.java | 61 +-- .../data/v1beta/analytics_data_api.proto | 82 ++-- synth.metadata | 10 +- 21 files changed, 646 insertions(+), 1177 deletions(-) create mode 100644 google-analytics-data/clirr-ignored-differences.xml diff --git a/google-analytics-data/clirr-ignored-differences.xml b/google-analytics-data/clirr-ignored-differences.xml new file mode 100644 index 00000000..9b56ba0a --- /dev/null +++ b/google-analytics-data/clirr-ignored-differences.xml @@ -0,0 +1,31 @@ + + + + + 7002 + com/google/analytics/data/v1beta/stub/*Stub* + * runReport*(*) + + + 7002 + com/google/analytics/data/v1beta/BetaAnalytics* + * runReport*(*) + + + 7006 + com/google/analytics/data/v1beta/BetaAnalytics* + * runReport*(*) + * + + + 7006 + com/google/analytics/data/v1beta/stub/BetaAnalytics* + * runReport*(*) + * + + + 8001 + com/google/analytics/data/v1beta/BetaAnalytics* + + + diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClient.java b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClient.java index 080d10b2..e74c5621 100644 --- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClient.java +++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClient.java @@ -18,19 +18,10 @@ import com.google.analytics.data.v1beta.stub.BetaAnalyticsDataStub; import com.google.analytics.data.v1beta.stub.BetaAnalyticsDataStubSettings; -import com.google.api.core.ApiFunction; -import com.google.api.core.ApiFuture; -import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; -import com.google.api.gax.paging.AbstractFixedSizeCollection; -import com.google.api.gax.paging.AbstractPage; -import com.google.api.gax.paging.AbstractPagedListResponse; -import com.google.api.gax.rpc.PageContext; import com.google.api.gax.rpc.UnaryCallable; -import com.google.common.util.concurrent.MoreExecutors; import java.io.IOException; -import java.util.List; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -43,21 +34,24 @@ * * 
{@code
  * try (BetaAnalyticsDataClient betaAnalyticsDataClient = BetaAnalyticsDataClient.create()) {
- *   RunPivotReportRequest request =
- *       RunPivotReportRequest.newBuilder()
+ *   RunReportRequest request =
+ *       RunReportRequest.newBuilder()
  *           .setProperty("property-993141291")
  *           .addAllDimensions(new ArrayList())
  *           .addAllMetrics(new ArrayList())
  *           .addAllDateRanges(new ArrayList())
- *           .addAllPivots(new ArrayList())
  *           .setDimensionFilter(FilterExpression.newBuilder().build())
  *           .setMetricFilter(FilterExpression.newBuilder().build())
+ *           .setOffset(-1019779949)
+ *           .setLimit(102976443)
+ *           .addAllMetricAggregations(new ArrayList())
+ *           .addAllOrderBys(new ArrayList())
  *           .setCurrencyCode("currencyCode1004773790")
  *           .setCohortSpec(CohortSpec.newBuilder().build())
  *           .setKeepEmptyRows(true)
  *           .setReturnPropertyQuota(true)
  *           .build();
- *   RunPivotReportResponse response = betaAnalyticsDataClient.runPivotReport(request);
+ *   RunReportResponse response = betaAnalyticsDataClient.runReport(request);
  * }
  * }
* @@ -184,8 +178,8 @@ public BetaAnalyticsDataStub getStub() { * .addAllDateRanges(new ArrayList()) * .setDimensionFilter(FilterExpression.newBuilder().build()) * .setMetricFilter(FilterExpression.newBuilder().build()) - * .setPageSize(883849137) - * .setPageToken("pageToken873572522") + * .setOffset(-1019779949) + * .setLimit(102976443) * .addAllMetricAggregations(new ArrayList()) * .addAllOrderBys(new ArrayList()) * .setCurrencyCode("currencyCode1004773790") @@ -193,17 +187,15 @@ public BetaAnalyticsDataStub getStub() { * .setKeepEmptyRows(true) * .setReturnPropertyQuota(true) * .build(); - * for (DimensionHeader element : betaAnalyticsDataClient.runReport(request).iterateAll()) { - * // doThingsWith(element); - * } + * RunReportResponse response = betaAnalyticsDataClient.runReport(request); * } * } * * @param request The request object containing all of the parameters for the API call. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final RunReportPagedResponse runReport(RunReportRequest request) { - return runReportPagedCallable().call(request); + public final RunReportResponse runReport(RunReportRequest request) { + return runReportCallable().call(request); } // AUTO-GENERATED DOCUMENTATION AND METHOD. @@ -226,8 +218,8 @@ public final RunReportPagedResponse runReport(RunReportRequest request) { * .addAllDateRanges(new ArrayList()) * .setDimensionFilter(FilterExpression.newBuilder().build()) * .setMetricFilter(FilterExpression.newBuilder().build()) - * .setPageSize(883849137) - * .setPageToken("pageToken873572522") + * .setOffset(-1019779949) + * .setLimit(102976443) * .addAllMetricAggregations(new ArrayList()) * .addAllOrderBys(new ArrayList()) * .setCurrencyCode("currencyCode1004773790") @@ -235,43 +227,10 @@ public final RunReportPagedResponse runReport(RunReportRequest request) { * .setKeepEmptyRows(true) * .setReturnPropertyQuota(true) * .build(); - * ApiFuture future = - * betaAnalyticsDataClient.runReportPagedCallable().futureCall(request); + * ApiFuture future = + * betaAnalyticsDataClient.runReportCallable().futureCall(request); * // Do something. - * for (DimensionHeader element : future.get().iterateAll()) { - * // doThingsWith(element); - * } - * } - * } - */ - public final UnaryCallable runReportPagedCallable() { - return stub.runReportPagedCallable(); - } - - // AUTO-GENERATED DOCUMENTATION AND METHOD. - /** - * Returns a customized report of your Google Analytics event data. Reports contain statistics - * derived from data collected by the Google Analytics tracking code. The data returned from the - * API is as a table with columns for the requested dimensions and metrics. Metrics are individual - * measurements of user activity on your property, such as active users or event count. Dimensions - * break down metrics across some common criteria, such as country or event name. - * - *

Sample code: - * - * 

{@code
-   * try (BetaAnalyticsDataClient betaAnalyticsDataClient = BetaAnalyticsDataClient.create()) {
-   *   while (true) {
-   *     RunReportResponse response = betaAnalyticsDataClient.runReportCallable().call(request);
-   *     for (DimensionHeader element : response.getResponsesList()) {
-   *       // doThingsWith(element);
-   *     }
-   *     String nextPageToken = response.getNextPageToken();
-   *     if (!Strings.isNullOrEmpty(nextPageToken)) {
-   *       request = request.toBuilder().setPageToken(nextPageToken).build();
-   *     } else {
-   *       break;
-   *     }
-   *   }
+   *   RunReportResponse response = future.get();
    * }
    * }
*/ @@ -592,7 +551,7 @@ public final UnaryCallable getMetadataCallable() { * .addAllMetrics(new ArrayList()) * .setDimensionFilter(FilterExpression.newBuilder().build()) * .setMetricFilter(FilterExpression.newBuilder().build()) - * .setPageSize(883849137) + * .setLimit(102976443) * .addAllMetricAggregations(new ArrayList()) * .addAllOrderBys(new ArrayList()) * .setReturnPropertyQuota(true) @@ -624,7 +583,7 @@ public final RunRealtimeReportResponse runRealtimeReport(RunRealtimeReportReques * .addAllMetrics(new ArrayList()) * .setDimensionFilter(FilterExpression.newBuilder().build()) * .setMetricFilter(FilterExpression.newBuilder().build()) - * .setPageSize(883849137) + * .setLimit(102976443) * .addAllMetricAggregations(new ArrayList()) * .addAllOrderBys(new ArrayList()) * .setReturnPropertyQuota(true) @@ -670,84 +629,4 @@ public void shutdownNow() { public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { return stub.awaitTermination(duration, unit); } - - public static class RunReportPagedResponse - extends AbstractPagedListResponse< - RunReportRequest, - RunReportResponse, - DimensionHeader, - RunReportPage, - RunReportFixedSizeCollection> { - - public static ApiFuture createAsync( - PageContext context, - ApiFuture futureResponse) { - ApiFuture futurePage = - RunReportPage.createEmptyPage().createPageAsync(context, futureResponse); - return ApiFutures.transform( - futurePage, - new ApiFunction() { - @Override - public RunReportPagedResponse apply(RunReportPage input) { - return new RunReportPagedResponse(input); - } - }, - MoreExecutors.directExecutor()); - } - - private RunReportPagedResponse(RunReportPage page) { - super(page, RunReportFixedSizeCollection.createEmptyCollection()); - } - } - - public static class RunReportPage - extends AbstractPage { - - private RunReportPage( - PageContext context, - RunReportResponse response) { - super(context, response); - } - - private static RunReportPage createEmptyPage() { - return new RunReportPage(null, null); - } - - @Override - protected RunReportPage createPage( - PageContext context, - RunReportResponse response) { - return new RunReportPage(context, response); - } - - @Override - public ApiFuture createPageAsync( - PageContext context, - ApiFuture futureResponse) { - return super.createPageAsync(context, futureResponse); - } - } - - public static class RunReportFixedSizeCollection - extends AbstractFixedSizeCollection< - RunReportRequest, - RunReportResponse, - DimensionHeader, - RunReportPage, - RunReportFixedSizeCollection> { - - private RunReportFixedSizeCollection(List pages, int collectionSize) { - super(pages, collectionSize); - } - - private static RunReportFixedSizeCollection createEmptyCollection() { - return new RunReportFixedSizeCollection(null, 0); - } - - @Override - protected RunReportFixedSizeCollection createCollection( - List pages, int collectionSize) { - return new RunReportFixedSizeCollection(pages, collectionSize); - } - } } diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataSettings.java b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataSettings.java index 6eee6aef..4272453a 100644 --- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataSettings.java +++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/BetaAnalyticsDataSettings.java @@ -16,8 +16,6 @@ package com.google.analytics.data.v1beta; -import static com.google.analytics.data.v1beta.BetaAnalyticsDataClient.RunReportPagedResponse; - import com.google.analytics.data.v1beta.stub.BetaAnalyticsDataStubSettings; import com.google.api.core.ApiFunction; import com.google.api.core.BetaApi; @@ -27,7 +25,6 @@ import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.ClientSettings; -import com.google.api.gax.rpc.PagedCallSettings; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.api.gax.rpc.UnaryCallSettings; import java.io.IOException; @@ -49,16 +46,16 @@ *

The builder of this class is recursive, so contained classes are themselves builders. When * build() is called, the tree of builders is called to create the complete settings object. * - *

For example, to set the total timeout of runPivotReport to 30 seconds: + *

For example, to set the total timeout of runReport to 30 seconds: * * 

{@code
  * BetaAnalyticsDataSettings.Builder betaAnalyticsDataSettingsBuilder =
  *     BetaAnalyticsDataSettings.newBuilder();
  * betaAnalyticsDataSettingsBuilder
- *     .runPivotReportSettings()
+ *     .runReportSettings()
  *     .setRetrySettings(
  *         betaAnalyticsDataSettingsBuilder
- *             .runPivotReportSettings()
+ *             .runReportSettings()
  *             .getRetrySettings()
  *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
@@ -71,8 +68,7 @@
 public class BetaAnalyticsDataSettings extends ClientSettings {
 
   /** Returns the object with the settings used for calls to runReport. */
-  public PagedCallSettings
-      runReportSettings() {
+  public UnaryCallSettings runReportSettings() {
     return ((BetaAnalyticsDataStubSettings) getStubSettings()).runReportSettings();
   }
 
@@ -203,8 +199,7 @@ public Builder applyToAllUnaryMethods(
     }
 
     /** Returns the builder for the settings used for calls to runReport. */
-    public PagedCallSettings.Builder
-        runReportSettings() {
+    public UnaryCallSettings.Builder runReportSettings() {
       return getStubSettingsBuilder().runReportSettings();
     }
 
diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/gapic_metadata.json b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/gapic_metadata.json
index a256b5cf..59503e06 100644
--- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/gapic_metadata.json
+++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/gapic_metadata.json
@@ -26,7 +26,7 @@
               "methods": ["runRealtimeReport", "runRealtimeReportCallable"]
             },
             "RunReport": {
-              "methods": ["runReport", "runReportPagedCallable", "runReportCallable"]
+              "methods": ["runReport", "runReportCallable"]
             }
           }
         }
diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/package-info.java b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/package-info.java
index 7fb56466..44439dd3 100644
--- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/package-info.java
+++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/package-info.java
@@ -25,21 +25,24 @@
  *
  * 
{@code
  * try (BetaAnalyticsDataClient betaAnalyticsDataClient = BetaAnalyticsDataClient.create()) {
- *   RunPivotReportRequest request =
- *       RunPivotReportRequest.newBuilder()
+ *   RunReportRequest request =
+ *       RunReportRequest.newBuilder()
  *           .setProperty("property-993141291")
  *           .addAllDimensions(new ArrayList())
  *           .addAllMetrics(new ArrayList())
  *           .addAllDateRanges(new ArrayList())
- *           .addAllPivots(new ArrayList())
  *           .setDimensionFilter(FilterExpression.newBuilder().build())
  *           .setMetricFilter(FilterExpression.newBuilder().build())
+ *           .setOffset(-1019779949)
+ *           .setLimit(102976443)
+ *           .addAllMetricAggregations(new ArrayList())
+ *           .addAllOrderBys(new ArrayList())
  *           .setCurrencyCode("currencyCode1004773790")
  *           .setCohortSpec(CohortSpec.newBuilder().build())
  *           .setKeepEmptyRows(true)
  *           .setReturnPropertyQuota(true)
  *           .build();
- *   RunPivotReportResponse response = betaAnalyticsDataClient.runPivotReport(request);
+ *   RunReportResponse response = betaAnalyticsDataClient.runReport(request);
  * }
  * }

  */
diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStub.java b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStub.java
index b186ade5..24b2ff66 100644
--- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStub.java
+++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStub.java
@@ -16,8 +16,6 @@
 
 package com.google.analytics.data.v1beta.stub;
 
-import static com.google.analytics.data.v1beta.BetaAnalyticsDataClient.RunReportPagedResponse;
-
 import com.google.analytics.data.v1beta.BatchRunPivotReportsRequest;
 import com.google.analytics.data.v1beta.BatchRunPivotReportsResponse;
 import com.google.analytics.data.v1beta.BatchRunReportsRequest;
@@ -45,10 +43,6 @@
 @Generated("by gapic-generator-java")
 public abstract class BetaAnalyticsDataStub implements BackgroundResource {
 
-  public UnaryCallable runReportPagedCallable() {
-    throw new UnsupportedOperationException("Not implemented: runReportPagedCallable()");
-  }
-
   public UnaryCallable runReportCallable() {
     throw new UnsupportedOperationException("Not implemented: runReportCallable()");
   }
diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStubSettings.java b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStubSettings.java
index 7f60eec6..855ac2e9 100644
--- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStubSettings.java
+++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/BetaAnalyticsDataStubSettings.java
@@ -16,13 +16,10 @@
 
 package com.google.analytics.data.v1beta.stub;
 
-import static com.google.analytics.data.v1beta.BetaAnalyticsDataClient.RunReportPagedResponse;
-
 import com.google.analytics.data.v1beta.BatchRunPivotReportsRequest;
 import com.google.analytics.data.v1beta.BatchRunPivotReportsResponse;
 import com.google.analytics.data.v1beta.BatchRunReportsRequest;
 import com.google.analytics.data.v1beta.BatchRunReportsResponse;
-import com.google.analytics.data.v1beta.DimensionHeader;
 import com.google.analytics.data.v1beta.GetMetadataRequest;
 import com.google.analytics.data.v1beta.Metadata;
 import com.google.analytics.data.v1beta.RunPivotReportRequest;
@@ -32,7 +29,6 @@
 import com.google.analytics.data.v1beta.RunReportRequest;
 import com.google.analytics.data.v1beta.RunReportResponse;
 import com.google.api.core.ApiFunction;
-import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
@@ -41,18 +37,12 @@
 import com.google.api.gax.grpc.GrpcTransportChannel;
 import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
 import com.google.api.gax.retrying.RetrySettings;
-import com.google.api.gax.rpc.ApiCallContext;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.PageContext;
-import com.google.api.gax.rpc.PagedCallSettings;
-import com.google.api.gax.rpc.PagedListDescriptor;
-import com.google.api.gax.rpc.PagedListResponseFactory;
 import com.google.api.gax.rpc.StatusCode;
 import com.google.api.gax.rpc.StubSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
-import com.google.api.gax.rpc.UnaryCallable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
@@ -77,16 +67,16 @@
  * 
The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * 
For example, to set the total timeout of runPivotReport to 30 seconds:
+ * 
For example, to set the total timeout of runReport to 30 seconds:
  *
  * 
{@code
  * BetaAnalyticsDataStubSettings.Builder betaAnalyticsDataSettingsBuilder =
  *     BetaAnalyticsDataStubSettings.newBuilder();
  * betaAnalyticsDataSettingsBuilder
- *     .runPivotReportSettings()
+ *     .runReportSettings()
  *     .setRetrySettings(
  *         betaAnalyticsDataSettingsBuilder
- *             .runPivotReportSettings()
+ *             .runReportSettings()
  *             .getRetrySettings()
  *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
@@ -105,8 +95,7 @@ public class BetaAnalyticsDataStubSettings extends StubSettings
-      runReportSettings;
+  private final UnaryCallSettings runReportSettings;
   private final UnaryCallSettings
       runPivotReportSettings;
   private final UnaryCallSettings
@@ -117,62 +106,8 @@ public class BetaAnalyticsDataStubSettings extends StubSettings
       runRealtimeReportSettings;
 
-  private static final PagedListDescriptor
-      RUN_REPORT_PAGE_STR_DESC =
-          new PagedListDescriptor() {
-            @Override
-            public String emptyToken() {
-              return "";
-            }
-
-            @Override
-            public RunReportRequest injectToken(RunReportRequest payload, String token) {
-              return RunReportRequest.newBuilder(payload).setPageToken(token).build();
-            }
-
-            @Override
-            public RunReportRequest injectPageSize(RunReportRequest payload, int pageSize) {
-              return RunReportRequest.newBuilder(payload).setPageSize(pageSize).build();
-            }
-
-            @Override
-            public Integer extractPageSize(RunReportRequest payload) {
-              return payload.getPageSize();
-            }
-
-            @Override
-            public String extractNextToken(RunReportResponse payload) {
-              return payload.getNextPageToken();
-            }
-
-            @Override
-            public Iterable extractResources(RunReportResponse payload) {
-              return payload.getDimensionHeadersList() == null
-                  ? ImmutableList.of()
-                  : payload.getDimensionHeadersList();
-            }
-          };
-
-  private static final PagedListResponseFactory<
-          RunReportRequest, RunReportResponse, RunReportPagedResponse>
-      RUN_REPORT_PAGE_STR_FACT =
-          new PagedListResponseFactory<
-              RunReportRequest, RunReportResponse, RunReportPagedResponse>() {
-            @Override
-            public ApiFuture getFuturePagedResponse(
-                UnaryCallable callable,
-                RunReportRequest request,
-                ApiCallContext context,
-                ApiFuture futureResponse) {
-              PageContext pageContext =
-                  PageContext.create(callable, RUN_REPORT_PAGE_STR_DESC, request, context);
-              return RunReportPagedResponse.createAsync(pageContext, futureResponse);
-            }
-          };
-
   /** Returns the object with the settings used for calls to runReport. */
-  public PagedCallSettings
-      runReportSettings() {
+  public UnaryCallSettings runReportSettings() {
     return runReportSettings;
   }
 
@@ -284,9 +219,7 @@ protected BetaAnalyticsDataStubSettings(Builder settingsBuilder) throws IOExcept
   /** Builder for BetaAnalyticsDataStubSettings. */
   public static class Builder extends StubSettings.Builder {
     private final ImmutableList> unaryMethodSettingsBuilders;
-    private final PagedCallSettings.Builder<
-            RunReportRequest, RunReportResponse, RunReportPagedResponse>
-        runReportSettings;
+    private final UnaryCallSettings.Builder runReportSettings;
     private final UnaryCallSettings.Builder
         runPivotReportSettings;
     private final UnaryCallSettings.Builder
@@ -345,7 +278,7 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      runReportSettings = PagedCallSettings.newBuilder(RUN_REPORT_PAGE_STR_FACT);
+      runReportSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       runPivotReportSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       batchRunReportsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       batchRunPivotReportsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -445,8 +378,7 @@ public Builder applyToAllUnaryMethods(
     }
 
     /** Returns the builder for the settings used for calls to runReport. */
-    public PagedCallSettings.Builder
-        runReportSettings() {
+    public UnaryCallSettings.Builder runReportSettings() {
       return runReportSettings;
     }
 
diff --git a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/GrpcBetaAnalyticsDataStub.java b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/GrpcBetaAnalyticsDataStub.java
index 4510296c..4af9c235 100644
--- a/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/GrpcBetaAnalyticsDataStub.java
+++ b/google-analytics-data/src/main/java/com/google/analytics/data/v1beta/stub/GrpcBetaAnalyticsDataStub.java
@@ -16,8 +16,6 @@
 
 package com.google.analytics.data.v1beta.stub;
 
-import static com.google.analytics.data.v1beta.BetaAnalyticsDataClient.RunReportPagedResponse;
-
 import com.google.analytics.data.v1beta.BatchRunPivotReportsRequest;
 import com.google.analytics.data.v1beta.BatchRunPivotReportsResponse;
 import com.google.analytics.data.v1beta.BatchRunReportsRequest;
@@ -119,7 +117,6 @@ public class GrpcBetaAnalyticsDataStub extends BetaAnalyticsDataStub {
               .build();
 
   private final UnaryCallable runReportCallable;
-  private final UnaryCallable runReportPagedCallable;
   private final UnaryCallable runPivotReportCallable;
   private final UnaryCallable
       batchRunReportsCallable;
@@ -259,9 +256,6 @@ public Map extract(RunRealtimeReportRequest request) {
     this.runReportCallable =
         callableFactory.createUnaryCallable(
             runReportTransportSettings, settings.runReportSettings(), clientContext);
-    this.runReportPagedCallable =
-        callableFactory.createPagedCallable(
-            runReportTransportSettings, settings.runReportSettings(), clientContext);
     this.runPivotReportCallable =
         callableFactory.createUnaryCallable(
             runPivotReportTransportSettings, settings.runPivotReportSettings(), clientContext);
@@ -295,11 +289,6 @@ public UnaryCallable runReportCallable() {
     return runReportCallable;
   }
 
-  @Override
-  public UnaryCallable runReportPagedCallable() {
-    return runReportPagedCallable;
-  }
-
   @Override
   public UnaryCallable runPivotReportCallable() {
     return runPivotReportCallable;
diff --git a/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java b/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java
index f6209496..f4e055aa 100644
--- a/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java
+++ b/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java
@@ -16,8 +16,6 @@
 
 package com.google.analytics.data.v1beta;
 
-import static com.google.analytics.data.v1beta.BetaAnalyticsDataClient.RunReportPagedResponse;
-
 import com.google.api.gax.core.NoCredentialsProvider;
 import com.google.api.gax.grpc.GaxGrpcProperties;
 import com.google.api.gax.grpc.testing.LocalChannelProvider;
@@ -25,7 +23,6 @@
 import com.google.api.gax.grpc.testing.MockServiceHelper;
 import com.google.api.gax.rpc.ApiClientHeaderProvider;
 import com.google.api.gax.rpc.InvalidArgumentException;
-import com.google.common.collect.Lists;
 import com.google.protobuf.AbstractMessage;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
@@ -81,11 +78,17 @@ public void tearDown() throws Exception {
 
   @Test
   public void runReportTest() throws Exception {
-    DimensionHeader responsesElement = DimensionHeader.newBuilder().build();
     RunReportResponse expectedResponse =
         RunReportResponse.newBuilder()
-            .setNextPageToken("")
-            .addAllDimensionHeaders(Arrays.asList(responsesElement))
+            .addAllDimensionHeaders(new ArrayList())
+            .addAllMetricHeaders(new ArrayList())
+            .addAllRows(new ArrayList())
+            .addAllTotals(new ArrayList())
+            .addAllMaximums(new ArrayList())
+            .addAllMinimums(new ArrayList())
+            .setRowCount(1340416618)
+            .setMetadata(ResponseMetaData.newBuilder().build())
+            .setPropertyQuota(PropertyQuota.newBuilder().build())
             .build();
     mockBetaAnalyticsData.addResponse(expectedResponse);
 
@@ -97,8 +100,8 @@ public void runReportTest() throws Exception {
             .addAllDateRanges(new ArrayList())
             .setDimensionFilter(FilterExpression.newBuilder().build())
             .setMetricFilter(FilterExpression.newBuilder().build())
-            .setPageSize(883849137)
-            .setPageToken("pageToken873572522")
+            .setOffset(-1019779949)
+            .setLimit(102976443)
             .addAllMetricAggregations(new ArrayList())
             .addAllOrderBys(new ArrayList())
             .setCurrencyCode("currencyCode1004773790")
@@ -107,12 +110,8 @@ public void runReportTest() throws Exception {
             .setReturnPropertyQuota(true)
             .build();
 
-    RunReportPagedResponse pagedListResponse = client.runReport(request);
-
-    List resources = Lists.newArrayList(pagedListResponse.iterateAll());
-
-    Assert.assertEquals(1, resources.size());
-    Assert.assertEquals(expectedResponse.getDimensionHeadersList().get(0), resources.get(0));
+    RunReportResponse actualResponse = client.runReport(request);
+    Assert.assertEquals(expectedResponse, actualResponse);
 
     List actualRequests = mockBetaAnalyticsData.getRequests();
     Assert.assertEquals(1, actualRequests.size());
@@ -124,8 +123,8 @@ public void runReportTest() throws Exception {
     Assert.assertEquals(request.getDateRangesList(), actualRequest.getDateRangesList());
     Assert.assertEquals(request.getDimensionFilter(), actualRequest.getDimensionFilter());
     Assert.assertEquals(request.getMetricFilter(), actualRequest.getMetricFilter());
-    Assert.assertEquals(request.getPageSize(), actualRequest.getPageSize());
-    Assert.assertEquals(request.getPageToken(), actualRequest.getPageToken());
+    Assert.assertEquals(request.getOffset(), actualRequest.getOffset());
+    Assert.assertEquals(request.getLimit(), actualRequest.getLimit());
     Assert.assertEquals(
         request.getMetricAggregationsList(), actualRequest.getMetricAggregationsList());
     Assert.assertEquals(request.getOrderBysList(), actualRequest.getOrderBysList());
@@ -153,8 +152,8 @@ public void runReportExceptionTest() throws Exception {
               .addAllDateRanges(new ArrayList())
               .setDimensionFilter(FilterExpression.newBuilder().build())
               .setMetricFilter(FilterExpression.newBuilder().build())
-              .setPageSize(883849137)
-              .setPageToken("pageToken873572522")
+              .setOffset(-1019779949)
+              .setLimit(102976443)
               .addAllMetricAggregations(new ArrayList())
               .addAllOrderBys(new ArrayList())
               .setCurrencyCode("currencyCode1004773790")
@@ -434,7 +433,7 @@ public void runRealtimeReportTest() throws Exception {
             .addAllTotals(new ArrayList())
             .addAllMaximums(new ArrayList())
             .addAllMinimums(new ArrayList())
-            .setTotalSize(-705419236)
+            .setRowCount(1340416618)
             .setPropertyQuota(PropertyQuota.newBuilder().build())
             .build();
     mockBetaAnalyticsData.addResponse(expectedResponse);
@@ -446,7 +445,7 @@ public void runRealtimeReportTest() throws Exception {
             .addAllMetrics(new ArrayList())
             .setDimensionFilter(FilterExpression.newBuilder().build())
             .setMetricFilter(FilterExpression.newBuilder().build())
-            .setPageSize(883849137)
+            .setLimit(102976443)
             .addAllMetricAggregations(new ArrayList())
             .addAllOrderBys(new ArrayList())
             .setReturnPropertyQuota(true)
@@ -464,7 +463,7 @@ public void runRealtimeReportTest() throws Exception {
     Assert.assertEquals(request.getMetricsList(), actualRequest.getMetricsList());
     Assert.assertEquals(request.getDimensionFilter(), actualRequest.getDimensionFilter());
     Assert.assertEquals(request.getMetricFilter(), actualRequest.getMetricFilter());
-    Assert.assertEquals(request.getPageSize(), actualRequest.getPageSize());
+    Assert.assertEquals(request.getLimit(), actualRequest.getLimit());
     Assert.assertEquals(
         request.getMetricAggregationsList(), actualRequest.getMetricAggregationsList());
     Assert.assertEquals(request.getOrderBysList(), actualRequest.getOrderBysList());
@@ -488,7 +487,7 @@ public void runRealtimeReportExceptionTest() throws Exception {
               .addAllMetrics(new ArrayList())
               .setDimensionFilter(FilterExpression.newBuilder().build())
               .setMetricFilter(FilterExpression.newBuilder().build())
-              .setPageSize(883849137)
+              .setLimit(102976443)
               .addAllMetricAggregations(new ArrayList())
               .addAllOrderBys(new ArrayList())
               .setReturnPropertyQuota(true)
diff --git a/proto-google-analytics-data-v1beta/clirr-ignored-differences.xml b/proto-google-analytics-data-v1beta/clirr-ignored-differences.xml
index 2e38d286..ae19502e 100644
--- a/proto-google-analytics-data-v1beta/clirr-ignored-differences.xml
+++ b/proto-google-analytics-data-v1beta/clirr-ignored-differences.xml
@@ -16,4 +16,49 @@
     com/google/analytics/data/v1beta/*OrBuilder
     boolean has*(*)
   
+  
+    7002
+    com/google/analytics/data/v1beta/*Request*
+    * get*(*)
+  
+  
+    7002
+    com/google/analytics/data/v1beta/*Request*
+    * set*(*)
+  
+  
+    7002
+    com/google/analytics/data/v1beta/*Request*
+    * clear*(*)
+  
+  
+    7002
+    com/google/analytics/data/v1beta/*Response*
+    * get*(*)
+  
+  
+    7002
+    com/google/analytics/data/v1beta/*Response*
+    * set*(*)
+  
+  
+    7002
+    com/google/analytics/data/v1beta/*Response*
+    * clear*(*)
+  
+  
+    6011
+    com/google/analytics/data/v1beta/*Request*
+    *_FIELD_NUMBER
+  
+  
+    6011
+    com/google/analytics/data/v1beta/*Response*
+    *_FIELD_NUMBER
+  
+  
+    6003
+    com/google/analytics/data/v1beta/*Response*
+    *_FIELD_NUMBER
+  
 
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java
index a6b8318a..81e32b4a 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java
@@ -95,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "DimensionMetadata\022=\n\007metrics\030\002 \003(\0132,.goo"
           + "gle.analytics.data.v1beta.MetricMetadata"
           + ":J\352AG\n%analyticsdata.googleapis.com/Meta"
-          + "data\022\036properties/{property}/metadata\"\244\005\n"
+          + "data\022\036properties/{property}/metadata\"\234\005\n"
           + "\020RunReportRequest\022\020\n\010property\030\001 \001(\t\022;\n\nd"
           + "imensions\030\002 \003(\0132\'.google.analytics.data."
           + "v1beta.Dimension\0225\n\007metrics\030\003 \003(\0132$.goog"
@@ -104,127 +104,126 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "eta.DateRange\022H\n\020dimension_filter\030\005 \001(\0132"
           + "..google.analytics.data.v1beta.FilterExp"
           + "ression\022E\n\rmetric_filter\030\006 \001(\0132..google."
-          + "analytics.data.v1beta.FilterExpression\022\021"
-          + "\n\tpage_size\030\007 \001(\005\022\022\n\npage_token\030\010 \001(\t\022L\n"
-          + "\023metric_aggregations\030\t \003(\0162/.google.anal"
-          + "ytics.data.v1beta.MetricAggregation\0228\n\to"
-          + "rder_bys\030\n \003(\0132%.google.analytics.data.v"
-          + "1beta.OrderBy\022\025\n\rcurrency_code\030\013 \001(\t\022=\n\013"
-          + "cohort_spec\030\014 \001(\0132(.google.analytics.dat"
-          + "a.v1beta.CohortSpec\022\027\n\017keep_empty_rows\030\r"
-          + " \001(\010\022\035\n\025return_property_quota\030\016 \001(\010\"\243\004\n\021"
-          + "RunReportResponse\022H\n\021dimension_headers\030\001"
-          + " \003(\0132-.google.analytics.data.v1beta.Dime"
-          + "nsionHeader\022B\n\016metric_headers\030\002 \003(\0132*.go"
-          + "ogle.analytics.data.v1beta.MetricHeader\022"
-          + "/\n\004rows\030\003 \003(\0132!.google.analytics.data.v1"
-          + "beta.Row\0221\n\006totals\030\004 \003(\0132!.google.analyt"
-          + "ics.data.v1beta.Row\0223\n\010maximums\030\005 \003(\0132!."
-          + "google.analytics.data.v1beta.Row\0223\n\010mini"
-          + "mums\030\006 \003(\0132!.google.analytics.data.v1bet"
-          + "a.Row\022\027\n\017next_page_token\030\007 \001(\t\022\022\n\ntotal_"
-          + "size\030\010 \001(\005\022@\n\010metadata\030\t \001(\0132..google.an"
-          + "alytics.data.v1beta.ResponseMetaData\022C\n\016"
-          + "property_quota\030\n \001(\0132+.google.analytics."
-          + "data.v1beta.PropertyQuota\"\257\004\n\025RunPivotRe"
+          + "analytics.data.v1beta.FilterExpression\022\016"
+          + "\n\006offset\030\007 \001(\003\022\r\n\005limit\030\010 \001(\003\022L\n\023metric_"
+          + "aggregations\030\t \003(\0162/.google.analytics.da"
+          + "ta.v1beta.MetricAggregation\0228\n\torder_bys"
+          + "\030\n \003(\0132%.google.analytics.data.v1beta.Or"
+          + "derBy\022\025\n\rcurrency_code\030\013 \001(\t\022=\n\013cohort_s"
+          + "pec\030\014 \001(\0132(.google.analytics.data.v1beta"
+          + ".CohortSpec\022\027\n\017keep_empty_rows\030\r \001(\010\022\035\n\025"
+          + "return_property_quota\030\016 \001(\010\"\211\004\n\021RunRepor"
+          + "tResponse\022H\n\021dimension_headers\030\001 \003(\0132-.g"
+          + "oogle.analytics.data.v1beta.DimensionHea"
+          + "der\022B\n\016metric_headers\030\002 \003(\0132*.google.ana"
+          + "lytics.data.v1beta.MetricHeader\022/\n\004rows\030"
+          + "\003 \003(\0132!.google.analytics.data.v1beta.Row"
+          + "\0221\n\006totals\030\004 \003(\0132!.google.analytics.data"
+          + ".v1beta.Row\0223\n\010maximums\030\005 \003(\0132!.google.a"
+          + "nalytics.data.v1beta.Row\0223\n\010minimums\030\006 \003"
+          + "(\0132!.google.analytics.data.v1beta.Row\022\021\n"
+          + "\trow_count\030\007 \001(\005\022@\n\010metadata\030\010 \001(\0132..goo"
+          + "gle.analytics.data.v1beta.ResponseMetaDa"
+          + "ta\022C\n\016property_quota\030\t \001(\0132+.google.anal"
+          + "ytics.data.v1beta.PropertyQuota\"\257\004\n\025RunP"
+          + "ivotReportRequest\022\020\n\010property\030\001 \001(\t\022;\n\nd"
+          + "imensions\030\002 \003(\0132\'.google.analytics.data."
+          + "v1beta.Dimension\0225\n\007metrics\030\003 \003(\0132$.goog"
+          + "le.analytics.data.v1beta.Metric\022<\n\013date_"
+          + "ranges\030\004 \003(\0132\'.google.analytics.data.v1b"
+          + "eta.DateRange\0223\n\006pivots\030\005 \003(\0132#.google.a"
+          + "nalytics.data.v1beta.Pivot\022H\n\020dimension_"
+          + "filter\030\006 \001(\0132..google.analytics.data.v1b"
+          + "eta.FilterExpression\022E\n\rmetric_filter\030\007 "
+          + "\001(\0132..google.analytics.data.v1beta.Filte"
+          + "rExpression\022\025\n\rcurrency_code\030\010 \001(\t\022=\n\013co"
+          + "hort_spec\030\t \001(\0132(.google.analytics.data."
+          + "v1beta.CohortSpec\022\027\n\017keep_empty_rows\030\n \001"
+          + "(\010\022\035\n\025return_property_quota\030\013 \001(\010\"\327\003\n\026Ru"
+          + "nPivotReportResponse\022@\n\rpivot_headers\030\001 "
+          + "\003(\0132).google.analytics.data.v1beta.Pivot"
+          + "Header\022H\n\021dimension_headers\030\002 \003(\0132-.goog"
+          + "le.analytics.data.v1beta.DimensionHeader"
+          + "\022B\n\016metric_headers\030\003 \003(\0132*.google.analyt"
+          + "ics.data.v1beta.MetricHeader\022/\n\004rows\030\004 \003"
+          + "(\0132!.google.analytics.data.v1beta.Row\0225\n"
+          + "\naggregates\030\005 \003(\0132!.google.analytics.dat"
+          + "a.v1beta.Row\022@\n\010metadata\030\006 \001(\0132..google."
+          + "analytics.data.v1beta.ResponseMetaData\022C"
+          + "\n\016property_quota\030\007 \001(\0132+.google.analytic"
+          + "s.data.v1beta.PropertyQuota\"l\n\026BatchRunR"
+          + "eportsRequest\022\020\n\010property\030\001 \001(\t\022@\n\010reque"
+          + "sts\030\002 \003(\0132..google.analytics.data.v1beta"
+          + ".RunReportRequest\"[\n\027BatchRunReportsResp"
+          + "onse\022@\n\007reports\030\001 \003(\0132/.google.analytics"
+          + ".data.v1beta.RunReportResponse\"v\n\033BatchR"
+          + "unPivotReportsRequest\022\020\n\010property\030\001 \001(\t\022"
+          + "E\n\010requests\030\002 \003(\01323.google.analytics.dat"
+          + "a.v1beta.RunPivotReportRequest\"k\n\034BatchR"
+          + "unPivotReportsResponse\022K\n\rpivot_reports\030"
+          + "\001 \003(\01324.google.analytics.data.v1beta.Run"
+          + "PivotReportResponse\"Q\n\022GetMetadataReques"
+          + "t\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n%analyticsdata.g"
+          + "oogleapis.com/Metadata\"\347\003\n\030RunRealtimeRe"
           + "portRequest\022\020\n\010property\030\001 \001(\t\022;\n\ndimensi"
           + "ons\030\002 \003(\0132\'.google.analytics.data.v1beta"
           + ".Dimension\0225\n\007metrics\030\003 \003(\0132$.google.ana"
-          + "lytics.data.v1beta.Metric\022<\n\013date_ranges"
-          + "\030\004 \003(\0132\'.google.analytics.data.v1beta.Da"
-          + "teRange\0223\n\006pivots\030\005 \003(\0132#.google.analyti"
-          + "cs.data.v1beta.Pivot\022H\n\020dimension_filter"
-          + "\030\006 \001(\0132..google.analytics.data.v1beta.Fi"
-          + "lterExpression\022E\n\rmetric_filter\030\007 \001(\0132.."
-          + "google.analytics.data.v1beta.FilterExpre"
-          + "ssion\022\025\n\rcurrency_code\030\010 \001(\t\022=\n\013cohort_s"
-          + "pec\030\t \001(\0132(.google.analytics.data.v1beta"
-          + ".CohortSpec\022\027\n\017keep_empty_rows\030\n \001(\010\022\035\n\025"
-          + "return_property_quota\030\013 \001(\010\"\327\003\n\026RunPivot"
-          + "ReportResponse\022@\n\rpivot_headers\030\001 \003(\0132)."
-          + "google.analytics.data.v1beta.PivotHeader"
-          + "\022H\n\021dimension_headers\030\002 \003(\0132-.google.ana"
-          + "lytics.data.v1beta.DimensionHeader\022B\n\016me"
-          + "tric_headers\030\003 \003(\0132*.google.analytics.da"
-          + "ta.v1beta.MetricHeader\022/\n\004rows\030\004 \003(\0132!.g"
-          + "oogle.analytics.data.v1beta.Row\0225\n\naggre"
-          + "gates\030\005 \003(\0132!.google.analytics.data.v1be"
-          + "ta.Row\022@\n\010metadata\030\006 \001(\0132..google.analyt"
-          + "ics.data.v1beta.ResponseMetaData\022C\n\016prop"
-          + "erty_quota\030\007 \001(\0132+.google.analytics.data"
-          + ".v1beta.PropertyQuota\"l\n\026BatchRunReports"
-          + "Request\022\020\n\010property\030\001 \001(\t\022@\n\010requests\030\002 "
-          + "\003(\0132..google.analytics.data.v1beta.RunRe"
-          + "portRequest\"[\n\027BatchRunReportsResponse\022@"
-          + "\n\007reports\030\001 \003(\0132/.google.analytics.data."
-          + "v1beta.RunReportResponse\"v\n\033BatchRunPivo"
-          + "tReportsRequest\022\020\n\010property\030\001 \001(\t\022E\n\010req"
-          + "uests\030\002 \003(\01323.google.analytics.data.v1be"
-          + "ta.RunPivotReportRequest\"k\n\034BatchRunPivo"
-          + "tReportsResponse\022K\n\rpivot_reports\030\001 \003(\0132"
-          + "4.google.analytics.data.v1beta.RunPivotR"
-          + "eportResponse\"Q\n\022GetMetadataRequest\022;\n\004n"
-          + "ame\030\001 \001(\tB-\340A\002\372A\'\n%analyticsdata.googlea"
-          + "pis.com/Metadata\"\353\003\n\030RunRealtimeReportRe"
-          + "quest\022\020\n\010property\030\001 \001(\t\022;\n\ndimensions\030\002 "
-          + "\003(\0132\'.google.analytics.data.v1beta.Dimen"
-          + "sion\0225\n\007metrics\030\003 \003(\0132$.google.analytics"
-          + ".data.v1beta.Metric\022H\n\020dimension_filter\030"
-          + "\004 \001(\0132..google.analytics.data.v1beta.Fil"
-          + "terExpression\022E\n\rmetric_filter\030\005 \001(\0132..g"
-          + "oogle.analytics.data.v1beta.FilterExpres"
-          + "sion\022\021\n\tpage_size\030\006 \001(\005\022L\n\023metric_aggreg"
-          + "ations\030\007 \003(\0162/.google.analytics.data.v1b"
-          + "eta.MetricAggregation\0228\n\torder_bys\030\010 \003(\013"
-          + "2%.google.analytics.data.v1beta.OrderBy\022"
-          + "\035\n\025return_property_quota\030\t \001(\010\"\320\003\n\031RunRe"
-          + "altimeReportResponse\022H\n\021dimension_header"
-          + "s\030\001 \003(\0132-.google.analytics.data.v1beta.D"
-          + "imensionHeader\022B\n\016metric_headers\030\002 \003(\0132*"
-          + ".google.analytics.data.v1beta.MetricHead"
-          + "er\022/\n\004rows\030\003 \003(\0132!.google.analytics.data"
-          + ".v1beta.Row\0221\n\006totals\030\004 \003(\0132!.google.ana"
-          + "lytics.data.v1beta.Row\0223\n\010maximums\030\005 \003(\013"
-          + "2!.google.analytics.data.v1beta.Row\0223\n\010m"
-          + "inimums\030\006 \003(\0132!.google.analytics.data.v1"
-          + "beta.Row\022\022\n\ntotal_size\030\007 \001(\005\022C\n\016property"
-          + "_quota\030\010 \001(\0132+.google.analytics.data.v1b"
-          + "eta.PropertyQuota2\343\t\n\021BetaAnalyticsData\022"
-          + "\242\001\n\tRunReport\022..google.analytics.data.v1"
-          + "beta.RunReportRequest\032/.google.analytics"
-          + ".data.v1beta.RunReportResponse\"4\202\323\344\223\002.\")"
-          + "/v1beta/{property=properties/*}:runRepor"
-          + "t:\001*\022\266\001\n\016RunPivotReport\0223.google.analyti"
-          + "cs.data.v1beta.RunPivotReportRequest\0324.g"
-          + "oogle.analytics.data.v1beta.RunPivotRepo"
-          + "rtResponse\"9\202\323\344\223\0023\"./v1beta/{property=pr"
-          + "operties/*}:runPivotReport:\001*\022\272\001\n\017BatchR"
-          + "unReports\0224.google.analytics.data.v1beta"
-          + ".BatchRunReportsRequest\0325.google.analyti"
-          + "cs.data.v1beta.BatchRunReportsResponse\":"
-          + "\202\323\344\223\0024\"//v1beta/{property=properties/*}:"
-          + "batchRunReports:\001*\022\316\001\n\024BatchRunPivotRepo"
-          + "rts\0229.google.analytics.data.v1beta.Batch"
-          + "RunPivotReportsRequest\032:.google.analytic"
-          + "s.data.v1beta.BatchRunPivotReportsRespon"
-          + "se\"?\202\323\344\223\0029\"4/v1beta/{property=properties"
-          + "/*}:batchRunPivotReports:\001*\022\234\001\n\013GetMetad"
-          + "ata\0220.google.analytics.data.v1beta.GetMe"
-          + "tadataRequest\032&.google.analytics.data.v1"
-          + "beta.Metadata\"3\202\323\344\223\002&\022$/v1beta/{name=pro"
-          + "perties/*/metadata}\332A\004name\022\302\001\n\021RunRealti"
-          + "meReport\0226.google.analytics.data.v1beta."
-          + "RunRealtimeReportRequest\0327.google.analyt"
-          + "ics.data.v1beta.RunRealtimeReportRespons"
-          + "e\"<\202\323\344\223\0026\"1/v1beta/{property=properties/"
-          + "*}:runRealtimeReport:\001*\032~\312A\034analyticsdat"
-          + "a.googleapis.com\322A\\https://www.googleapi"
-          + "s.com/auth/analytics,https://www.googlea"
-          + "pis.com/auth/analytics.readonlyB}\n com.g"
-          + "oogle.analytics.data.v1betaB\025AnalyticsDa"
-          + "taApiProtoP\001Z@google.golang.org/genproto"
-          + "/googleapis/analytics/data/v1beta;datab\006"
-          + "proto3"
+          + "lytics.data.v1beta.Metric\022H\n\020dimension_f"
+          + "ilter\030\004 \001(\0132..google.analytics.data.v1be"
+          + "ta.FilterExpression\022E\n\rmetric_filter\030\005 \001"
+          + "(\0132..google.analytics.data.v1beta.Filter"
+          + "Expression\022\r\n\005limit\030\006 \001(\003\022L\n\023metric_aggr"
+          + "egations\030\007 \003(\0162/.google.analytics.data.v"
+          + "1beta.MetricAggregation\0228\n\torder_bys\030\010 \003"
+          + "(\0132%.google.analytics.data.v1beta.OrderB"
+          + "y\022\035\n\025return_property_quota\030\t \001(\010\"\317\003\n\031Run"
+          + "RealtimeReportResponse\022H\n\021dimension_head"
+          + "ers\030\001 \003(\0132-.google.analytics.data.v1beta"
+          + ".DimensionHeader\022B\n\016metric_headers\030\002 \003(\013"
+          + "2*.google.analytics.data.v1beta.MetricHe"
+          + "ader\022/\n\004rows\030\003 \003(\0132!.google.analytics.da"
+          + "ta.v1beta.Row\0221\n\006totals\030\004 \003(\0132!.google.a"
+          + "nalytics.data.v1beta.Row\0223\n\010maximums\030\005 \003"
+          + "(\0132!.google.analytics.data.v1beta.Row\0223\n"
+          + "\010minimums\030\006 \003(\0132!.google.analytics.data."
+          + "v1beta.Row\022\021\n\trow_count\030\007 \001(\005\022C\n\016propert"
+          + "y_quota\030\010 \001(\0132+.google.analytics.data.v1"
+          + "beta.PropertyQuota2\343\t\n\021BetaAnalyticsData"
+          + "\022\242\001\n\tRunReport\022..google.analytics.data.v"
+          + "1beta.RunReportRequest\032/.google.analytic"
+          + "s.data.v1beta.RunReportResponse\"4\202\323\344\223\002.\""
+          + ")/v1beta/{property=properties/*}:runRepo"
+          + "rt:\001*\022\266\001\n\016RunPivotReport\0223.google.analyt"
+          + "ics.data.v1beta.RunPivotReportRequest\0324."
+          + "google.analytics.data.v1beta.RunPivotRep"
+          + "ortResponse\"9\202\323\344\223\0023\"./v1beta/{property=p"
+          + "roperties/*}:runPivotReport:\001*\022\272\001\n\017Batch"
+          + "RunReports\0224.google.analytics.data.v1bet"
+          + "a.BatchRunReportsRequest\0325.google.analyt"
+          + "ics.data.v1beta.BatchRunReportsResponse\""
+          + ":\202\323\344\223\0024\"//v1beta/{property=properties/*}"
+          + ":batchRunReports:\001*\022\316\001\n\024BatchRunPivotRep"
+          + "orts\0229.google.analytics.data.v1beta.Batc"
+          + "hRunPivotReportsRequest\032:.google.analyti"
+          + "cs.data.v1beta.BatchRunPivotReportsRespo"
+          + "nse\"?\202\323\344\223\0029\"4/v1beta/{property=propertie"
+          + "s/*}:batchRunPivotReports:\001*\022\234\001\n\013GetMeta"
+          + "data\0220.google.analytics.data.v1beta.GetM"
+          + "etadataRequest\032&.google.analytics.data.v"
+          + "1beta.Metadata\"3\202\323\344\223\002&\022$/v1beta/{name=pr"
+          + "operties/*/metadata}\332A\004name\022\302\001\n\021RunRealt"
+          + "imeReport\0226.google.analytics.data.v1beta"
+          + ".RunRealtimeReportRequest\0327.google.analy"
+          + "tics.data.v1beta.RunRealtimeReportRespon"
+          + "se\"<\202\323\344\223\0026\"1/v1beta/{property=properties"
+          + "/*}:runRealtimeReport:\001*\032~\312A\034analyticsda"
+          + "ta.googleapis.com\322A\\https://www.googleap"
+          + "is.com/auth/analytics,https://www.google"
+          + "apis.com/auth/analytics.readonlyB}\n com."
+          + "google.analytics.data.v1betaB\025AnalyticsD"
+          + "ataApiProtoP\001Z@google.golang.org/genprot"
+          + "o/googleapis/analytics/data/v1beta;datab"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -256,8 +255,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "DateRanges",
               "DimensionFilter",
               "MetricFilter",
-              "PageSize",
-              "PageToken",
+              "Offset",
+              "Limit",
               "MetricAggregations",
               "OrderBys",
               "CurrencyCode",
@@ -277,8 +276,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Totals",
               "Maximums",
               "Minimums",
-              "NextPageToken",
-              "TotalSize",
+              "RowCount",
               "Metadata",
               "PropertyQuota",
             });
@@ -365,7 +363,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Metrics",
               "DimensionFilter",
               "MetricFilter",
-              "PageSize",
+              "Limit",
               "MetricAggregations",
               "OrderBys",
               "ReturnPropertyQuota",
@@ -382,7 +380,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Totals",
               "Maximums",
               "Minimums",
-              "TotalSize",
+              "RowCount",
               "PropertyQuota",
             });
     com.google.protobuf.ExtensionRegistry registry =
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java
index d541834f..8ee3c728 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequest.java
@@ -140,7 +140,7 @@ private RunRealtimeReportRequest(
             }
           case 48:
             {
-              pageSize_ = input.readInt32();
+              limit_ = input.readInt64();
               break;
             }
           case 56:
@@ -530,31 +530,29 @@ public com.google.analytics.data.v1beta.FilterExpressionOrBuilder getMetricFilte
     return getMetricFilter();
   }
 
-  public static final int PAGE_SIZE_FIELD_NUMBER = 6;
-  private int pageSize_;
+  public static final int LIMIT_FIELD_NUMBER = 6;
+  private long limit_;
   /**
    *
    *
    * 
-   * Page size specifies maximum number of rows to return. If unspecified, up to
-   * 10,000 rows are returned. The API returns a maximum of 100,000 rows per
-   * request, no matter how many you ask for. Page size must be positive.
-   * The API can also return fewer rows than the requested `pageSize`, if there
-   * aren't as many dimension values as the `pageSize`. For instance, there are
+   * The number of rows to return. If unspecified, 10,000 rows are returned. The
+   * API returns a maximum of 100,000 rows per request, no matter how many you
+   * ask for. `limit` must be positive.
+   * The API can also return fewer rows than the requested `limit`, if there
+   * aren't as many dimension values as the `limit`. For instance, there are
    * fewer than 300 possible values for the dimension `country`, so when
    * reporting on only `country`, you can't get more than 300 rows, even if you
-   * set `pageSize` to a higher value.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/realtime-basics#pagination).
+   * set `limit` to a higher value.
    * 

    *
-   * int32 page_size = 6;
+   * int64 limit = 6;
    *
-   * @return The pageSize.
+   * @return The limit.
    */
   @java.lang.Override
-  public int getPageSize() {
-    return pageSize_;
+  public long getLimit() {
+    return limit_;
   }
 
   public static final int METRIC_AGGREGATIONS_FIELD_NUMBER = 7;
@@ -780,8 +778,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (metricFilter_ != null) {
       output.writeMessage(5, getMetricFilter());
     }
-    if (pageSize_ != 0) {
-      output.writeInt32(6, pageSize_);
+    if (limit_ != 0L) {
+      output.writeInt64(6, limit_);
     }
     if (getMetricAggregationsList().size() > 0) {
       output.writeUInt32NoTag(58);
@@ -820,8 +818,8 @@ public int getSerializedSize() {
     if (metricFilter_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(5, getMetricFilter());
     }
-    if (pageSize_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(6, pageSize_);
+    if (limit_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(6, limit_);
     }
     {
       int dataSize = 0;
@@ -869,7 +867,7 @@ public boolean equals(final java.lang.Object obj) {
     if (hasMetricFilter()) {
       if (!getMetricFilter().equals(other.getMetricFilter())) return false;
     }
-    if (getPageSize() != other.getPageSize()) return false;
+    if (getLimit() != other.getLimit()) return false;
     if (!metricAggregations_.equals(other.metricAggregations_)) return false;
     if (!getOrderBysList().equals(other.getOrderBysList())) return false;
     if (getReturnPropertyQuota() != other.getReturnPropertyQuota()) return false;
@@ -902,8 +900,8 @@ public int hashCode() {
       hash = (37 * hash) + METRIC_FILTER_FIELD_NUMBER;
       hash = (53 * hash) + getMetricFilter().hashCode();
     }
-    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
-    hash = (53 * hash) + getPageSize();
+    hash = (37 * hash) + LIMIT_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getLimit());
     if (getMetricAggregationsCount() > 0) {
       hash = (37 * hash) + METRIC_AGGREGATIONS_FIELD_NUMBER;
       hash = (53 * hash) + metricAggregations_.hashCode();
@@ -1090,7 +1088,7 @@ public Builder clear() {
         metricFilter_ = null;
         metricFilterBuilder_ = null;
       }
-      pageSize_ = 0;
+      limit_ = 0L;
 
       metricAggregations_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000004);
@@ -1159,7 +1157,7 @@ public com.google.analytics.data.v1beta.RunRealtimeReportRequest buildPartial()
       } else {
         result.metricFilter_ = metricFilterBuilder_.build();
       }
-      result.pageSize_ = pageSize_;
+      result.limit_ = limit_;
       if (((bitField0_ & 0x00000004) != 0)) {
         metricAggregations_ = java.util.Collections.unmodifiableList(metricAggregations_);
         bitField0_ = (bitField0_ & ~0x00000004);
@@ -1289,8 +1287,8 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunRealtimeReportReque
       if (other.hasMetricFilter()) {
         mergeMetricFilter(other.getMetricFilter());
       }
-      if (other.getPageSize() != 0) {
-        setPageSize(other.getPageSize());
+      if (other.getLimit() != 0L) {
+        setLimit(other.getLimit());
       }
       if (!other.metricAggregations_.isEmpty()) {
         if (metricAggregations_.isEmpty()) {
@@ -2589,55 +2587,51 @@ public com.google.analytics.data.v1beta.FilterExpressionOrBuilder getMetricFilte
       return metricFilterBuilder_;
     }
 
-    private int pageSize_;
+    private long limit_;
     /**
      *
      *
      * 
-     * Page size specifies maximum number of rows to return. If unspecified, up to
-     * 10,000 rows are returned. The API returns a maximum of 100,000 rows per
-     * request, no matter how many you ask for. Page size must be positive.
-     * The API can also return fewer rows than the requested `pageSize`, if there
-     * aren't as many dimension values as the `pageSize`. For instance, there are
+     * The number of rows to return. If unspecified, 10,000 rows are returned. The
+     * API returns a maximum of 100,000 rows per request, no matter how many you
+     * ask for. `limit` must be positive.
+     * The API can also return fewer rows than the requested `limit`, if there
+     * aren't as many dimension values as the `limit`. For instance, there are
      * fewer than 300 possible values for the dimension `country`, so when
      * reporting on only `country`, you can't get more than 300 rows, even if you
-     * set `pageSize` to a higher value.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/realtime-basics#pagination).
+     * set `limit` to a higher value.
      * 

      *
-     * int32 page_size = 6;
+     * int64 limit = 6;
      *
-     * @return The pageSize.
+     * @return The limit.
      */
     @java.lang.Override
-    public int getPageSize() {
-      return pageSize_;
+    public long getLimit() {
+      return limit_;
     }
     /**
      *
      *
      * 
-     * Page size specifies maximum number of rows to return. If unspecified, up to
-     * 10,000 rows are returned. The API returns a maximum of 100,000 rows per
-     * request, no matter how many you ask for. Page size must be positive.
-     * The API can also return fewer rows than the requested `pageSize`, if there
-     * aren't as many dimension values as the `pageSize`. For instance, there are
+     * The number of rows to return. If unspecified, 10,000 rows are returned. The
+     * API returns a maximum of 100,000 rows per request, no matter how many you
+     * ask for. `limit` must be positive.
+     * The API can also return fewer rows than the requested `limit`, if there
+     * aren't as many dimension values as the `limit`. For instance, there are
      * fewer than 300 possible values for the dimension `country`, so when
      * reporting on only `country`, you can't get more than 300 rows, even if you
-     * set `pageSize` to a higher value.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/realtime-basics#pagination).
+     * set `limit` to a higher value.
      * 

      *
-     * int32 page_size = 6;
+     * int64 limit = 6;
      *
-     * @param value The pageSize to set.
+     * @param value The limit to set.
      * @return This builder for chaining.
      */
-    public Builder setPageSize(int value) {
+    public Builder setLimit(long value) {
 
-      pageSize_ = value;
+      limit_ = value;
       onChanged();
       return this;
     }
@@ -2645,25 +2639,23 @@ public Builder setPageSize(int value) {
      *
      *
      * 
-     * Page size specifies maximum number of rows to return. If unspecified, up to
-     * 10,000 rows are returned. The API returns a maximum of 100,000 rows per
-     * request, no matter how many you ask for. Page size must be positive.
-     * The API can also return fewer rows than the requested `pageSize`, if there
-     * aren't as many dimension values as the `pageSize`. For instance, there are
+     * The number of rows to return. If unspecified, 10,000 rows are returned. The
+     * API returns a maximum of 100,000 rows per request, no matter how many you
+     * ask for. `limit` must be positive.
+     * The API can also return fewer rows than the requested `limit`, if there
+     * aren't as many dimension values as the `limit`. For instance, there are
      * fewer than 300 possible values for the dimension `country`, so when
      * reporting on only `country`, you can't get more than 300 rows, even if you
-     * set `pageSize` to a higher value.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/realtime-basics#pagination).
+     * set `limit` to a higher value.
      * 

      *
-     * int32 page_size = 6;
+     * int64 limit = 6;
      *
      * @return This builder for chaining.
      */
-    public Builder clearPageSize() {
+    public Builder clearLimit() {
 
-      pageSize_ = 0;
+      limit_ = 0L;
       onChanged();
       return this;
     }
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequestOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequestOrBuilder.java
index 7023d8fe..c057ed9d 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequestOrBuilder.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportRequestOrBuilder.java
@@ -243,23 +243,21 @@ public interface RunRealtimeReportRequestOrBuilder
    *
    *
    * 
-   * Page size specifies maximum number of rows to return. If unspecified, up to
-   * 10,000 rows are returned. The API returns a maximum of 100,000 rows per
-   * request, no matter how many you ask for. Page size must be positive.
-   * The API can also return fewer rows than the requested `pageSize`, if there
-   * aren't as many dimension values as the `pageSize`. For instance, there are
+   * The number of rows to return. If unspecified, 10,000 rows are returned. The
+   * API returns a maximum of 100,000 rows per request, no matter how many you
+   * ask for. `limit` must be positive.
+   * The API can also return fewer rows than the requested `limit`, if there
+   * aren't as many dimension values as the `limit`. For instance, there are
    * fewer than 300 possible values for the dimension `country`, so when
    * reporting on only `country`, you can't get more than 300 rows, even if you
-   * set `pageSize` to a higher value.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/realtime-basics#pagination).
+   * set `limit` to a higher value.
    * 

    *
-   * int32 page_size = 6;
+   * int64 limit = 6;
    *
-   * @return The pageSize.
+   * @return The limit.
    */
-  int getPageSize();
+  long getLimit();
 
   /**
    *
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java
index 1303ea90..b074e447 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java
@@ -147,7 +147,7 @@ private RunRealtimeReportResponse(
             }
           case 56:
             {
-              totalSize_ = input.readInt32();
+              rowCount_ = input.readInt32();
               break;
             }
           case 66:
@@ -645,26 +645,26 @@ public com.google.analytics.data.v1beta.RowOrBuilder getMinimumsOrBuilder(int in
     return minimums_.get(index);
   }
 
-  public static final int TOTAL_SIZE_FIELD_NUMBER = 7;
-  private int totalSize_;
+  public static final int ROW_COUNT_FIELD_NUMBER = 7;
+  private int rowCount_;
   /**
    *
    *
    * 
-   * The total number of rows in the query result. `totalSize` is independent of
-   * the number of rows returned in the response and the `pageSize` request
-   * parameter. For example if a query returns 175 rows and includes `pageSize`
-   * of 50 in the API request, the response will contain `totalSize` of 175 but
+   * The total number of rows in the query result. `rowCount` is independent of
+   * the number of rows returned in the response and the `limit` request
+   * parameter. For example if a query returns 175 rows and includes `limit`
+   * of 50 in the API request, the response will contain `rowCount` of 175 but
    * only 50 rows.
    * 

    *
-   * int32 total_size = 7;
+   * int32 row_count = 7;
    *
-   * @return The totalSize.
+   * @return The rowCount.
    */
   @java.lang.Override
-  public int getTotalSize() {
-    return totalSize_;
+  public int getRowCount() {
+    return rowCount_;
   }
 
   public static final int PROPERTY_QUOTA_FIELD_NUMBER = 8;
@@ -747,8 +747,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     for (int i = 0; i < minimums_.size(); i++) {
       output.writeMessage(6, minimums_.get(i));
     }
-    if (totalSize_ != 0) {
-      output.writeInt32(7, totalSize_);
+    if (rowCount_ != 0) {
+      output.writeInt32(7, rowCount_);
     }
     if (propertyQuota_ != null) {
       output.writeMessage(8, getPropertyQuota());
@@ -780,8 +780,8 @@ public int getSerializedSize() {
     for (int i = 0; i < minimums_.size(); i++) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, minimums_.get(i));
     }
-    if (totalSize_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(7, totalSize_);
+    if (rowCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(7, rowCount_);
     }
     if (propertyQuota_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getPropertyQuota());
@@ -808,7 +808,7 @@ public boolean equals(final java.lang.Object obj) {
     if (!getTotalsList().equals(other.getTotalsList())) return false;
     if (!getMaximumsList().equals(other.getMaximumsList())) return false;
     if (!getMinimumsList().equals(other.getMinimumsList())) return false;
-    if (getTotalSize() != other.getTotalSize()) return false;
+    if (getRowCount() != other.getRowCount()) return false;
     if (hasPropertyQuota() != other.hasPropertyQuota()) return false;
     if (hasPropertyQuota()) {
       if (!getPropertyQuota().equals(other.getPropertyQuota())) return false;
@@ -848,8 +848,8 @@ public int hashCode() {
       hash = (37 * hash) + MINIMUMS_FIELD_NUMBER;
       hash = (53 * hash) + getMinimumsList().hashCode();
     }
-    hash = (37 * hash) + TOTAL_SIZE_FIELD_NUMBER;
-    hash = (53 * hash) + getTotalSize();
+    hash = (37 * hash) + ROW_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getRowCount();
     if (hasPropertyQuota()) {
       hash = (37 * hash) + PROPERTY_QUOTA_FIELD_NUMBER;
       hash = (53 * hash) + getPropertyQuota().hashCode();
@@ -1043,7 +1043,7 @@ public Builder clear() {
       } else {
         minimumsBuilder_.clear();
       }
-      totalSize_ = 0;
+      rowCount_ = 0;
 
       if (propertyQuotaBuilder_ == null) {
         propertyQuota_ = null;
@@ -1133,7 +1133,7 @@ public com.google.analytics.data.v1beta.RunRealtimeReportResponse buildPartial()
       } else {
         result.minimums_ = minimumsBuilder_.build();
       }
-      result.totalSize_ = totalSize_;
+      result.rowCount_ = rowCount_;
       if (propertyQuotaBuilder_ == null) {
         result.propertyQuota_ = propertyQuota_;
       } else {
@@ -1351,8 +1351,8 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunRealtimeReportRespo
           }
         }
       }
-      if (other.getTotalSize() != 0) {
-        setTotalSize(other.getTotalSize());
+      if (other.getRowCount() != 0) {
+        setRowCount(other.getRowCount());
       }
       if (other.hasPropertyQuota()) {
         mergePropertyQuota(other.getPropertyQuota());
@@ -3537,45 +3537,45 @@ public java.util.List getMinimumsB
       return minimumsBuilder_;
     }
 
-    private int totalSize_;
+    private int rowCount_;
     /**
      *
      *
      * 
-     * The total number of rows in the query result. `totalSize` is independent of
-     * the number of rows returned in the response and the `pageSize` request
-     * parameter. For example if a query returns 175 rows and includes `pageSize`
-     * of 50 in the API request, the response will contain `totalSize` of 175 but
+     * The total number of rows in the query result. `rowCount` is independent of
+     * the number of rows returned in the response and the `limit` request
+     * parameter. For example if a query returns 175 rows and includes `limit`
+     * of 50 in the API request, the response will contain `rowCount` of 175 but
      * only 50 rows.
      * 

      *
-     * int32 total_size = 7;
+     * int32 row_count = 7;
      *
-     * @return The totalSize.
+     * @return The rowCount.
      */
     @java.lang.Override
-    public int getTotalSize() {
-      return totalSize_;
+    public int getRowCount() {
+      return rowCount_;
     }
     /**
      *
      *
      * 
-     * The total number of rows in the query result. `totalSize` is independent of
-     * the number of rows returned in the response and the `pageSize` request
-     * parameter. For example if a query returns 175 rows and includes `pageSize`
-     * of 50 in the API request, the response will contain `totalSize` of 175 but
+     * The total number of rows in the query result. `rowCount` is independent of
+     * the number of rows returned in the response and the `limit` request
+     * parameter. For example if a query returns 175 rows and includes `limit`
+     * of 50 in the API request, the response will contain `rowCount` of 175 but
      * only 50 rows.
      * 

      *
-     * int32 total_size = 7;
+     * int32 row_count = 7;
      *
-     * @param value The totalSize to set.
+     * @param value The rowCount to set.
      * @return This builder for chaining.
      */
-    public Builder setTotalSize(int value) {
+    public Builder setRowCount(int value) {
 
-      totalSize_ = value;
+      rowCount_ = value;
       onChanged();
       return this;
     }
@@ -3583,20 +3583,20 @@ public Builder setTotalSize(int value) {
      *
      *
      * 
-     * The total number of rows in the query result. `totalSize` is independent of
-     * the number of rows returned in the response and the `pageSize` request
-     * parameter. For example if a query returns 175 rows and includes `pageSize`
-     * of 50 in the API request, the response will contain `totalSize` of 175 but
+     * The total number of rows in the query result. `rowCount` is independent of
+     * the number of rows returned in the response and the `limit` request
+     * parameter. For example if a query returns 175 rows and includes `limit`
+     * of 50 in the API request, the response will contain `rowCount` of 175 but
      * only 50 rows.
      * 

      *
-     * int32 total_size = 7;
+     * int32 row_count = 7;
      *
      * @return This builder for chaining.
      */
-    public Builder clearTotalSize() {
+    public Builder clearRowCount() {
 
-      totalSize_ = 0;
+      rowCount_ = 0;
       onChanged();
       return this;
     }
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java
index d7b1bf8d..54db4272 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java
@@ -347,18 +347,18 @@ public interface RunRealtimeReportResponseOrBuilder
    *
    *
    * 
-   * The total number of rows in the query result. `totalSize` is independent of
-   * the number of rows returned in the response and the `pageSize` request
-   * parameter. For example if a query returns 175 rows and includes `pageSize`
-   * of 50 in the API request, the response will contain `totalSize` of 175 but
+   * The total number of rows in the query result. `rowCount` is independent of
+   * the number of rows returned in the response and the `limit` request
+   * parameter. For example if a query returns 175 rows and includes `limit`
+   * of 50 in the API request, the response will contain `rowCount` of 175 but
    * only 50 rows.
    * 

    *
-   * int32 total_size = 7;
+   * int32 row_count = 7;
    *
-   * @return The totalSize.
+   * @return The rowCount.
    */
-  int getTotalSize();
+  int getRowCount();
 
   /**
    *
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java
index 6219d735..d7f71fee 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequest.java
@@ -42,7 +42,6 @@ private RunReportRequest() {
     dimensions_ = java.util.Collections.emptyList();
     metrics_ = java.util.Collections.emptyList();
     dateRanges_ = java.util.Collections.emptyList();
-    pageToken_ = "";
     metricAggregations_ = java.util.Collections.emptyList();
     orderBys_ = java.util.Collections.emptyList();
     currencyCode_ = "";
@@ -154,14 +153,12 @@ private RunReportRequest(
             }
           case 56:
             {
-              pageSize_ = input.readInt32();
+              offset_ = input.readInt64();
               break;
             }
-          case 66:
+          case 64:
             {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              pageToken_ = s;
+              limit_ = input.readInt64();
               break;
             }
           case 72:
@@ -675,94 +672,55 @@ public com.google.analytics.data.v1beta.FilterExpressionOrBuilder getMetricFilte
     return getMetricFilter();
   }
 
-  public static final int PAGE_SIZE_FIELD_NUMBER = 7;
-  private int pageSize_;
+  public static final int OFFSET_FIELD_NUMBER = 7;
+  private long offset_;
   /**
    *
    *
    * 
-   * Page size is for paging and specifies maximum number of rows to return. The
-   * API returns a maximum of 200,000 rows per request, no matter how many you
-   * ask for. Page size must be positive.
-   * The API can also return fewer rows than the requested `pageSize`, if there
-   * aren't as many dimension values as the `pageSize`. For instance, there are
-   * fewer than 300 possible values for the dimension `country`, so when
-   * reporting on only `country`, you can't get more than 300 rows, even if you
-   * set `pageSize` to a higher value.
+   * The row count of the start row. The first row is counted as row 0.
+   * When paging, the first request does not specify offset; or equivalently,
+   * sets offset to 0; the first request returns the first `limit` of rows. The
+   * second request sets offset to the `limit` of the first request; the second
+   * request returns the second `limit` of rows.
    * To learn more about this pagination parameter, see
    * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
    * 

    *
-   * int32 page_size = 7;
+   * int64 offset = 7;
    *
-   * @return The pageSize.
+   * @return The offset.
    */
   @java.lang.Override
-  public int getPageSize() {
-    return pageSize_;
+  public long getOffset() {
+    return offset_;
   }
 
-  public static final int PAGE_TOKEN_FIELD_NUMBER = 8;
-  private volatile java.lang.Object pageToken_;
-  /**
-   *
-   *
-   * 
-   * A continuation token to get the next page of the results. Adding this to
-   * the request will return the next page of rows after the `pageToken`. The
-   * `pageToken` should be the value returned in the `nextPageToken` parameter
-   * in the response.
-   * When paginating, all other parameters specified in `RunReportRequest` must
-   * match the call that provided the page token.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-   * 

-   *
-   * string page_token = 8;
-   *
-   * @return The pageToken.
-   */
-  @java.lang.Override
-  public java.lang.String getPageToken() {
-    java.lang.Object ref = pageToken_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      pageToken_ = s;
-      return s;
-    }
-  }
+  public static final int LIMIT_FIELD_NUMBER = 8;
+  private long limit_;
   /**
    *
    *
    * 
-   * A continuation token to get the next page of the results. Adding this to
-   * the request will return the next page of rows after the `pageToken`. The
-   * `pageToken` should be the value returned in the `nextPageToken` parameter
-   * in the response.
-   * When paginating, all other parameters specified in `RunReportRequest` must
-   * match the call that provided the page token.
+   * The number of rows to return. If unspecified, 10,000 rows are returned. The
+   * API returns a maximum of 100,000 rows per request, no matter how many you
+   * ask for. `limit` must be positive.
+   * The API can also return fewer rows than the requested `limit`, if there
+   * aren't as many dimension values as the `limit`. For instance, there are
+   * fewer than 300 possible values for the dimension `country`, so when
+   * reporting on only `country`, you can't get more than 300 rows, even if you
+   * set `limit` to a higher value.
    * To learn more about this pagination parameter, see
    * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
    * 

    *
-   * string page_token = 8;
+   * int64 limit = 8;
    *
-   * @return The bytes for pageToken.
+   * @return The limit.
    */
   @java.lang.Override
-  public com.google.protobuf.ByteString getPageTokenBytes() {
-    java.lang.Object ref = pageToken_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-      pageToken_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
+  public long getLimit() {
+    return limit_;
   }
 
   public static final int METRIC_AGGREGATIONS_FIELD_NUMBER = 9;
@@ -1113,11 +1071,11 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (metricFilter_ != null) {
       output.writeMessage(6, getMetricFilter());
     }
-    if (pageSize_ != 0) {
-      output.writeInt32(7, pageSize_);
+    if (offset_ != 0L) {
+      output.writeInt64(7, offset_);
     }
-    if (!getPageTokenBytes().isEmpty()) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 8, pageToken_);
+    if (limit_ != 0L) {
+      output.writeInt64(8, limit_);
     }
     if (getMetricAggregationsList().size() > 0) {
       output.writeUInt32NoTag(74);
@@ -1168,11 +1126,11 @@ public int getSerializedSize() {
     if (metricFilter_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getMetricFilter());
     }
-    if (pageSize_ != 0) {
-      size += com.google.protobuf.CodedOutputStream.computeInt32Size(7, pageSize_);
+    if (offset_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(7, offset_);
     }
-    if (!getPageTokenBytes().isEmpty()) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, pageToken_);
+    if (limit_ != 0L) {
+      size += com.google.protobuf.CodedOutputStream.computeInt64Size(8, limit_);
     }
     {
       int dataSize = 0;
@@ -1230,8 +1188,8 @@ public boolean equals(final java.lang.Object obj) {
     if (hasMetricFilter()) {
       if (!getMetricFilter().equals(other.getMetricFilter())) return false;
     }
-    if (getPageSize() != other.getPageSize()) return false;
-    if (!getPageToken().equals(other.getPageToken())) return false;
+    if (getOffset() != other.getOffset()) return false;
+    if (getLimit() != other.getLimit()) return false;
     if (!metricAggregations_.equals(other.metricAggregations_)) return false;
     if (!getOrderBysList().equals(other.getOrderBysList())) return false;
     if (!getCurrencyCode().equals(other.getCurrencyCode())) return false;
@@ -1274,10 +1232,10 @@ public int hashCode() {
       hash = (37 * hash) + METRIC_FILTER_FIELD_NUMBER;
       hash = (53 * hash) + getMetricFilter().hashCode();
     }
-    hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
-    hash = (53 * hash) + getPageSize();
-    hash = (37 * hash) + PAGE_TOKEN_FIELD_NUMBER;
-    hash = (53 * hash) + getPageToken().hashCode();
+    hash = (37 * hash) + OFFSET_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getOffset());
+    hash = (37 * hash) + LIMIT_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getLimit());
     if (getMetricAggregationsCount() > 0) {
       hash = (37 * hash) + METRIC_AGGREGATIONS_FIELD_NUMBER;
       hash = (53 * hash) + metricAggregations_.hashCode();
@@ -1478,9 +1436,9 @@ public Builder clear() {
         metricFilter_ = null;
         metricFilterBuilder_ = null;
       }
-      pageSize_ = 0;
+      offset_ = 0L;
 
-      pageToken_ = "";
+      limit_ = 0L;
 
       metricAggregations_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000008);
@@ -1568,8 +1526,8 @@ public com.google.analytics.data.v1beta.RunReportRequest buildPartial() {
       } else {
         result.metricFilter_ = metricFilterBuilder_.build();
       }
-      result.pageSize_ = pageSize_;
-      result.pageToken_ = pageToken_;
+      result.offset_ = offset_;
+      result.limit_ = limit_;
       if (((bitField0_ & 0x00000008) != 0)) {
         metricAggregations_ = java.util.Collections.unmodifiableList(metricAggregations_);
         bitField0_ = (bitField0_ & ~0x00000008);
@@ -1733,12 +1691,11 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunReportRequest other
       if (other.hasMetricFilter()) {
         mergeMetricFilter(other.getMetricFilter());
       }
-      if (other.getPageSize() != 0) {
-        setPageSize(other.getPageSize());
+      if (other.getOffset() != 0L) {
+        setOffset(other.getOffset());
       }
-      if (!other.getPageToken().isEmpty()) {
-        pageToken_ = other.pageToken_;
-        onChanged();
+      if (other.getLimit() != 0L) {
+        setLimit(other.getLimit());
       }
       if (!other.metricAggregations_.isEmpty()) {
         if (metricAggregations_.isEmpty()) {
@@ -3480,55 +3437,49 @@ public com.google.analytics.data.v1beta.FilterExpressionOrBuilder getMetricFilte
       return metricFilterBuilder_;
     }
 
-    private int pageSize_;
+    private long offset_;
     /**
      *
      *
      * 
-     * Page size is for paging and specifies maximum number of rows to return. The
-     * API returns a maximum of 200,000 rows per request, no matter how many you
-     * ask for. Page size must be positive.
-     * The API can also return fewer rows than the requested `pageSize`, if there
-     * aren't as many dimension values as the `pageSize`. For instance, there are
-     * fewer than 300 possible values for the dimension `country`, so when
-     * reporting on only `country`, you can't get more than 300 rows, even if you
-     * set `pageSize` to a higher value.
+     * The row count of the start row. The first row is counted as row 0.
+     * When paging, the first request does not specify offset; or equivalently,
+     * sets offset to 0; the first request returns the first `limit` of rows. The
+     * second request sets offset to the `limit` of the first request; the second
+     * request returns the second `limit` of rows.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      * 

      *
-     * int32 page_size = 7;
+     * int64 offset = 7;
      *
-     * @return The pageSize.
+     * @return The offset.
      */
     @java.lang.Override
-    public int getPageSize() {
-      return pageSize_;
+    public long getOffset() {
+      return offset_;
     }
     /**
      *
      *
      * 
-     * Page size is for paging and specifies maximum number of rows to return. The
-     * API returns a maximum of 200,000 rows per request, no matter how many you
-     * ask for. Page size must be positive.
-     * The API can also return fewer rows than the requested `pageSize`, if there
-     * aren't as many dimension values as the `pageSize`. For instance, there are
-     * fewer than 300 possible values for the dimension `country`, so when
-     * reporting on only `country`, you can't get more than 300 rows, even if you
-     * set `pageSize` to a higher value.
+     * The row count of the start row. The first row is counted as row 0.
+     * When paging, the first request does not specify offset; or equivalently,
+     * sets offset to 0; the first request returns the first `limit` of rows. The
+     * second request sets offset to the `limit` of the first request; the second
+     * request returns the second `limit` of rows.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      * 

      *
-     * int32 page_size = 7;
+     * int64 offset = 7;
      *
-     * @param value The pageSize to set.
+     * @param value The offset to set.
      * @return This builder for chaining.
      */
-    public Builder setPageSize(int value) {
+    public Builder setOffset(long value) {
 
-      pageSize_ = value;
+      offset_ = value;
       onChanged();
       return this;
     }
@@ -3536,137 +3487,75 @@ public Builder setPageSize(int value) {
      *
      *
      * 
-     * Page size is for paging and specifies maximum number of rows to return. The
-     * API returns a maximum of 200,000 rows per request, no matter how many you
-     * ask for. Page size must be positive.
-     * The API can also return fewer rows than the requested `pageSize`, if there
-     * aren't as many dimension values as the `pageSize`. For instance, there are
-     * fewer than 300 possible values for the dimension `country`, so when
-     * reporting on only `country`, you can't get more than 300 rows, even if you
-     * set `pageSize` to a higher value.
+     * The row count of the start row. The first row is counted as row 0.
+     * When paging, the first request does not specify offset; or equivalently,
+     * sets offset to 0; the first request returns the first `limit` of rows. The
+     * second request sets offset to the `limit` of the first request; the second
+     * request returns the second `limit` of rows.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      * 

      *
-     * int32 page_size = 7;
+     * int64 offset = 7;
      *
      * @return This builder for chaining.
      */
-    public Builder clearPageSize() {
+    public Builder clearOffset() {
 
-      pageSize_ = 0;
+      offset_ = 0L;
       onChanged();
       return this;
     }
 
-    private java.lang.Object pageToken_ = "";
+    private long limit_;
     /**
      *
      *
      * 
-     * A continuation token to get the next page of the results. Adding this to
-     * the request will return the next page of rows after the `pageToken`. The
-     * `pageToken` should be the value returned in the `nextPageToken` parameter
-     * in the response.
-     * When paginating, all other parameters specified in `RunReportRequest` must
-     * match the call that provided the page token.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     * 

-     *
-     * string page_token = 8;
-     *
-     * @return The pageToken.
-     */
-    public java.lang.String getPageToken() {
-      java.lang.Object ref = pageToken_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        pageToken_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     *
-     *
-     * 
-     * A continuation token to get the next page of the results. Adding this to
-     * the request will return the next page of rows after the `pageToken`. The
-     * `pageToken` should be the value returned in the `nextPageToken` parameter
-     * in the response.
-     * When paginating, all other parameters specified in `RunReportRequest` must
-     * match the call that provided the page token.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     * 

-     *
-     * string page_token = 8;
-     *
-     * @return The bytes for pageToken.
-     */
-    public com.google.protobuf.ByteString getPageTokenBytes() {
-      java.lang.Object ref = pageToken_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-        pageToken_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     *
-     *
-     * 
-     * A continuation token to get the next page of the results. Adding this to
-     * the request will return the next page of rows after the `pageToken`. The
-     * `pageToken` should be the value returned in the `nextPageToken` parameter
-     * in the response.
-     * When paginating, all other parameters specified in `RunReportRequest` must
-     * match the call that provided the page token.
+     * The number of rows to return. If unspecified, 10,000 rows are returned. The
+     * API returns a maximum of 100,000 rows per request, no matter how many you
+     * ask for. `limit` must be positive.
+     * The API can also return fewer rows than the requested `limit`, if there
+     * aren't as many dimension values as the `limit`. For instance, there are
+     * fewer than 300 possible values for the dimension `country`, so when
+     * reporting on only `country`, you can't get more than 300 rows, even if you
+     * set `limit` to a higher value.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      * 

      *
-     * string page_token = 8;
+     * int64 limit = 8;
      *
-     * @param value The pageToken to set.
-     * @return This builder for chaining.
+     * @return The limit.
      */
-    public Builder setPageToken(java.lang.String value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-
-      pageToken_ = value;
-      onChanged();
-      return this;
+    @java.lang.Override
+    public long getLimit() {
+      return limit_;
     }
     /**
      *
      *
      * 
-     * A continuation token to get the next page of the results. Adding this to
-     * the request will return the next page of rows after the `pageToken`. The
-     * `pageToken` should be the value returned in the `nextPageToken` parameter
-     * in the response.
-     * When paginating, all other parameters specified in `RunReportRequest` must
-     * match the call that provided the page token.
+     * The number of rows to return. If unspecified, 10,000 rows are returned. The
+     * API returns a maximum of 100,000 rows per request, no matter how many you
+     * ask for. `limit` must be positive.
+     * The API can also return fewer rows than the requested `limit`, if there
+     * aren't as many dimension values as the `limit`. For instance, there are
+     * fewer than 300 possible values for the dimension `country`, so when
+     * reporting on only `country`, you can't get more than 300 rows, even if you
+     * set `limit` to a higher value.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      * 

      *
-     * string page_token = 8;
+     * int64 limit = 8;
      *
+     * @param value The limit to set.
      * @return This builder for chaining.
      */
-    public Builder clearPageToken() {
+    public Builder setLimit(long value) {
 
-      pageToken_ = getDefaultInstance().getPageToken();
+      limit_ = value;
       onChanged();
       return this;
     }
@@ -3674,28 +3563,25 @@ public Builder clearPageToken() {
      *
      *
      * 
-     * A continuation token to get the next page of the results. Adding this to
-     * the request will return the next page of rows after the `pageToken`. The
-     * `pageToken` should be the value returned in the `nextPageToken` parameter
-     * in the response.
-     * When paginating, all other parameters specified in `RunReportRequest` must
-     * match the call that provided the page token.
+     * The number of rows to return. If unspecified, 10,000 rows are returned. The
+     * API returns a maximum of 100,000 rows per request, no matter how many you
+     * ask for. `limit` must be positive.
+     * The API can also return fewer rows than the requested `limit`, if there
+     * aren't as many dimension values as the `limit`. For instance, there are
+     * fewer than 300 possible values for the dimension `country`, so when
+     * reporting on only `country`, you can't get more than 300 rows, even if you
+     * set `limit` to a higher value.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      * 

      *
-     * string page_token = 8;
+     * int64 limit = 8;
      *
-     * @param value The bytes for pageToken to set.
      * @return This builder for chaining.
      */
-    public Builder setPageTokenBytes(com.google.protobuf.ByteString value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
+    public Builder clearLimit() {
 
-      pageToken_ = value;
+      limit_ = 0L;
       onChanged();
       return this;
     }
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequestOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequestOrBuilder.java
index 3885b951..71d26bca 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequestOrBuilder.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportRequestOrBuilder.java
@@ -319,62 +319,42 @@ public interface RunReportRequestOrBuilder
    *
    *
    * 
-   * Page size is for paging and specifies maximum number of rows to return. The
-   * API returns a maximum of 200,000 rows per request, no matter how many you
-   * ask for. Page size must be positive.
-   * The API can also return fewer rows than the requested `pageSize`, if there
-   * aren't as many dimension values as the `pageSize`. For instance, there are
-   * fewer than 300 possible values for the dimension `country`, so when
-   * reporting on only `country`, you can't get more than 300 rows, even if you
-   * set `pageSize` to a higher value.
+   * The row count of the start row. The first row is counted as row 0.
+   * When paging, the first request does not specify offset; or equivalently,
+   * sets offset to 0; the first request returns the first `limit` of rows. The
+   * second request sets offset to the `limit` of the first request; the second
+   * request returns the second `limit` of rows.
    * To learn more about this pagination parameter, see
    * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
    * 

    *
-   * int32 page_size = 7;
+   * int64 offset = 7;
    *
-   * @return The pageSize.
+   * @return The offset.
    */
-  int getPageSize();
+  long getOffset();
 
   /**
    *
    *
    * 
-   * A continuation token to get the next page of the results. Adding this to
-   * the request will return the next page of rows after the `pageToken`. The
-   * `pageToken` should be the value returned in the `nextPageToken` parameter
-   * in the response.
-   * When paginating, all other parameters specified in `RunReportRequest` must
-   * match the call that provided the page token.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-   * 

-   *
-   * string page_token = 8;
-   *
-   * @return The pageToken.
-   */
-  java.lang.String getPageToken();
-  /**
-   *
-   *
-   * 
-   * A continuation token to get the next page of the results. Adding this to
-   * the request will return the next page of rows after the `pageToken`. The
-   * `pageToken` should be the value returned in the `nextPageToken` parameter
-   * in the response.
-   * When paginating, all other parameters specified in `RunReportRequest` must
-   * match the call that provided the page token.
+   * The number of rows to return. If unspecified, 10,000 rows are returned. The
+   * API returns a maximum of 100,000 rows per request, no matter how many you
+   * ask for. `limit` must be positive.
+   * The API can also return fewer rows than the requested `limit`, if there
+   * aren't as many dimension values as the `limit`. For instance, there are
+   * fewer than 300 possible values for the dimension `country`, so when
+   * reporting on only `country`, you can't get more than 300 rows, even if you
+   * set `limit` to a higher value.
    * To learn more about this pagination parameter, see
    * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
    * 

    *
-   * string page_token = 8;
+   * int64 limit = 8;
    *
-   * @return The bytes for pageToken.
+   * @return The limit.
    */
-  com.google.protobuf.ByteString getPageTokenBytes();
+  long getLimit();
 
   /**
    *
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java
index f05556f7..cfc1d07f 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java
@@ -44,7 +44,6 @@ private RunReportResponse() {
     totals_ = java.util.Collections.emptyList();
     maximums_ = java.util.Collections.emptyList();
     minimums_ = java.util.Collections.emptyList();
-    nextPageToken_ = "";
   }
 
   @java.lang.Override
@@ -146,19 +145,12 @@ private RunReportResponse(
                       com.google.analytics.data.v1beta.Row.parser(), extensionRegistry));
               break;
             }
-          case 58:
+          case 56:
             {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              nextPageToken_ = s;
+              rowCount_ = input.readInt32();
               break;
             }
-          case 64:
-            {
-              totalSize_ = input.readInt32();
-              break;
-            }
-          case 74:
+          case 66:
             {
               com.google.analytics.data.v1beta.ResponseMetaData.Builder subBuilder = null;
               if (metadata_ != null) {
@@ -175,7 +167,7 @@ private RunReportResponse(
 
               break;
             }
-          case 82:
+          case 74:
             {
               com.google.analytics.data.v1beta.PropertyQuota.Builder subBuilder = null;
               if (propertyQuota_ != null) {
@@ -670,88 +662,31 @@ public com.google.analytics.data.v1beta.RowOrBuilder getMinimumsOrBuilder(int in
     return minimums_.get(index);
   }
 
-  public static final int NEXT_PAGE_TOKEN_FIELD_NUMBER = 7;
-  private volatile java.lang.Object nextPageToken_;
-  /**
-   *
-   *
-   * 
-   * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-   * call to retrieve the next page of report rows. If this field is omitted,
-   * there are no subsequent pages of report rows.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-   * 

-   *
-   * string next_page_token = 7;
-   *
-   * @return The nextPageToken.
-   */
-  @java.lang.Override
-  public java.lang.String getNextPageToken() {
-    java.lang.Object ref = nextPageToken_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      nextPageToken_ = s;
-      return s;
-    }
-  }
-  /**
-   *
-   *
-   * 
-   * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-   * call to retrieve the next page of report rows. If this field is omitted,
-   * there are no subsequent pages of report rows.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-   * 

-   *
-   * string next_page_token = 7;
-   *
-   * @return The bytes for nextPageToken.
-   */
-  @java.lang.Override
-  public com.google.protobuf.ByteString getNextPageTokenBytes() {
-    java.lang.Object ref = nextPageToken_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-      nextPageToken_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
-  public static final int TOTAL_SIZE_FIELD_NUMBER = 8;
-  private int totalSize_;
+  public static final int ROW_COUNT_FIELD_NUMBER = 7;
+  private int rowCount_;
   /**
    *
    *
    * 
-   * The total number of rows in the query result. `totalSize` is independent of
-   * the number of rows returned in the response, the `pageSize` request
-   * parameter, and the `pageToken` request parameter. For example if a query
-   * returns 175 rows and includes `pageSize` of 50 in the API request, the
-   * response will contain `totalSize` of 175 but only 50 rows.
+   * The total number of rows in the query result. `rowCount` is independent of
+   * the number of rows returned in the response, the `limit` request
+   * parameter, and the `offset` request parameter. For example if a query
+   * returns 175 rows and includes `limit` of 50 in the API request, the
+   * response will contain `rowCount` of 175 but only 50 rows.
    * To learn more about this pagination parameter, see
    * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
    * 

    *
-   * int32 total_size = 8;
+   * int32 row_count = 7;
    *
-   * @return The totalSize.
+   * @return The rowCount.
    */
   @java.lang.Override
-  public int getTotalSize() {
-    return totalSize_;
+  public int getRowCount() {
+    return rowCount_;
   }
 
-  public static final int METADATA_FIELD_NUMBER = 9;
+  public static final int METADATA_FIELD_NUMBER = 8;
   private com.google.analytics.data.v1beta.ResponseMetaData metadata_;
   /**
    *
@@ -760,7 +695,7 @@ public int getTotalSize() {
    * Metadata for the report.
    * 

    *
-   * .google.analytics.data.v1beta.ResponseMetaData metadata = 9;
+   * .google.analytics.data.v1beta.ResponseMetaData metadata = 8;
    *
    * @return Whether the metadata field is set.
    */
@@ -775,7 +710,7 @@ public boolean hasMetadata() {
    * Metadata for the report.
    *
* - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; * * @return The metadata. */ @@ -792,14 +727,14 @@ public com.google.analytics.data.v1beta.ResponseMetaData getMetadata() { * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ @java.lang.Override public com.google.analytics.data.v1beta.ResponseMetaDataOrBuilder getMetadataOrBuilder() { return getMetadata(); } - public static final int PROPERTY_QUOTA_FIELD_NUMBER = 10; + public static final int PROPERTY_QUOTA_FIELD_NUMBER = 9; private com.google.analytics.data.v1beta.PropertyQuota propertyQuota_; /** * @@ -808,7 +743,7 @@ public com.google.analytics.data.v1beta.ResponseMetaDataOrBuilder getMetadataOrB * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; * * @return Whether the propertyQuota field is set. */ @@ -823,7 +758,7 @@ public boolean hasPropertyQuota() { * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; * * @return The propertyQuota. */ @@ -840,7 +775,7 @@ public com.google.analytics.data.v1beta.PropertyQuota getPropertyQuota() { * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ @java.lang.Override public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaOrBuilder() { @@ -879,17 +814,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < minimums_.size(); i++) { output.writeMessage(6, minimums_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 7, nextPageToken_); - } - if (totalSize_ != 0) { - output.writeInt32(8, totalSize_); + if (rowCount_ != 0) { + output.writeInt32(7, rowCount_); } if (metadata_ != null) { - output.writeMessage(9, getMetadata()); + output.writeMessage(8, getMetadata()); } if (propertyQuota_ != null) { - output.writeMessage(10, getPropertyQuota()); + output.writeMessage(9, getPropertyQuota()); } unknownFields.writeTo(output); } @@ -918,17 +850,14 @@ public int getSerializedSize() { for (int i = 0; i < minimums_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, minimums_.get(i)); } - if (!getNextPageTokenBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, nextPageToken_); - } - if (totalSize_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeInt32Size(8, totalSize_); + if (rowCount_ != 0) { + size += com.google.protobuf.CodedOutputStream.computeInt32Size(7, rowCount_); } if (metadata_ != null) { - size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getMetadata()); + size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getMetadata()); } if (propertyQuota_ != null) { - size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getPropertyQuota()); + size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getPropertyQuota()); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -952,8 +881,7 @@ public boolean equals(final java.lang.Object obj) { if (!getTotalsList().equals(other.getTotalsList())) return false; if (!getMaximumsList().equals(other.getMaximumsList())) return false; if (!getMinimumsList().equals(other.getMinimumsList())) return false; - if (!getNextPageToken().equals(other.getNextPageToken())) return false; - if (getTotalSize() != other.getTotalSize()) return false; + if (getRowCount() != other.getRowCount()) return false; if (hasMetadata() != other.hasMetadata()) return false; if (hasMetadata()) { if (!getMetadata().equals(other.getMetadata())) return false; @@ -997,10 +925,8 @@ public int hashCode() { hash = (37 * hash) + MINIMUMS_FIELD_NUMBER; hash = (53 * hash) + getMinimumsList().hashCode(); } - hash = (37 * hash) + NEXT_PAGE_TOKEN_FIELD_NUMBER; - hash = (53 * hash) + getNextPageToken().hashCode(); - hash = (37 * hash) + TOTAL_SIZE_FIELD_NUMBER; - hash = (53 * hash) + getTotalSize(); + hash = (37 * hash) + ROW_COUNT_FIELD_NUMBER; + hash = (53 * hash) + getRowCount(); if (hasMetadata()) { hash = (37 * hash) + METADATA_FIELD_NUMBER; hash = (53 * hash) + getMetadata().hashCode(); @@ -1197,9 +1123,7 @@ public Builder clear() { } else { minimumsBuilder_.clear(); } - nextPageToken_ = ""; - - totalSize_ = 0; + rowCount_ = 0; if (metadataBuilder_ == null) { metadata_ = null; @@ -1295,8 +1219,7 @@ public com.google.analytics.data.v1beta.RunReportResponse buildPartial() { } else { result.minimums_ = minimumsBuilder_.build(); } - result.nextPageToken_ = nextPageToken_; - result.totalSize_ = totalSize_; + result.rowCount_ = rowCount_; if (metadataBuilder_ == null) { result.metadata_ = metadata_; } else { @@ -1519,12 +1442,8 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunReportResponse othe } } } - if (!other.getNextPageToken().isEmpty()) { - nextPageToken_ = other.nextPageToken_; - onChanged(); - } - if (other.getTotalSize() != 0) { - setTotalSize(other.getTotalSize()); + if (other.getRowCount() != 0) { + setRowCount(other.getRowCount()); } if (other.hasMetadata()) { mergeMetadata(other.getMetadata()); @@ -3712,175 +3631,49 @@ public java.util.List getMinimumsB return minimumsBuilder_; } - private java.lang.Object nextPageToken_ = ""; - /** - * - * - * 
-     * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-     * call to retrieve the next page of report rows. If this field is omitted,
-     * there are no subsequent pages of report rows.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     *
- * - * string next_page_token = 7; - * - * @return The nextPageToken. - */ - public java.lang.String getNextPageToken() { - java.lang.Object ref = nextPageToken_; - if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - nextPageToken_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * - * - * 
-     * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-     * call to retrieve the next page of report rows. If this field is omitted,
-     * there are no subsequent pages of report rows.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     *
- * - * string next_page_token = 7; - * - * @return The bytes for nextPageToken. - */ - public com.google.protobuf.ByteString getNextPageTokenBytes() { - java.lang.Object ref = nextPageToken_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); - nextPageToken_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * - * - * 
-     * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-     * call to retrieve the next page of report rows. If this field is omitted,
-     * there are no subsequent pages of report rows.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     *
- * - * string next_page_token = 7; - * - * @param value The nextPageToken to set. - * @return This builder for chaining. - */ - public Builder setNextPageToken(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - - nextPageToken_ = value; - onChanged(); - return this; - } - /** - * - * - * 
-     * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-     * call to retrieve the next page of report rows. If this field is omitted,
-     * there are no subsequent pages of report rows.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     *
- * - * string next_page_token = 7; - * - * @return This builder for chaining. - */ - public Builder clearNextPageToken() { - - nextPageToken_ = getDefaultInstance().getNextPageToken(); - onChanged(); - return this; - } - /** - * - * - * 
-     * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-     * call to retrieve the next page of report rows. If this field is omitted,
-     * there are no subsequent pages of report rows.
-     * To learn more about this pagination parameter, see
-     * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-     *
- * - * string next_page_token = 7; - * - * @param value The bytes for nextPageToken to set. - * @return This builder for chaining. - */ - public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - checkByteStringIsUtf8(value); - - nextPageToken_ = value; - onChanged(); - return this; - } - - private int totalSize_; + private int rowCount_; /** * * * 
-     * The total number of rows in the query result. `totalSize` is independent of
-     * the number of rows returned in the response, the `pageSize` request
-     * parameter, and the `pageToken` request parameter. For example if a query
-     * returns 175 rows and includes `pageSize` of 50 in the API request, the
-     * response will contain `totalSize` of 175 but only 50 rows.
+     * The total number of rows in the query result. `rowCount` is independent of
+     * the number of rows returned in the response, the `limit` request
+     * parameter, and the `offset` request parameter. For example if a query
+     * returns 175 rows and includes `limit` of 50 in the API request, the
+     * response will contain `rowCount` of 175 but only 50 rows.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      *
* - * int32 total_size = 8; + * int32 row_count = 7; * - * @return The totalSize. + * @return The rowCount. */ @java.lang.Override - public int getTotalSize() { - return totalSize_; + public int getRowCount() { + return rowCount_; } /** * * * 
-     * The total number of rows in the query result. `totalSize` is independent of
-     * the number of rows returned in the response, the `pageSize` request
-     * parameter, and the `pageToken` request parameter. For example if a query
-     * returns 175 rows and includes `pageSize` of 50 in the API request, the
-     * response will contain `totalSize` of 175 but only 50 rows.
+     * The total number of rows in the query result. `rowCount` is independent of
+     * the number of rows returned in the response, the `limit` request
+     * parameter, and the `offset` request parameter. For example if a query
+     * returns 175 rows and includes `limit` of 50 in the API request, the
+     * response will contain `rowCount` of 175 but only 50 rows.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      *
* - * int32 total_size = 8; + * int32 row_count = 7; * - * @param value The totalSize to set. + * @param value The rowCount to set. * @return This builder for chaining. */ - public Builder setTotalSize(int value) { + public Builder setRowCount(int value) { - totalSize_ = value; + rowCount_ = value; onChanged(); return this; } @@ -3888,22 +3681,22 @@ public Builder setTotalSize(int value) { * * * 
-     * The total number of rows in the query result. `totalSize` is independent of
-     * the number of rows returned in the response, the `pageSize` request
-     * parameter, and the `pageToken` request parameter. For example if a query
-     * returns 175 rows and includes `pageSize` of 50 in the API request, the
-     * response will contain `totalSize` of 175 but only 50 rows.
+     * The total number of rows in the query result. `rowCount` is independent of
+     * the number of rows returned in the response, the `limit` request
+     * parameter, and the `offset` request parameter. For example if a query
+     * returns 175 rows and includes `limit` of 50 in the API request, the
+     * response will contain `rowCount` of 175 but only 50 rows.
      * To learn more about this pagination parameter, see
      * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
      *
* - * int32 total_size = 8; + * int32 row_count = 7; * * @return This builder for chaining. */ - public Builder clearTotalSize() { + public Builder clearRowCount() { - totalSize_ = 0; + rowCount_ = 0; onChanged(); return this; } @@ -3921,7 +3714,7 @@ public Builder clearTotalSize() { * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; * * @return Whether the metadata field is set. */ @@ -3935,7 +3728,7 @@ public boolean hasMetadata() { * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; * * @return The metadata. */ @@ -3955,7 +3748,7 @@ public com.google.analytics.data.v1beta.ResponseMetaData getMetadata() { * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ public Builder setMetadata(com.google.analytics.data.v1beta.ResponseMetaData value) { if (metadataBuilder_ == null) { @@ -3977,7 +3770,7 @@ public Builder setMetadata(com.google.analytics.data.v1beta.ResponseMetaData val * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ public Builder setMetadata( com.google.analytics.data.v1beta.ResponseMetaData.Builder builderForValue) { @@ -3997,7 +3790,7 @@ public Builder setMetadata( * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ public Builder mergeMetadata(com.google.analytics.data.v1beta.ResponseMetaData value) { if (metadataBuilder_ == null) { @@ -4023,7 +3816,7 @@ public Builder mergeMetadata(com.google.analytics.data.v1beta.ResponseMetaData v * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ public Builder clearMetadata() { if (metadataBuilder_ == null) { @@ -4043,7 +3836,7 @@ public Builder clearMetadata() { * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ public com.google.analytics.data.v1beta.ResponseMetaData.Builder getMetadataBuilder() { @@ -4057,7 +3850,7 @@ public com.google.analytics.data.v1beta.ResponseMetaData.Builder getMetadataBuil * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ public com.google.analytics.data.v1beta.ResponseMetaDataOrBuilder getMetadataOrBuilder() { if (metadataBuilder_ != null) { @@ -4075,7 +3868,7 @@ public com.google.analytics.data.v1beta.ResponseMetaDataOrBuilder getMetadataOrB * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ private com.google.protobuf.SingleFieldBuilderV3< com.google.analytics.data.v1beta.ResponseMetaData, @@ -4107,7 +3900,7 @@ public com.google.analytics.data.v1beta.ResponseMetaDataOrBuilder getMetadataOrB * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; * * @return Whether the propertyQuota field is set. */ @@ -4121,7 +3914,7 @@ public boolean hasPropertyQuota() { * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; * * @return The propertyQuota. */ @@ -4141,7 +3934,7 @@ public com.google.analytics.data.v1beta.PropertyQuota getPropertyQuota() { * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ public Builder setPropertyQuota(com.google.analytics.data.v1beta.PropertyQuota value) { if (propertyQuotaBuilder_ == null) { @@ -4163,7 +3956,7 @@ public Builder setPropertyQuota(com.google.analytics.data.v1beta.PropertyQuota v * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ public Builder setPropertyQuota( com.google.analytics.data.v1beta.PropertyQuota.Builder builderForValue) { @@ -4183,7 +3976,7 @@ public Builder setPropertyQuota( * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ public Builder mergePropertyQuota(com.google.analytics.data.v1beta.PropertyQuota value) { if (propertyQuotaBuilder_ == null) { @@ -4209,7 +4002,7 @@ public Builder mergePropertyQuota(com.google.analytics.data.v1beta.PropertyQuota * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ public Builder clearPropertyQuota() { if (propertyQuotaBuilder_ == null) { @@ -4229,7 +4022,7 @@ public Builder clearPropertyQuota() { * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ public com.google.analytics.data.v1beta.PropertyQuota.Builder getPropertyQuotaBuilder() { @@ -4243,7 +4036,7 @@ public com.google.analytics.data.v1beta.PropertyQuota.Builder getPropertyQuotaBu * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaOrBuilder() { if (propertyQuotaBuilder_ != null) { @@ -4261,7 +4054,7 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ private com.google.protobuf.SingleFieldBuilderV3< com.google.analytics.data.v1beta.PropertyQuota, diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java index d217536f..4f7ebafd 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java @@ -347,53 +347,20 @@ public interface RunReportResponseOrBuilder * * * 
-   * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-   * call to retrieve the next page of report rows. If this field is omitted,
-   * there are no subsequent pages of report rows.
+   * The total number of rows in the query result. `rowCount` is independent of
+   * the number of rows returned in the response, the `limit` request
+   * parameter, and the `offset` request parameter. For example if a query
+   * returns 175 rows and includes `limit` of 50 in the API request, the
+   * response will contain `rowCount` of 175 but only 50 rows.
    * To learn more about this pagination parameter, see
    * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
    *
* - * string next_page_token = 7; + * int32 row_count = 7; * - * @return The nextPageToken. + * @return The rowCount. */ - java.lang.String getNextPageToken(); - /** - * - * - * 
-   * A token that can be sent as `pageToken` in a subsequent `RunReportRequest`
-   * call to retrieve the next page of report rows. If this field is omitted,
-   * there are no subsequent pages of report rows.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-   *
- * - * string next_page_token = 7; - * - * @return The bytes for nextPageToken. - */ - com.google.protobuf.ByteString getNextPageTokenBytes(); - - /** - * - * - * 
-   * The total number of rows in the query result. `totalSize` is independent of
-   * the number of rows returned in the response, the `pageSize` request
-   * parameter, and the `pageToken` request parameter. For example if a query
-   * returns 175 rows and includes `pageSize` of 50 in the API request, the
-   * response will contain `totalSize` of 175 but only 50 rows.
-   * To learn more about this pagination parameter, see
-   * [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination).
-   *
- * - * int32 total_size = 8; - * - * @return The totalSize. - */ - int getTotalSize(); + int getRowCount(); /** * @@ -402,7 +369,7 @@ public interface RunReportResponseOrBuilder * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; * * @return Whether the metadata field is set. */ @@ -414,7 +381,7 @@ public interface RunReportResponseOrBuilder * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; * * @return The metadata. */ @@ -426,7 +393,7 @@ public interface RunReportResponseOrBuilder * Metadata for the report. * * - * .google.analytics.data.v1beta.ResponseMetaData metadata = 9; + * .google.analytics.data.v1beta.ResponseMetaData metadata = 8; */ com.google.analytics.data.v1beta.ResponseMetaDataOrBuilder getMetadataOrBuilder(); @@ -437,7 +404,7 @@ public interface RunReportResponseOrBuilder * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; * * @return Whether the propertyQuota field is set. */ @@ -449,7 +416,7 @@ public interface RunReportResponseOrBuilder * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; * * @return The propertyQuota. */ @@ -461,7 +428,7 @@ public interface RunReportResponseOrBuilder * This Analytics Property's quota state including this request. * * - * .google.analytics.data.v1beta.PropertyQuota property_quota = 10; + * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaOrBuilder(); } diff --git a/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto b/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto index 18010889..9eaca560 100644 --- a/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto +++ b/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto @@ -157,31 +157,30 @@ message RunReportRequest { // Dimensions cannot be used in this filter. FilterExpression metric_filter = 6; - // Page size is for paging and specifies maximum number of rows to return. The - // API returns a maximum of 200,000 rows per request, no matter how many you - // ask for. Page size must be positive. + // The row count of the start row. The first row is counted as row 0. // - // The API can also return fewer rows than the requested `pageSize`, if there - // aren't as many dimension values as the `pageSize`. For instance, there are - // fewer than 300 possible values for the dimension `country`, so when - // reporting on only `country`, you can't get more than 300 rows, even if you - // set `pageSize` to a higher value. + // When paging, the first request does not specify offset; or equivalently, + // sets offset to 0; the first request returns the first `limit` of rows. The + // second request sets offset to the `limit` of the first request; the second + // request returns the second `limit` of rows. // // To learn more about this pagination parameter, see // [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination). - int32 page_size = 7; + int64 offset = 7; - // A continuation token to get the next page of the results. Adding this to - // the request will return the next page of rows after the `pageToken`. The - // `pageToken` should be the value returned in the `nextPageToken` parameter - // in the response. + // The number of rows to return. If unspecified, 10,000 rows are returned. The + // API returns a maximum of 100,000 rows per request, no matter how many you + // ask for. `limit` must be positive. // - // When paginating, all other parameters specified in `RunReportRequest` must - // match the call that provided the page token. + // The API can also return fewer rows than the requested `limit`, if there + // aren't as many dimension values as the `limit`. For instance, there are + // fewer than 300 possible values for the dimension `country`, so when + // reporting on only `country`, you can't get more than 300 rows, even if you + // set `limit` to a higher value. // // To learn more about this pagination parameter, see // [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination). - string page_token = 8; + int64 limit = 8; // Aggregation of metrics. Aggregated metric values will be shown in rows // where the dimension_values are set to "RESERVED_(MetricAggregation)". @@ -230,29 +229,21 @@ message RunReportResponse { // If requested, the minimum values of metrics. repeated Row minimums = 6; - // A token that can be sent as `pageToken` in a subsequent `RunReportRequest` - // call to retrieve the next page of report rows. If this field is omitted, - // there are no subsequent pages of report rows. - // - // To learn more about this pagination parameter, see - // [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination). - string next_page_token = 7; - - // The total number of rows in the query result. `totalSize` is independent of - // the number of rows returned in the response, the `pageSize` request - // parameter, and the `pageToken` request parameter. For example if a query - // returns 175 rows and includes `pageSize` of 50 in the API request, the - // response will contain `totalSize` of 175 but only 50 rows. + // The total number of rows in the query result. `rowCount` is independent of + // the number of rows returned in the response, the `limit` request + // parameter, and the `offset` request parameter. For example if a query + // returns 175 rows and includes `limit` of 50 in the API request, the + // response will contain `rowCount` of 175 but only 50 rows. // // To learn more about this pagination parameter, see // [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/basics#pagination). - int32 total_size = 8; + int32 row_count = 7; // Metadata for the report. - ResponseMetaData metadata = 9; + ResponseMetaData metadata = 8; // This Analytics Property's quota state including this request. - PropertyQuota property_quota = 10; + PropertyQuota property_quota = 9; } // The request to generate a pivot report. @@ -474,19 +465,16 @@ message RunRealtimeReportRequest { // Dimensions cannot be used in this filter. FilterExpression metric_filter = 5; - // Page size specifies maximum number of rows to return. If unspecified, up to - // 10,000 rows are returned. The API returns a maximum of 100,000 rows per - // request, no matter how many you ask for. Page size must be positive. + // The number of rows to return. If unspecified, 10,000 rows are returned. The + // API returns a maximum of 100,000 rows per request, no matter how many you + // ask for. `limit` must be positive. // - // The API can also return fewer rows than the requested `pageSize`, if there - // aren't as many dimension values as the `pageSize`. For instance, there are + // The API can also return fewer rows than the requested `limit`, if there + // aren't as many dimension values as the `limit`. For instance, there are // fewer than 300 possible values for the dimension `country`, so when // reporting on only `country`, you can't get more than 300 rows, even if you - // set `pageSize` to a higher value. - // - // To learn more about this pagination parameter, see - // [Pagination](https://developers.google.com/analytics/devguides/reporting/data/v1/realtime-basics#pagination). - int32 page_size = 6; + // set `limit` to a higher value. + int64 limit = 6; // Aggregation of metrics. Aggregated metric values will be shown in rows // where the dimension_values are set to "RESERVED_(MetricAggregation)". @@ -522,12 +510,12 @@ message RunRealtimeReportResponse { // If requested, the minimum values of metrics. repeated Row minimums = 6; - // The total number of rows in the query result. `totalSize` is independent of - // the number of rows returned in the response and the `pageSize` request - // parameter. For example if a query returns 175 rows and includes `pageSize` - // of 50 in the API request, the response will contain `totalSize` of 175 but + // The total number of rows in the query result. `rowCount` is independent of + // the number of rows returned in the response and the `limit` request + // parameter. For example if a query returns 175 rows and includes `limit` + // of 50 in the API request, the response will contain `rowCount` of 175 but // only 50 rows. - int32 total_size = 7; + int32 row_count = 7; // This Analytics Property's Realtime quota state including this request. PropertyQuota property_quota = 8; diff --git a/synth.metadata b/synth.metadata index df97f504..c4f42b13 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,23 +4,23 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-analytics-data.git", - "sha": "9fd273054f8bc9e14635767fe39153dc0df7448f" + "sha": "b093093800f79bd2591830aecbd3ecd65549fc53" } }, { "git": { "name": "googleapis-gen", "remote": "https://github.com/googleapis/googleapis-gen.git", - "sha": "1ad043d44370c3639640b1f1f549296c005448f5", - "internalRef": "360805639" + "sha": "18e181194cd6da98340da7096f2b8df0c2b6aa9b", + "internalRef": "361182102" } }, { "git": { "name": "googleapis-gen", "remote": "https://github.com/googleapis/googleapis-gen.git", - "sha": "1ad043d44370c3639640b1f1f549296c005448f5", - "internalRef": "360805639" + "sha": "18e181194cd6da98340da7096f2b8df0c2b6aa9b", + "internalRef": "361182102" } }, {