update naming

Author: BrandonArp

src/main/java/com/arpnetworking/tsdcore/model/RequestEntry.java

@@ -40,27 +40,27 @@ public Optional<Long> getPopulationSize() {
         return _populationSize;
     }
 
-    public Long getRequestBodySize() {
-        return _requestBodySize;
+    public Long getRequestBodyBytes() {
+        return _requestBodyBytes;
     }
 
-    public Long getRequestBodyEncodedSize() {
-        return _requestBodyEncodedSize;
+    public Long getRequestBodyCompressedBytes() {
+        return _requestBodyCompressedBytes;
     }
 
     private RequestEntry(final Builder builder) {
         _request = builder._request;
         _enterTime = builder._enterTime;
         _populationSize = builder._populationSize;
-        _requestBodySize = builder._requestBodySize;
-        _requestBodyEncodedSize = builder._requestBodyEncodedSize;
+        _requestBodyBytes = builder._requestBodyBytes;
+        _requestBodyCompressedBytes = builder._requestBodyCompressedBytes;
     }
 
     private final Request _request;
     private final Instant _enterTime;
     private final Optional<Long> _populationSize;
-    private final Long _requestBodySize;
-    private final Long _requestBodyEncodedSize;
+    private final Long _requestBodyBytes;
+    private final Long _requestBodyCompressedBytes;
 
     /**
      * {@link com.arpnetworking.commons.builder.Builder} implementation for
@@ -112,24 +112,24 @@ public Builder setPopulationSize(final Optional<Long> value) {
         }
 
         /**
-         * Set the request body size. Required. Cannot be null.
+         * Set the request body size in bytes. Required. Cannot be null.
          *
-         * @param value The request body size.
+         * @param value The request body size in bytes.
          * @return This {@link Builder} instance.
          */
-        public Builder setRequestBodySize(final Long value) {
-            _requestBodySize = value;
+        public Builder setRequestBodyBytes(final Long value) {
+            _requestBodyBytes = value;
             return this;
         }
 
         /**
-         * Set the request body encoded size. Required. Cannot be null.
+         * Set the request body compressed size in bytes. Required. Cannot be null.
          *
-         * @param value The request body encoded size.
+         * @param value The request body compressed size in bytes.
          * @return This {@link Builder} instance.
          */
-        public Builder setRequestBodyEncodedSize(final Long value) {
-            _requestBodyEncodedSize = value;
+        public Builder setRequestBodyCompressedBytes(final Long value) {
+            _requestBodyCompressedBytes = value;
             return this;
         }
 
@@ -140,9 +140,9 @@ public Builder setRequestBodyEncodedSize(final Long value) {
         @NotNull
         private Optional<Long> _populationSize = Optional.empty();
         @NotNull
-        private Long _requestBodySize;
+        private Long _requestBodyBytes;
         @NotNull
-        private Long _requestBodyEncodedSize;
+        private Long _requestBodyCompressedBytes;
     }
 }
 

src/main/java/com/arpnetworking/tsdcore/sinks/HttpPostSink.java

@@ -159,8 +159,8 @@ protected Collection<RequestEntry.Builder> createRequests(
             final RequestInfo requestInfo = createRequest(client, datum);
             requestEntryBuilders.add(new RequestEntry.Builder()
                     .setRequest(requestInfo.request())
-                    .setRequestBodySize(requestInfo.bodySize())
-                    .setRequestBodyEncodedSize(requestInfo.encodedSize())
+                    .setRequestBodyBytes(requestInfo.bodySize())
+                    .setRequestBodyCompressedBytes(requestInfo.encodedSize())
                     .setPopulationSize(serializedDatum.getPopulationSize()));
         }
         return requestEntryBuilders;

src/main/java/com/arpnetworking/tsdcore/sinks/HttpSinkActor.java

@@ -113,8 +113,8 @@ public HttpSinkActor(
         }
         _evictedRequestsName = "sinks/http_post/" + _sink.getMetricSafeName() + "/evicted_requests";
         _requestLatencyName = "sinks/http_post/" + _sink.getMetricSafeName() + "/request_latency";
-        _requestBodySizeName = "sinks/http_post/" + _sink.getMetricSafeName() + "/request_body_size";
-        _requestBodyEncodedSizeName = "sinks/http_post/" + _sink.getMetricSafeName() + "/request_body_encoded_size";
+        _requestBodyBytesName = "sinks/http_post/" + _sink.getMetricSafeName() + "/request_body_bytes";
+        _requestBodyCompressedBytesName = "sinks/http_post/" + _sink.getMetricSafeName() + "/request_body_compressed_bytes";
         _inQueueLatencyName = "sinks/http_post/" + _sink.getMetricSafeName() + "/queue_time";
         _pendingRequestsQueueSizeName = "sinks/http_post/" + _sink.getMetricSafeName() + "/queue_size";
         _inflightRequestsCountName = "sinks/http_post/" + _sink.getMetricSafeName() + "/inflight_count";
@@ -503,12 +503,12 @@ private void fireRequest(final RequestEntry request, final int attempt) {
                 });
         Patterns.pipe(responsePromise, context().dispatcher()).to(self());
         _periodicMetrics.recordCounter(
-                _requestBodySizeName,
-                request.getRequestBodySize()
+                _requestBodyBytesName,
+                request.getRequestBodyBytes()
         );
         _periodicMetrics.recordCounter(
-                _requestBodyEncodedSizeName,
-                request.getRequestBodyEncodedSize()
+                _requestBodyCompressedBytesName,
+                request.getRequestBodyCompressedBytes()
         );
         _client.executeRequest(request.getRequest(), new ResponseAsyncCompletionHandler(promise));
     }
@@ -558,8 +558,8 @@ private void scheduleRetry(final RequestEntry requestEntry, final int attempt) {
     private final String _httpSinkAttemptsName;
     private final String _samplesSentName;
     private final String _samplesDroppedName;
-    private final String _requestBodySizeName;
-    private final String _requestBodyEncodedSizeName;
+    private final String _requestBodyBytesName;
+    private final String _requestBodyCompressedBytesName;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpSinkActor.class);
     private static final Logger POST_RETRY_LOGGER = LoggerFactory.getRateLimitLogger(HttpSinkActor.class, Duration.ofSeconds(30));