chore: rudder-go-kit v0.13.4 (#3365)

* chore: rudder-go-kit v0.13.4 * chore: updating stats in test
rudderlabs · May 20, 2023 · dfb8745 · dfb8745
1 parent 6fd8552
commit dfb8745
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -72,7 +72,7 @@ require (
 	github.com/prometheus/client_model v0.4.0
 	github.com/rs/cors v1.9.0
 	github.com/rudderlabs/analytics-go v3.3.3+incompatible
-	github.com/rudderlabs/rudder-go-kit v0.13.3
+	github.com/rudderlabs/rudder-go-kit v0.13.4
 	github.com/rudderlabs/sql-tunnels v0.1.3
 	github.com/samber/lo v1.38.1
 	github.com/segmentio/kafka-go v0.4.40

diff --git a/go.sum b/go.sum
@@ -1841,8 +1841,8 @@ github.com/rudderlabs/analytics-go v3.3.3+incompatible h1:OG0XlKoXfr539e2t1dXtTB
 github.com/rudderlabs/analytics-go v3.3.3+incompatible/go.mod h1:LF8/ty9kUX4PTY3l5c97K3nZZaX5Hwsvt+NBaRL/f30=
 github.com/rudderlabs/compose-test v0.1.1 h1:YJn30Fg0+pk9abKTBbWssiofwPuOEfe7Nb2UxKkC+FA=
 github.com/rudderlabs/compose-test v0.1.1/go.mod h1:z2dUBgcXaOhhMUcG09lZpqdz5S8bYOIX2wAx4itEr1o=
-github.com/rudderlabs/rudder-go-kit v0.13.3 h1:Tl1yN7TZXjVXYe7TBkMYV2yv6tfdOZpDvRxUrH74C/0=
-github.com/rudderlabs/rudder-go-kit v0.13.3/go.mod h1:3P7g4yt8TxiN6zSGvl2h/9dh1ae6GQi5zRP02rva+28=
+github.com/rudderlabs/rudder-go-kit v0.13.4 h1:U8B/moa2VxdPncQ8CmIDetLDYBA8GUj+vs02wmkWixg=
+github.com/rudderlabs/rudder-go-kit v0.13.4/go.mod h1:3P7g4yt8TxiN6zSGvl2h/9dh1ae6GQi5zRP02rva+28=
 github.com/rudderlabs/sql-tunnels v0.1.3 h1:o7/MX4Yj0WpAaw0uxkRmkagtzedGxUPRwyho4SMbWMQ=
 github.com/rudderlabs/sql-tunnels v0.1.3/go.mod h1:1TolUkSsrQxdXS0iyGlbLADsgkebmPcz1MxU5xBl6dE=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=

diff --git a/integration_test/kafka_batching/kafka_batching_test.go b/integration_test/kafka_batching/kafka_batching_test.go
@@ -294,6 +294,16 @@ func TestKafkaBatching(t *testing.T) {
 	metrics, err := testhelper.ParsePrometheusMetrics(bytes.NewBuffer(buf))
 	require.NoError(t, err)
 
+	expectedDefaultAttrs := []*promClient.LabelPair{
+		{Name: ptr("job"), Value: ptr(app.EMBEDDED)},
+		{Name: ptr("service_name"), Value: ptr(app.EMBEDDED)},
+		{Name: ptr("service_version"), Value: ptr("Not an official release. Get the latest release from the github repo.")},
+		{Name: ptr("instanceName"), Value: &serverInstanceID},
+		{Name: ptr("telemetry_sdk_language"), Value: ptr("go")},
+		{Name: ptr("telemetry_sdk_name"), Value: ptr("opentelemetry")},
+		{Name: ptr("telemetry_sdk_version"), Value: ptr("1.14.0")},
+	}
+
 	requireHistogramEqual(t, metrics["router_kafka_batch_size"], histogram{
 		name: "router_kafka_batch_size", count: 1, sum: 10,
 		buckets: []*promClient.Bucket{
@@ -320,31 +330,24 @@ func TestKafkaBatching(t *testing.T) {
 			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(1209600.0)},
 			{CumulativeCount: ptr(uint64(1)), UpperBound: ptr(math.Inf(1))},
 		},
-		labels: []*promClient.LabelPair{
-			{Name: ptr("job"), Value: ptr(app.EMBEDDED)},
-			{Name: ptr("instance"), Value: &serverInstanceID},
-		},
+		labels: expectedDefaultAttrs,
 	})
 
 	require.EqualValues(t, ptr("router_batch_num_input_jobs"), metrics["router_batch_num_input_jobs"].Name)
 	require.EqualValues(t, ptr(promClient.MetricType_COUNTER), metrics["router_batch_num_input_jobs"].Type)
 	require.Len(t, metrics["router_batch_num_input_jobs"].Metric, 1)
 	require.EqualValues(t, &promClient.Counter{Value: ptr(10.0)}, metrics["router_batch_num_input_jobs"].Metric[0].Counter)
-	require.ElementsMatch(t, []*promClient.LabelPair{
-		{Name: ptr("destType"), Value: ptr("KAFKA")},
-		{Name: ptr("job"), Value: ptr(app.EMBEDDED)},
-		{Name: ptr("instance"), Value: &serverInstanceID},
-	}, metrics["router_batch_num_input_jobs"].Metric[0].Label)
+	require.ElementsMatch(t, append(expectedDefaultAttrs,
+		&promClient.LabelPair{Name: ptr("destType"), Value: ptr("KAFKA")},
+	), metrics["router_batch_num_input_jobs"].Metric[0].Label)
 
 	require.EqualValues(t, ptr("router_batch_num_output_jobs"), metrics["router_batch_num_output_jobs"].Name)
 	require.EqualValues(t, ptr(promClient.MetricType_COUNTER), metrics["router_batch_num_output_jobs"].Type)
 	require.Len(t, metrics["router_batch_num_output_jobs"].Metric, 1)
 	require.EqualValues(t, &promClient.Counter{Value: ptr(1.0)}, metrics["router_batch_num_output_jobs"].Metric[0].Counter)
-	require.ElementsMatch(t, []*promClient.LabelPair{
-		{Name: ptr("destType"), Value: ptr("KAFKA")},
-		{Name: ptr("job"), Value: ptr(app.EMBEDDED)},
-		{Name: ptr("instance"), Value: &serverInstanceID},
-	}, metrics["router_batch_num_output_jobs"].Metric[0].Label)
+	require.ElementsMatch(t, append(expectedDefaultAttrs,
+		&promClient.LabelPair{Name: ptr("destType"), Value: ptr("KAFKA")},
+	), metrics["router_batch_num_output_jobs"].Metric[0].Label)
 }
 
 func requireHistogramEqual(t *testing.T, mf *promClient.MetricFamily, h histogram) {