Permalink
Browse files

zipkin-query refactor

* Rename `zipkin-server` to `zipkin-query-core`
* Pull service specific code to `zipkin-query-service`

Author: @franklinhu
Fixes #159
URL: #159
  • Loading branch information...
1 parent a77b136 commit dfe1a2d989f5a7659ec0b72925a096e5b402d8ac Franklin Hu committed Sep 21, 2012
Showing with 27 additions and 14 deletions.
  1. +27 −14 project/Project.scala
  2. 0 {zipkin-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/config/ZipkinQueryConfig.scala
  3. 0 {zipkin-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/Constants.scala
  4. 0 {zipkin-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/QueryService.scala
  5. 0 {zipkin-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/SliceQuery.scala
  6. 0 {zipkin-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/ZipkinQuery.scala
  7. 0 {zipkin-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/adjusters/Adjuster.scala
  8. 0 ... zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/adjusters/AdjusterSpanTreeEntry.scala
  9. 0 ...ver → zipkin-query-core}/src/main/scala/com/twitter/zipkin/query/adjusters/TimeSkewAdjuster.scala
  10. 0 ...in-server → zipkin-query-core}/src/main/scala/com/twitter/zipkin/storage/TraceIdsToDuration.scala
  11. 0 {zipkin-server → zipkin-query-core}/src/schema/cassandra-schema.txt
  12. 0 {zipkin-server → zipkin-query-core}/src/test/scala/com/twitter/zipkin/query/QueryServiceSpec.scala
  13. 0 ...→ zipkin-query-core}/src/test/scala/com/twitter/zipkin/query/adjusters/TimeSkewAdjusterSpec.scala
  14. 0 ... → zipkin-query-core}/src/test/scala/com/twitter/zipkin/query/conversions/TraceTimelineSpec.scala
  15. 0 ...erver → zipkin-query-core}/src/test/scala/com/twitter/zipkin/storage/TraceIdsToDurationSpec.scala
  16. 0 {zipkin-server → zipkin-query-service}/config/query-dev.scala
  17. 0 {zipkin-server → zipkin-query-service}/src/main/scala/com/twitter/zipkin/query/Main.scala
  18. 0 {zipkin-server → zipkin-query-service}/src/scripts/query.sh
  19. 0 {zipkin-server → zipkin-query-service}/src/test/scala/com/twitter/zipkin/config/ConfigSpec.scala
View
@@ -28,7 +28,7 @@ object Zipkin extends Build {
Project(
id = "zipkin",
base = file(".")
- ) aggregate(hadoop, hadoopjobrunner, test, thrift, server, common, scrooge, collectorScribe, web, cassandra, collectorCore, collectorService)
+ ) aggregate(hadoop, hadoopjobrunner, test, thrift, queryService, common, scrooge, collectorScribe, web, cassandra, collectorCore, collectorService)
lazy val hadoop = Project(
@@ -121,7 +121,7 @@ object Zipkin extends Build {
name := "zipkin-test",
version := "0.3.0-SNAPSHOT",
libraryDependencies ++= testDependencies
- ) dependsOn(server, collectorService)
+ ) dependsOn(queryService, collectorService)
lazy val thrift =
Project(
@@ -238,10 +238,10 @@ object Zipkin extends Build {
}
).dependsOn(scrooge)
- lazy val server =
+ lazy val queryCore =
Project(
- id = "zipkin-server",
- base = file("zipkin-server"),
+ id = "zipkin-query-core",
+ base = file("zipkin-query-core"),
settings = Project.defaultSettings ++
StandardProject.newSettings ++
SubversionPublisher.newSettings ++
@@ -261,17 +261,30 @@ object Zipkin extends Build {
"com.twitter.common.zookeeper" % "candidate" % "0.0.9",
"com.twitter.common.zookeeper" % "group" % "0.0.9"
- ) ++ testDependencies,
+ ) ++ testDependencies
+ ).dependsOn(common, scrooge)
- PackageDist.packageDistZipName := "zipkin-server.zip",
- BuildProperties.buildPropertiesPackage := "com.twitter.zipkin",
+ lazy val queryService = Project(
+ id = "zipkin-query-service",
+ base = file("zipkin-query-service"),
+ settings = Project.defaultSettings ++
+ StandardProject.newSettings ++
+ SubversionPublisher.newSettings ++
+ TravisCiRepos.newSettings
+ ).settings(
+ version := "0.3.0-SNAPSHOT",
- /* Add configs to resource path for ConfigSpec */
- unmanagedResourceDirectories in Test <<= baseDirectory {
- base =>
- (base / "config" +++ base / "src" / "test" / "resources").get
- }
- ).dependsOn(common, scrooge, cassandra)
+ libraryDependencies ++= testDependencies,
+
+ PackageDist.packageDistZipName := "zipkin-query-service.zip",
+ BuildProperties.buildPropertiesPackage := "com.twitter.zipkin",
+
+ /* Add configs to resource path for ConfigSpec */
+ unmanagedResourceDirectories in Test <<= baseDirectory {
+ base =>
+ (base / "config" +++ base / "src" / "test" / "resources").get
+ }
+ ).dependsOn(queryCore, cassandra)
lazy val collectorScribe =
Project(

0 comments on commit dfe1a2d

Please sign in to comment.