diff --git a/README.md b/README.md index 055b736..c0f2947 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,9 @@ pom.xml // Instantiate tracer Tracer tracer = ... +// Optionally register tracer with GlobalTracer +GlobalTracer.register(tracer); + // Instantiate Cluster Builder Cluster.Builder builder = Cluster.builder().addContactPoints("127.0.0.1").withPort(9142); diff --git a/pom.xml b/pom.xml index f723720..de1bb0b 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 0.31.0 4.3.0 - 0.8.1 + 0.8.2 3.5.1 @@ -89,7 +89,7 @@ org.cassandraunit cassandra-unit - 3.3.0.2 + 3.5.0.1 test @@ -109,7 +109,7 @@ org.awaitility awaitility - 3.1.0 + 3.1.2 test @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.7.0 + 3.8.0 ${java.version} ${java.version} @@ -236,7 +236,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.0.0 + 3.0.1 false diff --git a/src/main/java/io/opentracing/contrib/cassandra/TracingCluster.java b/src/main/java/io/opentracing/contrib/cassandra/TracingCluster.java index c0884df..950be4c 100644 --- a/src/main/java/io/opentracing/contrib/cassandra/TracingCluster.java +++ b/src/main/java/io/opentracing/contrib/cassandra/TracingCluster.java @@ -21,6 +21,7 @@ import io.opentracing.Tracer; import io.opentracing.contrib.cassandra.nameprovider.CustomStringSpanName; import io.opentracing.contrib.cassandra.nameprovider.QuerySpanNameProvider; +import io.opentracing.util.GlobalTracer; /** * Tracing decorator for {@link Cluster} @@ -36,12 +37,27 @@ public TracingCluster(Initializer initializer, Tracer tracer) { this.querySpanNameProvider = CustomStringSpanName.newBuilder().build("execute"); } - public TracingCluster(Initializer initializer, Tracer tracer, QuerySpanNameProvider querySpanNameProvider) { + /** + * GlobalTracer is used to get tracer + */ + public TracingCluster(Initializer initializer) { + this(initializer, GlobalTracer.get()); + } + + public TracingCluster(Initializer initializer, Tracer tracer, + QuerySpanNameProvider querySpanNameProvider) { super(initializer); this.tracer = tracer; this.querySpanNameProvider = querySpanNameProvider; } + /** + * GlobalTracer is used to get tracer + */ + public TracingCluster(Initializer initializer, QuerySpanNameProvider querySpanNameProvider) { + this(initializer, GlobalTracer.get(), querySpanNameProvider); + } + /** * {@inheritDoc} */ diff --git a/src/test/java/io/opentracing/contrib/cassandra/CassandraMappingTest.java b/src/test/java/io/opentracing/contrib/cassandra/CassandraMappingTest.java index fd16790..6dcd8bd 100644 --- a/src/test/java/io/opentracing/contrib/cassandra/CassandraMappingTest.java +++ b/src/test/java/io/opentracing/contrib/cassandra/CassandraMappingTest.java @@ -45,6 +45,7 @@ public class CassandraMappingTest { public void before() throws Exception { System.setProperty("java.library.path", "src/test/resources/libs"); EmbeddedCassandraServerHelper.startEmbeddedCassandra(); + EmbeddedCassandraServerHelper.getSession(); Session session = createSession(); createKeyspace(session); createTable(session); diff --git a/src/test/java/io/opentracing/contrib/cassandra/CassandraTest.java b/src/test/java/io/opentracing/contrib/cassandra/CassandraTest.java index 51ac1f2..f0358ac 100644 --- a/src/test/java/io/opentracing/contrib/cassandra/CassandraTest.java +++ b/src/test/java/io/opentracing/contrib/cassandra/CassandraTest.java @@ -54,6 +54,7 @@ public void before() throws Exception { System.setProperty("java.library.path", "src/test/resources/libs"); mockTracer.reset(); EmbeddedCassandraServerHelper.startEmbeddedCassandra(); + EmbeddedCassandraServerHelper.getSession(); } @After