Merge pull request #78 from openzipkin/in-mem

Decouples InMemorySpanStore and tests from zipkin-server

interop/pom.xml

@@ -41,7 +41,7 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>zipkin-server</artifactId>
+      <artifactId>spanstore-jdbc</artifactId>
     </dependency>
 
     <!-- for ScalaSpanStoreAdapter -->

interop/src/test/java/zipkin/server/InMemoryScalaDependencyStoreTest.java → interop/src/test/java/zipkin/InMemoryScalaDependencyStoreTest.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package zipkin.server;
+package zipkin;
 
 import com.twitter.zipkin.common.Span;
 import com.twitter.zipkin.storage.DependencyStore;

interop/src/test/java/zipkin/server/InMemoryScalaSpanStoreTest.java → interop/src/test/java/zipkin/InMemoryScalaSpanStoreTest.java

@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package zipkin.server;
+package zipkin;
 
 import com.twitter.zipkin.storage.SpanStore;
 import com.twitter.zipkin.storage.SpanStoreSpec;

pom.xml

@@ -118,6 +118,13 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>zipkin</artifactId>
+        <type>test-jar</type>
+        <version>${project.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>spanstore-jdbc</artifactId>

zipkin-server/src/main/java/zipkin/server/ZipkinServerConfiguration.java

@@ -29,6 +29,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;
 import zipkin.Codec;
+import zipkin.InMemorySpanStore;
 import zipkin.Sampler;
 import zipkin.SpanStore;
 import zipkin.jdbc.JDBCSpanStore;

zipkin-server/src/main/java/zipkin/server/brave/TraceWritesSpanStore.java

@@ -15,6 +15,7 @@
 
 import com.github.kristofa.brave.Brave;
 import com.github.kristofa.brave.LocalTracer;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import zipkin.DependencyLink;
@@ -52,7 +53,7 @@ public List<List<Span>> getTraces(QueryRequest request) {
   }
 
   @Override
-  public List<List<Span>> getTracesByIds(List<Long> traceIds) {
+  public List<List<Span>> getTracesByIds(Collection<Long> traceIds) {
     tracer.startNewSpan(component, "get-traces-by-ids");
     try {
       return delegate.getTracesByIds(traceIds);

zipkin-server/src/test/java/zipkin/server/ZipkinSpanWriterTest.java

@@ -17,6 +17,7 @@
 import zipkin.BinaryAnnotation;
 import zipkin.Constants;
 import zipkin.Endpoint;
+import zipkin.InMemorySpanStore;
 import zipkin.Sampler;
 import zipkin.Span;
 

zipkin-server/src/test/java/zipkin/server/brave/SpanStoreSpanCollectorTest.java

@@ -19,7 +19,7 @@
 import zipkin.Constants;
 import zipkin.Endpoint;
 import zipkin.Span;
-import zipkin.server.InMemorySpanStore;
+import zipkin.InMemorySpanStore;
 
 import static java.util.Collections.singletonList;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;

zipkin-spanstores/jdbc/pom.xml

@@ -43,6 +43,19 @@
       <version>${jooq.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>zipkin</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mariadb.jdbc</groupId>
+      <artifactId>mariadb-java-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>

zipkin-spanstores/jdbc/src/main/java/zipkin/jdbc/JDBCSpanStore.java

@@ -17,6 +17,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -166,7 +167,7 @@ public void accept(Iterator<Span> spans) {
     }
   }
 
-  private List<List<Span>> getTraces(@Nullable QueryRequest request, @Nullable List<Long> traceIds) {
+  List<List<Span>> getTraces(@Nullable QueryRequest request, @Nullable Collection<Long> traceIds) {
     final Map<Long, List<Span>> spansWithoutAnnotations;
     final Map<Pair<?>, List<Record>> dbAnnotations;
     try (Connection conn = datasource.getConnection()) {
@@ -248,7 +249,7 @@ private DSLContext context(Connection conn) {
   }
 
   @Override
-  public List<List<Span>> getTracesByIds(List<Long> traceIds) {
+  public List<List<Span>> getTracesByIds(Collection<Long> traceIds) {
     return traceIds.isEmpty() ? emptyList() : getTraces(null, traceIds);
   }