Revert to StringDataBucket for now

robbins · robbins · commit 84729e37bbc7 · 2017-07-06T15:10:58.000+01:00
diff --git a/java/src/com/ibm/javametrics/agent/JavaAgent.java b/java/src/com/ibm/javametrics/agent/JavaAgent.java
@@ -51,10 +51,13 @@ public void pushData(String type, String data) {
         synchronized (buckets) {
             Bucket bucket = buckets.get(type);
             if (bucket == null) {
-                bucket = new ArrayDataBucket(MAX_BUCKET_SIZE);
+                bucket = new StringDataBucket(MAX_BUCKET_SIZE);
                 buckets.put(type, bucket);
             }
-            bucket.addData(data);
+            if (!bucket.addData(data)) {
+                // System.err.println("Javametrics: data dropped. Bucket size="
+                // + bucket.getSize());
+            }
         }
     }
 
@@ -86,7 +89,7 @@ private void drainBatched(String type, Bucket bucket) {
             emit(type, sb.toString());
         }
     }
-  
+
     private void emit(String type, String data) {
         if (data != null) {
             receivers.forEach((receiver) -> {

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,13 @@ public void pushData(String type, String data) {`
`51`	`51`	`synchronized (buckets) {`
`52`	`52`	`Bucket bucket = buckets.get(type);`
`53`	`53`	`if (bucket == null) {`
`54`		`- bucket = new ArrayDataBucket(MAX_BUCKET_SIZE);`
	`54`	`+ bucket = new StringDataBucket(MAX_BUCKET_SIZE);`
`55`	`55`	`buckets.put(type, bucket);`
`56`	`56`	`}`
`57`		`- bucket.addData(data);`
	`57`	`+ if (!bucket.addData(data)) {`
	`58`	`+ // System.err.println("Javametrics: data dropped. Bucket size="`
	`59`	`+ // + bucket.getSize());`
	`60`	`+ }`
`58`	`61`	`}`
`59`	`62`	`}`
`60`	`63`
`@@ -86,7 +89,7 @@ private void drainBatched(String type, Bucket bucket) {`
`86`	`89`	`emit(type, sb.toString());`
`87`	`90`	`}`
`88`	`91`	`}`
`89`		`-`
	`92`	`+`
`90`	`93`	`private void emit(String type, String data) {`
`91`	`94`	`if (data != null) {`
`92`	`95`	`receivers.forEach((receiver) -> {`