From 962c550251fbc0ab75ba6dbb924cfb2849d8f1ce Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Sun, 20 Apr 2025 10:05:11 -0400 Subject: [PATCH 1/3] Fix typo in LGTM container Fix prometheus typo in method name --- .../java/org/testcontainers/grafana/LgtmStackContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java index 080be6d6eaf..595d016772a 100644 --- a/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java +++ b/modules/grafana/src/main/java/org/testcontainers/grafana/LgtmStackContainer.java @@ -58,7 +58,7 @@ public String getOtlpHttpUrl() { return "http://" + getHost() + ":" + getMappedPort(OTLP_HTTP_PORT); } - public String getPromehteusHttpUrl() { + public String getPrometheusHttpUrl() { return "http://" + getHost() + ":" + getMappedPort(PROMETHEUS_PORT); } From c1787f8c829a8d001fefd01ab9812c5920956ec0 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Mon, 21 Apr 2025 17:03:15 -0400 Subject: [PATCH 2/3] update test --- .../java/org/testcontainers/grafana/LgtmStackContainerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java index cb5dbaa630b..f5efe628f3c 100644 --- a/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java +++ b/modules/grafana/src/test/java/org/testcontainers/grafana/LgtmStackContainerTest.java @@ -46,7 +46,7 @@ public void shouldPublishMetric() throws Exception { Response response = RestAssured .given() .queryParam("query", "test_counter_total{job=\"testcontainers\"}") - .get(String.format("%s/api/v1/query", lgtm.getPromehteusHttpUrl())) + .get(String.format("%s/api/v1/query", lgtm.getPrometheusHttpUrl())) .prettyPeek() .thenReturn(); assertThat(response.getStatusCode()).isEqualTo(200); From f1f9deb822b561aabd231decf59c3c8f987f2bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Mon, 21 Apr 2025 16:36:37 -0500 Subject: [PATCH 3/3] Add japicmp exclusions in grafana --- modules/grafana/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/grafana/build.gradle b/modules/grafana/build.gradle index 72082e4cfec..34a45cc404b 100644 --- a/modules/grafana/build.gradle +++ b/modules/grafana/build.gradle @@ -8,3 +8,9 @@ dependencies { testImplementation 'io.micrometer:micrometer-registry-otlp:1.13.4' testImplementation 'uk.org.webcompere:system-stubs-junit4:2.1.6' } + +tasks.japicmp { + methodExcludes = [ + "org.testcontainers.grafana.LgtmStackContainer#getPromehteusHttpUrl()" + ] +}