Skip to content

Commit caff27f

Browse files
author
krastogi
committed
Fetching trace details from cassandra in one go
1 parent ecc2395 commit caff27f

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

reader/src/main/scala/com/expedia/www/haystack/trace/reader/stores/CassandraEsTraceStore.scala

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import com.expedia.www.haystack.trace.commons.clients.cassandra.{CassandraCluste
2121
import com.expedia.www.haystack.trace.commons.clients.es.document.TraceIndexDoc
2222
import com.expedia.www.haystack.trace.commons.config.entities.{CassandraConfiguration, WhitelistIndexFieldConfiguration}
2323
import com.expedia.www.haystack.trace.reader.config.entities.{ElasticSearchConfiguration, ServiceMetadataReadConfiguration}
24-
import com.expedia.www.haystack.trace.reader.metrics.{AppMetricNames, MetricsSupport}
24+
import com.expedia.www.haystack.trace.reader.metrics.MetricsSupport
2525
import com.expedia.www.haystack.trace.reader.stores.readers.ServiceMetadataReader
2626
import com.expedia.www.haystack.trace.reader.stores.readers.cassandra.CassandraTraceReader
2727
import com.expedia.www.haystack.trace.reader.stores.readers.es.ElasticSearchReader
@@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory
3232

3333
import scala.collection.JavaConverters._
3434
import scala.concurrent.{ExecutionContextExecutor, Future}
35-
import scala.util.{Failure, Success, Try}
3635

3736
class CassandraEsTraceStore(cassandraConfig: CassandraConfiguration,
3837
serviceMetadataConfig: ServiceMetadataReadConfiguration,
@@ -82,7 +81,7 @@ class CassandraEsTraceStore(cassandraConfig: CassandraConfiguration,
8281
.asScala
8382
.map(source => extractTraceIdFromSource(source))
8483
.filter(!_.isEmpty)
85-
.toSet[String] // de-dup traceIds
84+
.toSet[String] // de-dup traceIds
8685
.toList
8786

8887
cassandraReader.readRawTraces(traceIds)
@@ -132,11 +131,6 @@ class CassandraEsTraceStore(cassandraConfig: CassandraConfiguration,
132131
cassandraReader.readRawTraces(request.getTraceIdList.asScala.toList)
133132
}
134133

135-
// convert all Futures to Try to make sure they all complete
136-
private def liftToTry[T](futures: Seq[Future[T]]): Seq[Future[Try[T]]] = futures.map { f =>
137-
f.map(Try(_)).recover { case t: Throwable => Failure(t) }
138-
}
139-
140134
override def close(): Unit = {
141135
cassandraReader.close()
142136
esReader.close()

0 commit comments

Comments
 (0)