Merge pull request #552 from salesforce/metric-client-fix

metric client fix
salesforce · Jun 26, 2023 · 79fad4a · 79fad4a
2 parents 3efc671 + 58d4811
commit 79fad4a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/timbermill-java/timbermill-api/pom.xml b/timbermill-java/timbermill-api/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.2</timbermill.version>
+        <timbermill.version>2.5.3</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
     </properties>
 

diff --git a/timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/unit/Event.java b/timbermill-java/timbermill-api/src/main/java/com/datorama/oss/timbermill/unit/Event.java
@@ -288,7 +288,7 @@ private int getNumberMapSize(Map<String, Number> map) {
 					size += entry.getKey().length();
 				}
 				if (entry.getValue() != null) {
-					size += (Math.log10(entry.getValue().doubleValue()) + 1) + 4; // "":,
+					size += (entry.getValue().toString().length() + 1) + 4; // "":,
 				}
 			}
 		}

diff --git a/timbermill-java/timbermill-client/pom.xml b/timbermill-java/timbermill-client/pom.xml
@@ -15,7 +15,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.2</timbermill.version>
+        <timbermill.version>2.5.3</timbermill.version>
         <aspectj.version>1.9.7</aspectj.version>
         <org.springframework.version>5.3.20</org.springframework.version>
     </properties>

diff --git a/...mbermill-client/src/main/java/com/datorama/oss/timbermill/pipe/SizedBoundEventsQueue.java b/...mbermill-client/src/main/java/com/datorama/oss/timbermill/pipe/SizedBoundEventsQueue.java
@@ -73,6 +73,10 @@ private boolean isExceededMaxTimeToWait(long startBatchTime) {
 	}
 
 
+	public int getMaxSize() {
+		return maxSize;
+	}
+
 	@Override
 	public int size() {
 		return size.get();

diff --git a/...ill-client/src/main/java/com/datorama/oss/timbermill/pipe/TimbermillServerOutputPipe.java b/...ill-client/src/main/java/com/datorama/oss/timbermill/pipe/TimbermillServerOutputPipe.java
@@ -159,7 +159,7 @@ private HttpURLConnection getHttpURLConnection() throws IOException {
     @Override
     public void send(Event e) {
         if(!this.buffer.offer(e)){
-            LOG.warn("Event {} was removed from the queue due to insufficient space", e.getTaskId());
+            LOG.warn("Event {} with estimated size of {} was removed from the queue due to insufficient space. Current queue size {} max queue size {}", e.getTaskId(), e.estimatedSize(), this.buffer.size(), this.buffer.getMaxSize());
         }
     }
 

diff --git a/timbermill-java/timbermill-local/pom.xml b/timbermill-java/timbermill-local/pom.xml
@@ -14,7 +14,7 @@
 
     <properties>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.2</timbermill.version>
+        <timbermill.version>2.5.3</timbermill.version>
         <kamon.bundle.version>2.5.12</kamon.bundle.version>
     </properties>
 

diff --git a/timbermill-java/timbermill-server/pom.xml b/timbermill-java/timbermill-server/pom.xml
@@ -17,7 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.source-target.version>1.8</java.source-target.version>
-        <timbermill.version>2.5.2</timbermill.version>
+        <timbermill.version>2.5.3</timbermill.version>
         <slf4jVersion>1.7.28</slf4jVersion>
         <logbackVersion>0.1.5</logbackVersion>
     </properties>