Skip to content

Commit ac3ff6d

Browse files
committed
Fixed merge issue
1 parent 7ade121 commit ac3ff6d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/HBaseIntegrationTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import static org.assertj.core.data.MapEntry.entry;
1313

1414
import io.opentelemetry.contrib.jmxscraper.JmxScraperContainer;
15+
import java.nio.file.Path;
1516
import java.time.Duration;
1617
import org.testcontainers.containers.GenericContainer;
1718
import org.testcontainers.containers.wait.strategy.Wait;
@@ -31,7 +32,9 @@ protected GenericContainer<?> createTargetContainer(int jmxPort) {
3132
}
3233

3334
@Override
34-
protected JmxScraperContainer customizeScraperContainer(JmxScraperContainer scraper) {
35+
protected JmxScraperContainer customizeScraperContainer(
36+
JmxScraperContainer scraper, GenericContainer<?> target, Path tempDir
37+
) {
3538
return scraper.withTargetSystem("hbase");
3639
}
3740

0 commit comments

Comments
 (0)