diff --git a/discovery-server/pom.xml b/discovery-server/pom.xml index a9bf738..1483abf 100644 --- a/discovery-server/pom.xml +++ b/discovery-server/pom.xml @@ -143,6 +143,11 @@ jmx + + io.airlift + tracing + + com.google.code.findbugs jsr305 diff --git a/discovery-server/src/main/java/io/airlift/discovery/server/DiscoveryServer.java b/discovery-server/src/main/java/io/airlift/discovery/server/DiscoveryServer.java index 038651a..09b7c74 100644 --- a/discovery-server/src/main/java/io/airlift/discovery/server/DiscoveryServer.java +++ b/discovery-server/src/main/java/io/airlift/discovery/server/DiscoveryServer.java @@ -28,10 +28,14 @@ import io.airlift.log.Logger; import io.airlift.node.NodeModule; import io.airlift.tracetoken.TraceTokenModule; +import io.airlift.tracing.TracingModule; import org.weakref.jmx.guice.MBeanModule; +import static com.google.common.base.MoreObjects.firstNonNull; + public final class DiscoveryServer { + private static final String VERSION = firstNonNull(DiscoveryServer.class.getPackage().getImplementationVersion(), "unknown"); private static final Logger log = Logger.get(DiscoveryServer.class); private DiscoveryServer() {} @@ -50,6 +54,7 @@ public static void main(String[] args) new DiscoveryServerModule(), new HttpEventModule(), new TraceTokenModule(), + new TracingModule("discovery", VERSION), new DiscoveryModule() ); diff --git a/discovery-server/src/main/java/io/airlift/discovery/server/testing/TestingDiscoveryServer.java b/discovery-server/src/main/java/io/airlift/discovery/server/testing/TestingDiscoveryServer.java index e1ee7df..27fbd73 100644 --- a/discovery-server/src/main/java/io/airlift/discovery/server/testing/TestingDiscoveryServer.java +++ b/discovery-server/src/main/java/io/airlift/discovery/server/testing/TestingDiscoveryServer.java @@ -24,6 +24,7 @@ import io.airlift.jmx.testing.TestingJmxModule; import io.airlift.json.JsonModule; import io.airlift.node.testing.TestingNodeModule; +import io.airlift.tracing.TracingModule; import org.weakref.jmx.guice.MBeanModule; import java.net.URI; @@ -43,6 +44,7 @@ public TestingDiscoveryServer(String environment) new JsonModule(), new JaxrsModule(), new TestingJmxModule(), + new TracingModule("discovery", "testversion"), new DiscoveryModule(), new EmbeddedDiscoveryModule()); diff --git a/pom.xml b/pom.xml index efe0891..47013cb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.airlift airbase - 133 + 136 io.airlift.discovery @@ -57,7 +57,7 @@ 17 - 222 + 229 ${dep.airlift.version} 0.12