Include comma separator in byte count for Dynatrace payload splitting

The next comma that would be added in case a time series was already added was considered, but previous commas added were not counted.
micrometer-metrics · Jan 11, 2019 · 508a594 · 508a594
1 parent 9d34a65
commit 508a594
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/...eter-registry-dynatrace/src/main/java/io/micrometer/dynatrace/DynatraceMeterRegistry.java b/...eter-registry-dynatrace/src/main/java/io/micrometer/dynatrace/DynatraceMeterRegistry.java
@@ -283,6 +283,7 @@ private List<DynatraceBatchedPayload> createPostMessageBodies(List<DynatraceTime
             }
             if (payload.length() > 0) {
                 payload.append(',');
+                totalByteCount++;
             }
             payload.append(json);
             totalByteCount += jsonByteCount;

diff --git a/...-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java b/...-registry-dynatrace/src/test/java/io/micrometer/dynatrace/DynatraceMeterRegistryTest.java
@@ -204,9 +204,9 @@ void splitsWhenExactlyExceedingMaxByComma() {
         List<DynatraceBatchedPayload> messages = meterRegistry.createPostMessages("my.type",
             // Max bytes: 15330 (excluding header/footer, 15360 with header/footer)
             Arrays.asList(createTimeSeriesWithDimensions(750), // 14861 bytes
-                createTimeSeriesWithDimensions(23, "asdfg"), // 469 bytes
+                createTimeSeriesWithDimensions(23, "asdfg"), // 469 bytes (overflows due to comma)
                 createTimeSeriesWithDimensions(750), // 14861 bytes
-                createTimeSeriesWithDimensions(23, "asdf") // 468 bytes
+                createTimeSeriesWithDimensions(23, "asdf") // 468 bytes + comma
             ));
         assertThat(messages).hasSize(3);
         assertThat(messages.get(0).metricCount).isEqualTo(1);
@@ -216,6 +216,20 @@ void splitsWhenExactlyExceedingMaxByComma() {
         assertThat(messages.stream().map(message -> message.payload).allMatch(DynatraceMeterRegistryTest::isJSONValid)).isTrue();
     }
 
+    @Test
+    void countsPreviousAndNextComma() {
+        List<DynatraceBatchedPayload> messages = meterRegistry.createPostMessages("my.type",
+            // Max bytes: 15330 (excluding header/footer, 15360 with header/footer)
+            Arrays.asList(createTimeSeriesWithDimensions(750), // 14861 bytes
+                createTimeSeriesWithDimensions(10, "asdf"), // 234 bytes + comma
+                createTimeSeriesWithDimensions(10, "asdf") // 234 bytes + comma = 15331 bytes (overflow)
+            ));
+        assertThat(messages).hasSize(2);
+        assertThat(messages.get(0).metricCount).isEqualTo(2);
+        assertThat(messages.get(1).metricCount).isEqualTo(1);
+        assertThat(messages.stream().map(message -> message.payload).allMatch(DynatraceMeterRegistryTest::isJSONValid)).isTrue();
+    }
+
     private DynatraceTimeSeries createTimeSeriesWithDimensions(int numberOfDimensions) {
         return createTimeSeriesWithDimensions(numberOfDimensions, "some.metric");
     }