add integration test

grafana · Sep 27, 2024 · 68f61c4 · 68f61c4
1 parent f929005
commit 68f61c4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/test/integration/docker-compose-ruby.yml b/test/integration/docker-compose-ruby.yml
@@ -5,6 +5,9 @@ services:
     image: ghcr.io/grafana/beyla-test/greeting-rails${TESTSERVER_IMAGE_SUFFIX}/0.0.1
     ports:
       - "${TEST_SERVICE_PORTS}"
+    environment:
+      OTEL_SERVICE_NAME: "my-ruby-app"
+      OTEL_RESOURCE_ATTRIBUTES: "data-center=ca,deployment-zone=to"
     depends_on:
       otelcol:
         condition: service_started

diff --git a/test/integration/red_test_ruby.go b/test/integration/red_test_ruby.go
@@ -48,6 +48,18 @@ func testREDMetricsForRubyHTTPLibrary(t *testing.T, url string, comm string) {
 		}
 	})
 
+	// check that the resource attributes we passed made it for the service
+	test.Eventually(t, testTimeout, func(t require.TestingT) {
+		var err error
+		results, err = pq.Query(`target_info{` +
+			`data_center="ca",` +
+			`deployment_zone="to"}`)
+		require.NoError(t, err)
+		enoughPromResults(t, results)
+		val := totalPromCount(t, results)
+		assert.LessOrEqual(t, 1, val)
+	})
+
 	// Call 4 times the instrumented service, forcing it to:
 	// - process multiple calls in a row with, one more than we might need
 	// - returning a 200 code
@@ -83,7 +95,7 @@ func testREDMetricsRailsHTTP(t *testing.T) {
 	} {
 		t.Run(testCaseURL, func(t *testing.T) {
 			waitForRubyTestComponents(t, testCaseURL)
-			testREDMetricsForRubyHTTPLibrary(t, testCaseURL, "ruby")
+			testREDMetricsForRubyHTTPLibrary(t, testCaseURL, "my-ruby-app")
 		})
 	}
 }
@@ -94,7 +106,7 @@ func testREDMetricsRailsHTTPS(t *testing.T) {
 	} {
 		t.Run(testCaseURL, func(t *testing.T) {
 			waitForRubyTestComponents(t, testCaseURL)
-			testREDMetricsForRubyHTTPLibrary(t, testCaseURL, "ruby")
+			testREDMetricsForRubyHTTPLibrary(t, testCaseURL, "my-ruby-app")
 		})
 	}
 }