Merge branch 'master' into chore.bucket-boundaries

rudderlabs · Jun 3, 2024 · 47beb87 · 47beb87
2 parents 18e7639 + d3cc894
commit 47beb87
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/integration_test/kafka_batching/kafka_batching_test.go b/integration_test/kafka_batching/kafka_batching_test.go
@@ -33,6 +33,7 @@ import (
 	"github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/kafka"
 	"github.com/rudderlabs/rudder-go-kit/testhelper/docker/resource/postgres"
 	"github.com/rudderlabs/rudder-go-kit/testhelper/rand"
+
 	"github.com/rudderlabs/rudder-server/app"
 	th "github.com/rudderlabs/rudder-server/testhelper"
 	"github.com/rudderlabs/rudder-server/testhelper/destination"
@@ -283,26 +284,22 @@ func TestKafkaBatching(t *testing.T) {
 		{Name: ptr("telemetry_sdk_version"), Value: ptr(stats.OtelVersion())},
 	}
 
+	// 			1, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000,
 	requireHistogramEqual(t, metrics["router_kafka_batch_size"], histogram{
 		name: "router_kafka_batch_size", count: 1, sum: 10,
 		buckets: []*promClient.Bucket{
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.002)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.005)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.01)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.025)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.05)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.1)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.25)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(0.5)},
 			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(1.0)},
-			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(2.5)},
 			{CumulativeCount: ptr(uint64(0)), UpperBound: ptr(5.0)},
 			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(10.0)}, // 10 is the number of messages we sent
-			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(30.0)},
-			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(60.0)},
-			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(300.0)},
-			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(600.0)},
-			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(1800.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(25.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(50.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(100.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(250.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(500.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(1000.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(2500.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(5000.0)},
+			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(10000.0)},
 			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(math.Inf(1))},
 		},
 		labels: expectedDefaultAttrs,

diff --git a/warehouse/integrations/datalake/testdata/etc/jvm.config b/warehouse/integrations/datalake/testdata/etc/jvm.config
@@ -9,3 +9,5 @@
 -XX:ReservedCodeCacheSize=256M
 -Djdk.attach.allowAttachSelf=true
 -Djdk.nio.maxCachedBufferSize=2000000
+-XX:+UnlockDiagnosticVMOptions
+-XX:G1NumCollectionsKeepPinned=10000000