Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #728 from openzipkin/json-api
Converts the communication between web and query to http
- Loading branch information
Showing
16 changed files
with
827 additions
and
437 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,16 @@ | ||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| compile project(':zipkin-scrooge') | ||
| compile "com.twitter.finatra:finatra-http_${scalaInterfaceVersion}:${commonVersions.finatra}" | ||
| compile "com.twitter.finatra:finatra-slf4j_${scalaInterfaceVersion}:${commonVersions.finatra}" | ||
|
|
||
| compile "com.twitter:util-core_${scalaInterfaceVersion}:${commonVersions.twitterUtil}" | ||
| compile "com.twitter:finagle-core_${scalaInterfaceVersion}:${commonVersions.finagle}" | ||
| // for ZipkinQueryServiceFactory | ||
| compile "com.twitter:finagle-thriftmux_${scalaInterfaceVersion}:${commonVersions.finagle}" | ||
| testCompile "com.twitter.finatra:finatra-http_${scalaInterfaceVersion}:${commonVersions.finatra}:tests" | ||
| testCompile "com.twitter.finatra:finatra-jackson_${scalaInterfaceVersion}:${commonVersions.finatra}:tests" | ||
| testCompile "com.twitter.inject:inject-core_${scalaInterfaceVersion}:${commonVersions.finatra}:tests" | ||
| testCompile "com.twitter.inject:inject-modules_${scalaInterfaceVersion}:${commonVersions.finatra}:tests" | ||
| testCompile "com.twitter.inject:inject-app_${scalaInterfaceVersion}:${commonVersions.finatra}:tests" | ||
| testCompile "com.twitter.inject:inject-server_${scalaInterfaceVersion}:${commonVersions.finatra}:tests" | ||
| } |
105 changes: 105 additions & 0 deletions
105
zipkin-query/src/main/scala/com/twitter/zipkin/query/QueryExtractor.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Copyright 2012 Twitter Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.twitter.zipkin.query | ||
|
|
||
| import com.twitter.finagle.httpx.Request | ||
| import com.twitter.finatra.annotations.Flag | ||
| import com.twitter.util.{Time, TwitterDateFormat} | ||
| import com.twitter.zipkin.storage.SpanStore | ||
| import com.twitter.zipkin.thriftscala.QueryRequest | ||
| import java.util.{Calendar, Date} | ||
| import javax.inject.Inject | ||
|
|
||
| // TODO: rewrite me into a normal finatra case class | ||
| class QueryExtractor @Inject()(spanStore: SpanStore, | ||
| @Flag("zipkin.queryService.durationBatchSize") defaultQueryLimit: Int) { | ||
| val fmt = TwitterDateFormat("MM-dd-yyyy'T'HH:mm:ss.SSSZ") | ||
|
|
||
| private[this] val dateFormat = TwitterDateFormat("MM-dd-yyyy") | ||
| private[this] val timeFormat = TwitterDateFormat("HH:mm") | ||
|
|
||
| def getDate(req: Request): Option[Date] = | ||
| req.params.get("date").map(dateFormat.parse) | ||
|
|
||
| def getDateStr(req: Request): String = { | ||
| val date = getDate(req).getOrElse(Calendar.getInstance().getTime) | ||
| dateFormat.format(date) | ||
| } | ||
|
|
||
| def getLimit(req: Request): Option[Int] = { | ||
| req.params.get("limit").map(_.toInt) | ||
| } | ||
|
|
||
| def getLimitStr(req: Request): String = { | ||
| getLimit(req).getOrElse(defaultQueryLimit).toString | ||
| } | ||
|
|
||
| def getTime(req: Request): Option[Date] = | ||
| req.params.get("time").map(timeFormat.parse) | ||
|
|
||
| def getTimeStr(req: Request): String = { | ||
| val time = getTime(req).getOrElse(Calendar.getInstance().getTime) | ||
| timeFormat.format(time) | ||
| } | ||
|
|
||
| def getTimestampStr(req: Request): String = { | ||
| getTimestamp(req).getOrElse(Time.now.inMicroseconds).toString | ||
| } | ||
|
|
||
| def getTimestamp(req: Request): Option[Long] = { | ||
| req.params.getLong("timestamp") | ||
| } | ||
|
|
||
| /** | ||
| * Takes a `Request` and produces the correct `QueryRequest` depending | ||
| * on the GET parameters present | ||
| */ | ||
| def apply(req: Request): Option[QueryRequest] = req.params.get("serviceName").filterNot(_ == "") map { serviceName => | ||
| val spanName = req.params.get("spanName") filterNot { n => n == "all" || n == "" } | ||
|
|
||
| val timestamp = getTimestamp(req).getOrElse(Time.now.inMicroseconds) | ||
|
|
||
| val (annotations, binaryAnnotations) = req.params.get("annotationQuery") map { query => | ||
| var anns = Seq.empty[String] | ||
| var binAnns = scala.collection.mutable.Map[String, String]() | ||
|
|
||
| query.split(" and ") foreach { ann => | ||
| ann.split("=").toList match { | ||
| case "" :: Nil => | ||
| case key :: value :: Nil => | ||
| binAnns += key -> value | ||
| case key :: Nil => | ||
| anns +:= key | ||
| case _ => | ||
| } | ||
| } | ||
|
|
||
| ( (if (anns.isEmpty) None else Some(anns)), | ||
| (if (binAnns.isEmpty) None else Some(binAnns)) | ||
| ) | ||
| } getOrElse { | ||
| (None, None) | ||
| } | ||
| val limit = getLimit(req).getOrElse(defaultQueryLimit) | ||
| QueryRequest(serviceName, spanName, annotations, binaryAnnotations, timestamp, limit, adjustClockSkew(req)) | ||
| } | ||
|
|
||
| def adjustClockSkew(req: Request): Boolean = | ||
| req.params.get("adjust_clock_skew") match { | ||
| case Some("false") => false | ||
| case _ => true | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.