initial effort to mount storage service on zipkin-server

module/pom.xml

@@ -50,7 +50,6 @@
     <dependency>
       <groupId>${armeria.groupId}</groupId>
       <artifactId>armeria</artifactId>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 

module/src/main/java/zipkin2/module/storage/kafka/ZipkinKafkaStorageModule.java

@@ -13,22 +13,29 @@
  */
 package zipkin2.module.storage.kafka;
 
+import com.linecorp.armeria.server.ServerBuilder;
+import java.util.function.Consumer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import zipkin2.storage.StorageComponent;
+import zipkin2.storage.kafka.KafkaStorage;
+import zipkin2.storage.kafka.KafkaStorageHttpService;
 
 @Configuration
 @EnableConfigurationProperties(ZipkinKafkaStorageProperties.class)
 @ConditionalOnProperty(name = "zipkin.storage.type", havingValue = "kafka")
 @ConditionalOnMissingBean(StorageComponent.class)
 class ZipkinKafkaStorageModule {
 
-  @Bean
   @ConditionalOnMissingBean
-  StorageComponent storage(ZipkinKafkaStorageProperties properties) {
+  @Bean StorageComponent storage(ZipkinKafkaStorageProperties properties) {
     return properties.toBuilder().build();
   }
+
+  @Bean public Consumer<ServerBuilder> storageHttpService(StorageComponent storage) {
+    return new KafkaStorageHttpService((KafkaStorage) storage);
+  }
 }

storage/pom.xml

@@ -28,6 +28,7 @@
   <properties>
     <main.basedir>${project.basedir}/..</main.basedir>
     <kafka.version>2.3.0</kafka.version>
+    <spring.version>5.1.9.RELEASE</spring.version>
   </properties>
 
   <dependencies>

storage/src/main/java/zipkin2/storage/kafka/KafkaSpanStore.java

@@ -56,7 +56,7 @@
 /**
  * Span store backed by Kafka Stream distributed state stores built by {@link
  * TraceStoreTopologySupplier} and {@link DependencyStoreTopologySupplier}, and made accessible by
- * {@link  KafkaStoreHttpService}.
+ * {@link  KafkaStorageHttpService}.
  */
 final class KafkaSpanStore implements SpanStore, Traces, ServiceAndSpanNames {
   static final ObjectMapper MAPPER = new ObjectMapper();

storage/src/main/java/zipkin2/storage/kafka/KafkaStorage.java

@@ -331,7 +331,7 @@ Server getServer() {
           try {
             server = Server.builder()
                 .http(httpPort)
-                .annotatedService(new KafkaStoreHttpService(this))
+                .annotatedService(new KafkaStorageHttpService(this))
                 .build();
             server.start();
           } catch (Exception e) {

storage/src/main/java/zipkin2/storage/kafka/KafkaStoreHttpService.java → storage/src/main/java/zipkin2/storage/kafka/KafkaStorageHttpService.java

@@ -65,20 +65,20 @@
  * distributed state. This component exposes access to local state via Http call from {@link
  * KafkaSpanStore}
  */
-final class KafkaStoreHttpService implements Consumer<ServerBuilder> {
+public final class KafkaStorageHttpService implements Consumer<ServerBuilder> {
   static final Logger LOG = LogManager.getLogger();
   static final ObjectMapper MAPPER = new ObjectMapper();
 
   final KafkaStorage storage;
   final long minTracesStored;
 
-  KafkaStoreHttpService(KafkaStorage storage) {
+  public KafkaStorageHttpService(KafkaStorage storage) {
     this.storage = storage;
     this.minTracesStored = storage.minTracesStored;
   }
 
-  @Override public void accept(ServerBuilder serverBuilder) {
-    serverBuilder.annotatedService("/zipkin/storage/kafka", this);
+  @Override public void accept(ServerBuilder builder) {
+    builder.annotatedService("/storage/kafka", this);
   }
 
   @Get("/dependencies")