diff --git a/src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java b/src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java index be1312a5..1576dc7a 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java +++ b/src/test/java/io/vertx/redis/client/test/RedisClientMetricsTest.java @@ -38,14 +38,14 @@ public class RedisClientMetricsTest { @Before public void setup() { - vertx = Vertx.vertx(new VertxOptions().setMetricsOptions( - new MetricsOptions().setEnabled(true).setFactory(ignored -> new VertxMetrics() { + vertx = Vertx.builder() + .withMetrics(ignored -> new VertxMetrics() { @Override public ClientMetrics createClientMetrics(SocketAddress remoteAddress, String type, String namespace) { return metrics; } - })) - ); + }) + .build(); client = Redis.createClient(vertx, new RedisOptions().setConnectionString("redis://" + redis.getHost() + ":" + redis.getFirstMappedPort())); } diff --git a/src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java b/src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java index 4d305a13..dc8a70d5 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java +++ b/src/test/java/io/vertx/redis/client/test/RedisPoolMetricsTest.java @@ -1,7 +1,7 @@ package io.vertx.redis.client.test; +import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; -import io.vertx.core.metrics.MetricsOptions; import io.vertx.core.metrics.impl.DummyVertxMetrics; import io.vertx.core.spi.VertxMetricsFactory; import io.vertx.core.spi.metrics.PoolMetrics; @@ -27,29 +27,29 @@ public class RedisPoolMetricsTest { private static final AtomicReference POOL_NAME = new AtomicReference<>(); - private static VertxOptions getOptions() { - MetricsOptions options = new MetricsOptions().setEnabled(true); - options.setFactory(new VertxMetricsFactory() { - @Override - public VertxMetrics metrics(VertxOptions options) { - return new DummyVertxMetrics() { - @Override - public PoolMetrics createPoolMetrics(String poolType, String poolName, int maxPoolSize) { - if (poolType.equals("redis")) { - POOL_NAME.set(poolName); - return new FakePoolMetrics(poolName, maxPoolSize); - } else { - return super.createPoolMetrics(poolType, poolName, maxPoolSize); + private static Vertx getVertx() { + return Vertx.builder() + .withMetrics(new VertxMetricsFactory() { + @Override + public VertxMetrics metrics(VertxOptions options) { + return new DummyVertxMetrics() { + @Override + public PoolMetrics createPoolMetrics(String poolType, String poolName, int maxPoolSize) { + if (poolType.equals("redis")) { + POOL_NAME.set(poolName); + return new FakePoolMetrics(poolName, maxPoolSize); + } else { + return super.createPoolMetrics(poolType, poolName, maxPoolSize); + } } - } - }; - } - }); - return new VertxOptions().setMetricsOptions(options); + }; + } + }) + .build(); } @Rule - public final RunTestOnContext rule = new RunTestOnContext(getOptions()); + public final RunTestOnContext rule = new RunTestOnContext(RedisPoolMetricsTest::getVertx); @ClassRule public static final GenericContainer redis = new GenericContainer<>("redis:7") diff --git a/src/test/java/io/vertx/redis/client/test/RedisTracingTest.java b/src/test/java/io/vertx/redis/client/test/RedisTracingTest.java index ac69eb56..9b5a94b1 100644 --- a/src/test/java/io/vertx/redis/client/test/RedisTracingTest.java +++ b/src/test/java/io/vertx/redis/client/test/RedisTracingTest.java @@ -42,8 +42,8 @@ public class RedisTracingTest { @Before public void setup() { - vertx = Vertx.vertx(new VertxOptions().setTracingOptions( - new TracingOptions().setFactory(ignored -> new VertxTracer() { + vertx = Vertx.builder() + .withTracer(ignored -> new VertxTracer() { @Override public Object sendRequest(Context context, SpanKind kind, TracingPolicy tracingPolicy, Object request, String operation, BiConsumer headers, TagExtractor tagExtractor) { return tracer.sendRequest(context, kind, tracingPolicy, request, operation, headers, tagExtractor); @@ -52,8 +52,7 @@ public Object sendRequest(Context context, SpanKind kind, TracingPolicy tracingP public void receiveResponse(Context context, Object response, Object payload, Throwable failure, TagExtractor tagExtractor) { tracer.receiveResponse(context, response, payload, failure, tagExtractor); } - })) - ); + }).build(); client = Redis.createClient(vertx, new RedisOptions().setConnectionString("redis://" + redis.getHost() + ":" + redis.getFirstMappedPort())); }