diff options
Diffstat (limited to 'kamon-core/src/main/scala/kamon')
32 files changed, 119 insertions, 85 deletions
diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 4704ead1..46e75b4e 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -16,13 +16,13 @@ package kamon import _root_.akka.actor import _root_.akka.actor._ -import com.typesafe.config.{ Config, ConfigFactory, ConfigParseOptions, ConfigResolveOptions } +import com.typesafe.config.{Config, ConfigFactory, ConfigParseOptions, ConfigResolveOptions} import kamon.metric._ import kamon.trace.TracerModuleImpl import kamon.util.logger.LazyLogger import _root_.scala.util.control.NonFatal -import _root_.scala.util.{ Failure, Success, Try } +import _root_.scala.util.{Failure, Success, Try} object Kamon { diff --git a/kamon-core/src/main/scala/kamon/ModuleLoader.scala b/kamon-core/src/main/scala/kamon/ModuleLoader.scala index 989d8cd9..f1b5f414 100644 --- a/kamon-core/src/main/scala/kamon/ModuleLoader.scala +++ b/kamon-core/src/main/scala/kamon/ModuleLoader.scala @@ -20,7 +20,7 @@ import _root_.akka.actor import _root_.akka.actor._ import kamon.util.logger.LazyLogger import org.aspectj.lang.ProceedingJoinPoint -import org.aspectj.lang.annotation.{ Around, Aspect, Pointcut } +import org.aspectj.lang.annotation.{Around, Aspect, Pointcut} private[kamon] object ModuleLoader extends ExtensionId[ModuleLoaderExtension] with ExtensionIdProvider { def lookup(): ExtensionId[_ <: actor.Extension] = ModuleLoader diff --git a/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala b/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala index 810475b7..e3b136dd 100644 --- a/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala +++ b/kamon-core/src/main/scala/kamon/metric/EntityRecorder.scala @@ -59,7 +59,7 @@ private[kamon] sealed trait SingleInstrumentEntityRecorder extends EntityRecorde def instrument: Instrument def collect(collectionContext: CollectionContext): EntitySnapshot = - new DefaultEntitySnapshot(Map(key -> instrument.collect(collectionContext))) + new DefaultEntitySnapshot(Map(key → instrument.collect(collectionContext))) def cleanup: Unit = instrument.cleanup } @@ -225,7 +225,7 @@ abstract class GenericEntityRecorder(instrumentFactory: InstrumentFactory) exten def collect(collectionContext: CollectionContext): EntitySnapshot = { val snapshots = Map.newBuilder[MetricKey, InstrumentSnapshot] _instruments.foreach { - case (key, instrument) ⇒ snapshots += key -> instrument.collect(collectionContext) + case (key, instrument) ⇒ snapshots += key → instrument.collect(collectionContext) } new DefaultEntitySnapshot(snapshots.result()) diff --git a/kamon-core/src/main/scala/kamon/metric/EntitySnapshot.scala b/kamon-core/src/main/scala/kamon/metric/EntitySnapshot.scala index 7ebb79e2..16edecd8 100644 --- a/kamon-core/src/main/scala/kamon/metric/EntitySnapshot.scala +++ b/kamon-core/src/main/scala/kamon/metric/EntitySnapshot.scala @@ -16,7 +16,7 @@ package kamon.metric -import kamon.metric.instrument.{ Counter, Histogram, CollectionContext, InstrumentSnapshot } +import kamon.metric.instrument.{Counter, Histogram, CollectionContext, InstrumentSnapshot} import kamon.util.MapMerge import scala.reflect.ClassTag diff --git a/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala b/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala index e096429d..06de65ef 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricScaleDecorator.scala @@ -16,7 +16,7 @@ package kamon.metric -import akka.actor.{ Actor, ActorRef, Props } +import akka.actor.{Actor, ActorRef, Props} import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot import kamon.metric.instrument._ @@ -28,8 +28,10 @@ import kamon.metric.instrument._ * @param receiver Receiver of scaled metrics snapshot, usually a backend sender */ class MetricScaleDecorator(timeUnits: Option[Time], memoryUnits: Option[Memory], receiver: ActorRef) extends Actor { - require(timeUnits.isDefined || memoryUnits.isDefined, - "Use MetricScaleDecorator only when any of units is defined") + require( + timeUnits.isDefined || memoryUnits.isDefined, + "Use MetricScaleDecorator only when any of units is defined" + ) override def receive: Receive = { case tick: TickMetricSnapshot ⇒ @@ -41,7 +43,7 @@ class MetricScaleDecorator(timeUnits: Option[Time], memoryUnits: Option[Memory], case (memory: Memory, _, Some(to)) ⇒ metricSnapshot.scale(memory, to) case _ ⇒ metricSnapshot } - metricKey -> scaledSnapshot + metricKey → scaledSnapshot }) }) receiver forward scaled diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala index 8b5a6188..75ef0851 100755 --- a/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsModule.scala @@ -18,7 +18,7 @@ package kamon.metric import akka.actor._ import com.typesafe.config.Config -import kamon.metric.SubscriptionsDispatcher.{ Subscribe, Unsubscribe } +import kamon.metric.SubscriptionsDispatcher.{Subscribe, Unsubscribe} import kamon.metric.instrument.Gauge.CurrentValueCollector import kamon.metric.instrument.Histogram.DynamicRange import kamon.metric.instrument._ @@ -248,8 +248,10 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule { val histogramEntity = Entity(name, SingleInstrumentEntityRecorder.Histogram, tags) val recorder = _trackedEntities.atomicGetOrElseUpdate(histogramEntity, { val factory = instrumentFactory(histogramEntity.category) - HistogramRecorder(HistogramKey(histogramEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), - factory.createHistogram(name, dynamicRange)) + HistogramRecorder( + HistogramKey(histogramEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), + factory.createHistogram(name, dynamicRange) + ) }, _.cleanup) recorder.asInstanceOf[HistogramRecorder].instrument @@ -264,8 +266,10 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule { val minMaxCounterEntity = Entity(name, SingleInstrumentEntityRecorder.MinMaxCounter, tags) val recorder = _trackedEntities.atomicGetOrElseUpdate(minMaxCounterEntity, { val factory = instrumentFactory(minMaxCounterEntity.category) - MinMaxCounterRecorder(MinMaxCounterKey(minMaxCounterEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), - factory.createMinMaxCounter(name, dynamicRange, refreshInterval)) + MinMaxCounterRecorder( + MinMaxCounterKey(minMaxCounterEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), + factory.createMinMaxCounter(name, dynamicRange, refreshInterval) + ) }, _.cleanup) recorder.asInstanceOf[MinMaxCounterRecorder].instrument @@ -281,8 +285,10 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule { val gaugeEntity = Entity(name, SingleInstrumentEntityRecorder.Gauge, tags) val recorder = _trackedEntities.atomicGetOrElseUpdate(gaugeEntity, { val factory = instrumentFactory(gaugeEntity.category) - GaugeRecorder(GaugeKey(gaugeEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), - factory.createGauge(name, dynamicRange, refreshInterval, valueCollector)) + GaugeRecorder( + GaugeKey(gaugeEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), + factory.createGauge(name, dynamicRange, refreshInterval, valueCollector) + ) }, _.cleanup) recorder.asInstanceOf[GaugeRecorder].instrument @@ -297,8 +303,10 @@ private[kamon] class MetricsModuleImpl(config: Config) extends MetricsModule { val counterEntity = Entity(name, SingleInstrumentEntityRecorder.Counter, tags) val recorder = _trackedEntities.atomicGetOrElseUpdate(counterEntity, { val factory = instrumentFactory(counterEntity.category) - CounterRecorder(CounterKey(counterEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), - factory.createCounter()) + CounterRecorder( + CounterKey(counterEntity.category, unitOfMeasurement.getOrElse(UnitOfMeasurement.Unknown)), + factory.createCounter() + ) }, _.cleanup) recorder.asInstanceOf[CounterRecorder].instrument diff --git a/kamon-core/src/main/scala/kamon/metric/MetricsSettings.scala b/kamon-core/src/main/scala/kamon/metric/MetricsSettings.scala index 018a6584..592e8f67 100644 --- a/kamon-core/src/main/scala/kamon/metric/MetricsSettings.scala +++ b/kamon-core/src/main/scala/kamon/metric/MetricsSettings.scala @@ -34,7 +34,8 @@ case class MetricsSettings( entityFilters: Map[String, EntityFilter], instrumentFactories: Map[String, InstrumentFactory], defaultInstrumentFactory: InstrumentFactory, - refreshScheduler: RefreshScheduler) { + refreshScheduler: RefreshScheduler +) { private[kamon] def pointScheduler(targetScheduler: RefreshScheduler): Unit = refreshScheduler match { case lrs: LazyRefreshScheduler ⇒ lrs.point(targetScheduler) diff --git a/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala b/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala index 9f8c7be3..09bf58ad 100644 --- a/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala +++ b/kamon-core/src/main/scala/kamon/metric/SubscriptionsDispatcher.scala @@ -18,7 +18,7 @@ package kamon.metric import akka.actor._ import kamon.metric.SubscriptionsDispatcher._ -import kamon.util.{ MilliTimestamp, GlobPathFilter } +import kamon.util.{MilliTimestamp, GlobPathFilter} import scala.concurrent.duration.FiniteDuration /** diff --git a/kamon-core/src/main/scala/kamon/metric/TickMetricSnapshotBuffer.scala b/kamon-core/src/main/scala/kamon/metric/TickMetricSnapshotBuffer.scala index dfc5d5f0..22557974 100644 --- a/kamon-core/src/main/scala/kamon/metric/TickMetricSnapshotBuffer.scala +++ b/kamon-core/src/main/scala/kamon/metric/TickMetricSnapshotBuffer.scala @@ -16,7 +16,7 @@ package kamon.metric -import akka.actor.{ Props, Actor, ActorRef } +import akka.actor.{Props, Actor, ActorRef} import kamon.Kamon import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot import kamon.metric.TickMetricSnapshotBuffer.FlushBuffer diff --git a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala index 014825cd..eaeebb97 100644 --- a/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala +++ b/kamon-core/src/main/scala/kamon/metric/TraceMetrics.scala @@ -16,7 +16,7 @@ package kamon.metric -import kamon.metric.instrument.{ Time, InstrumentFactory } +import kamon.metric.instrument.{Time, InstrumentFactory} class TraceMetrics(instrumentFactory: InstrumentFactory) extends GenericEntityRecorder(instrumentFactory) { diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala index 61b53df2..39571d3d 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala @@ -16,7 +16,7 @@ package kamon.metric.instrument -import java.util.concurrent.atomic.{ AtomicLong, AtomicLongFieldUpdater, AtomicReference } +import java.util.concurrent.atomic.{AtomicLong, AtomicLongFieldUpdater, AtomicReference} import akka.actor.Cancellable import kamon.metric.instrument.Gauge.CurrentValueCollector diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala index b390cefe..212d4225 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/Histogram.scala @@ -18,15 +18,15 @@ package kamon.metric.instrument import java.nio.LongBuffer -import kamon.metric.instrument.Histogram.{ DynamicRange, Snapshot } +import kamon.metric.instrument.Histogram.{DynamicRange, Snapshot} import kamon.util.logger.LazyLogger import org.HdrHistogram.ModifiedAtomicHistogram trait Histogram extends Instrument { type SnapshotType = Histogram.Snapshot - def record(value: Long) - def record(value: Long, count: Long) + def record(value: Long): Unit + def record(value: Long, count: Long): Unit } object Histogram { @@ -145,8 +145,10 @@ object HdrHistogram { * The collect(..) operation extracts all the recorded values from the histogram and resets the counts, but still * leave it in a consistent state even in the case of concurrent modification while the snapshot is being taken. */ -class HdrHistogram(dynamicRange: DynamicRange) extends ModifiedAtomicHistogram(dynamicRange.lowestDiscernibleValue, - dynamicRange.highestTrackableValue, dynamicRange.precision) with Histogram { +class HdrHistogram(dynamicRange: DynamicRange) extends ModifiedAtomicHistogram( + dynamicRange.lowestDiscernibleValue, + dynamicRange.highestTrackableValue, dynamicRange.precision +) with Histogram { import HdrHistogram.log def record(value: Long): Unit = tryRecord(value, 1L) diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala b/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala index f7516262..e4d6f547 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/InstrumentSettings.scala @@ -13,8 +13,10 @@ case class InstrumentCustomSettings(lowestDiscernibleValue: Option[Long], highes DynamicRange( lowestDiscernibleValue.getOrElse(that.dynamicRange.lowestDiscernibleValue), highestTrackableValue.getOrElse(that.dynamicRange.highestTrackableValue), - precision.getOrElse(that.dynamicRange.precision)), - refreshInterval.orElse(that.refreshInterval)) + precision.getOrElse(that.dynamicRange.precision) + ), + refreshInterval.orElse(that.refreshInterval) + ) } object InstrumentCustomSettings { @@ -25,7 +27,8 @@ object InstrumentCustomSettings { if (config.hasPath("lowest-discernible-value")) Some(config.getLong("lowest-discernible-value")) else None, if (config.hasPath("highest-trackable-value")) Some(config.getLong("highest-trackable-value")) else None, if (config.hasPath("precision")) Some(InstrumentSettings.parsePrecision(config.getString("precision"))) else None, - if (config.hasPath("refresh-interval")) Some(config.getFiniteDuration("refresh-interval")) else None) + if (config.hasPath("refresh-interval")) Some(config.getFiniteDuration("refresh-interval")) else None + ) } @@ -37,7 +40,8 @@ object InstrumentSettings { DynamicRange( config.getLong("lowest-discernible-value"), config.getLong("highest-trackable-value"), - parsePrecision(config.getString("precision"))) + parsePrecision(config.getString("precision")) + ) def parsePrecision(stringValue: String): Int = stringValue match { case "low" ⇒ 1 @@ -55,10 +59,14 @@ object DefaultInstrumentSettings { import kamon.util.ConfigTools.Syntax val histogramSettings = InstrumentSettings(InstrumentSettings.readDynamicRange(config.getConfig("histogram")), None) - val minMaxCounterSettings = InstrumentSettings(InstrumentSettings.readDynamicRange(config.getConfig("min-max-counter")), - Some(config.getFiniteDuration("min-max-counter.refresh-interval"))) - val gaugeSettings = InstrumentSettings(InstrumentSettings.readDynamicRange(config.getConfig("gauge")), - Some(config.getFiniteDuration("gauge.refresh-interval"))) + val minMaxCounterSettings = InstrumentSettings( + InstrumentSettings.readDynamicRange(config.getConfig("min-max-counter")), + Some(config.getFiniteDuration("min-max-counter.refresh-interval")) + ) + val gaugeSettings = InstrumentSettings( + InstrumentSettings.readDynamicRange(config.getConfig("gauge")), + Some(config.getFiniteDuration("gauge.refresh-interval")) + ) DefaultInstrumentSettings(histogramSettings, minMaxCounterSettings, gaugeSettings) } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala index 0828c8a9..76fc2c2a 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala @@ -29,8 +29,8 @@ trait MinMaxCounter extends Instrument { def increment(): Unit def increment(times: Long): Unit - def decrement() - def decrement(times: Long) + def decrement(): Unit + def decrement(times: Long): Unit def refreshValues(): Unit } diff --git a/kamon-core/src/main/scala/kamon/metric/instrument/RefreshScheduler.scala b/kamon-core/src/main/scala/kamon/metric/instrument/RefreshScheduler.scala index 4809ac0d..6bc02dc3 100644 --- a/kamon-core/src/main/scala/kamon/metric/instrument/RefreshScheduler.scala +++ b/kamon-core/src/main/scala/kamon/metric/instrument/RefreshScheduler.scala @@ -16,7 +16,7 @@ package kamon.metric.instrument -import akka.actor.{ Scheduler, Cancellable } +import akka.actor.{Scheduler, Cancellable} import org.HdrHistogram.WriterReaderPhaser import scala.collection.concurrent.TrieMap diff --git a/kamon-core/src/main/scala/kamon/trace/Incubator.scala b/kamon-core/src/main/scala/kamon/trace/Incubator.scala index 05279d95..fe5ad569 100644 --- a/kamon-core/src/main/scala/kamon/trace/Incubator.scala +++ b/kamon-core/src/main/scala/kamon/trace/Incubator.scala @@ -16,9 +16,9 @@ package kamon.trace -import akka.actor.{ ActorLogging, Props, Actor, ActorRef } -import kamon.trace.Incubator.{ CheckForCompletedTraces, IncubatingTrace } -import kamon.util.{ NanoInterval, RelativeNanoTimestamp } +import akka.actor.{ActorLogging, Props, Actor, ActorRef} +import kamon.trace.Incubator.{CheckForCompletedTraces, IncubatingTrace} +import kamon.util.{NanoInterval, RelativeNanoTimestamp} import scala.annotation.tailrec import scala.collection.immutable.Queue import kamon.util.ConfigTools.Syntax diff --git a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala index c1e23d91..bc0bedba 100644 --- a/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/MetricsOnlyContext.scala @@ -20,19 +20,21 @@ import java.util.concurrent.ConcurrentLinkedQueue import akka.event.LoggingAdapter import kamon.Kamon -import kamon.metric.{ SegmentMetrics, TraceMetrics } -import kamon.util.{ NanoInterval, RelativeNanoTimestamp } +import kamon.metric.{SegmentMetrics, TraceMetrics} +import kamon.util.{NanoInterval, RelativeNanoTimestamp} import scala.annotation.tailrec import scala.collection.concurrent.TrieMap -private[kamon] class MetricsOnlyContext(traceName: String, +private[kamon] class MetricsOnlyContext( + traceName: String, val token: String, traceTags: Map[String, String], currentStatus: Status, val levelOfDetail: LevelOfDetail, val startTimestamp: RelativeNanoTimestamp, - log: LoggingAdapter) extends TraceContext { + log: LoggingAdapter +) extends TraceContext { @volatile private var _name = traceName @volatile private var _status = currentStatus @@ -86,9 +88,10 @@ private[kamon] class MetricsOnlyContext(traceName: String, val segment = _finishedSegments.poll() if (segment != null) { val defaultTags = Map( - "trace" -> name, - "category" -> segment.category, - "library" -> segment.library) + "trace" → name, + "category" → segment.category, + "library" → segment.library + ) if (Kamon.metrics.shouldTrack(segment.name, SegmentMetrics.category)) { val segmentEntity = Kamon.metrics.entity(SegmentMetrics, segment.name, defaultTags ++ segment.tags) @@ -99,12 +102,14 @@ private[kamon] class MetricsOnlyContext(traceName: String, } } - protected def finishSegment(segmentName: String, + protected def finishSegment( + segmentName: String, category: String, library: String, duration: NanoInterval, segmentTags: Map[String, String], - isFinishedWithError: Boolean): Unit = { + isFinishedWithError: Boolean + ): Unit = { _finishedSegments.add(SegmentLatencyData(segmentName, category, library, duration, segmentTags, isFinishedWithError)) @@ -120,10 +125,12 @@ private[kamon] class MetricsOnlyContext(traceName: String, // will be returned. def elapsedTime: NanoInterval = _elapsedTime - class MetricsOnlySegment(segmentName: String, + class MetricsOnlySegment( + segmentName: String, val category: String, val library: String, - segmentTags: Map[String, String]) extends Segment { + segmentTags: Map[String, String] + ) extends Segment { private val _startTimestamp = RelativeNanoTimestamp.now private val _tags = TrieMap.empty[String, String] ++= segmentTags @@ -169,9 +176,11 @@ private[kamon] class MetricsOnlyContext(traceName: String, } } -case class SegmentLatencyData(name: String, +case class SegmentLatencyData( + name: String, category: String, library: String, duration: NanoInterval, tags: Map[String, String], - isFinishedWithError: Boolean)
\ No newline at end of file + isFinishedWithError: Boolean +)
\ No newline at end of file diff --git a/kamon-core/src/main/scala/kamon/trace/Sampler.scala b/kamon-core/src/main/scala/kamon/trace/Sampler.scala index 8480ecff..234c67bb 100644 --- a/kamon-core/src/main/scala/kamon/trace/Sampler.scala +++ b/kamon-core/src/main/scala/kamon/trace/Sampler.scala @@ -18,7 +18,7 @@ package kamon.trace import java.net.InetAddress import java.util.concurrent.atomic.AtomicLong -import kamon.util.{ NanoTimestamp, NanoInterval, Sequencer } +import kamon.util.{NanoTimestamp, NanoInterval, Sequencer} import scala.concurrent.forkjoin.ThreadLocalRandom import scala.util.Try diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala index c5704caa..bbf40d8d 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala @@ -21,7 +21,7 @@ import java.util import kamon.trace.Status.Closed import kamon.trace.TraceContextAware.DefaultTraceContextAware -import kamon.util.{ Function, RelativeNanoTimestamp, SameThreadExecutionContext, Supplier } +import kamon.util.{Function, RelativeNanoTimestamp, SameThreadExecutionContext, Supplier} import scala.concurrent.Future @@ -38,7 +38,7 @@ trait TraceContext { def rename(newName: String): Unit def startSegment(segmentName: String, category: String, library: String): Segment def startSegment(segmentName: String, category: String, library: String, tags: Map[String, String]): Segment - def addMetadata(key: String, value: String) + def addMetadata(key: String, value: String): Unit def addTag(key: String, value: String): Unit def removeTag(key: String, value: String): Boolean def startTimestamp: RelativeNanoTimestamp diff --git a/kamon-core/src/main/scala/kamon/trace/TraceSubscriptions.scala b/kamon-core/src/main/scala/kamon/trace/TraceSubscriptions.scala index f2da404c..47455ec5 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceSubscriptions.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceSubscriptions.scala @@ -16,7 +16,7 @@ package kamon.trace -import akka.actor.{ Terminated, ActorRef, Actor } +import akka.actor.{Terminated, ActorRef, Actor} class TraceSubscriptions extends Actor { import TraceSubscriptions._ diff --git a/kamon-core/src/main/scala/kamon/trace/TracerModule.scala b/kamon-core/src/main/scala/kamon/trace/TracerModule.scala index a60b1617..b7b6c17a 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracerModule.scala +++ b/kamon-core/src/main/scala/kamon/trace/TracerModule.scala @@ -19,7 +19,7 @@ package kamon.trace import java.util import akka.actor._ -import akka.event.{ Logging, LoggingAdapter } +import akka.event.{Logging, LoggingAdapter} import com.typesafe.config.Config import kamon.Kamon import kamon.metric.MetricsModule diff --git a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala index 4cada1d0..1ea35526 100644 --- a/kamon-core/src/main/scala/kamon/trace/TracingContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TracingContext.scala @@ -20,11 +20,12 @@ import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicInteger import akka.event.LoggingAdapter -import kamon.util.{ NanoInterval, NanoTimestamp, RelativeNanoTimestamp } +import kamon.util.{NanoInterval, NanoTimestamp, RelativeNanoTimestamp} import scala.collection.concurrent.TrieMap -private[trace] class TracingContext(traceName: String, +private[trace] class TracingContext( + traceName: String, token: String, tags: Map[String, String], currentStatus: Status, @@ -32,7 +33,8 @@ private[trace] class TracingContext(traceName: String, isLocal: Boolean, startTimeztamp: RelativeNanoTimestamp, log: LoggingAdapter, - traceInfoSink: TracingContext ⇒ Unit) extends MetricsOnlyContext(traceName, token, tags, currentStatus, levelOfDetail, startTimeztamp, log) { + traceInfoSink: TracingContext ⇒ Unit +) extends MetricsOnlyContext(traceName, token, tags, currentStatus, levelOfDetail, startTimeztamp, log) { private val _openSegments = new AtomicInteger(0) private val _startTimestamp = NanoTimestamp.now @@ -87,10 +89,12 @@ private[trace] class TracingContext(traceName: String, TraceInfo(name, token, _startTimestamp, elapsedTime, _metadata.toMap, tags, segmentsInfo.result(), status) } - class TracingSegment(segmentName: String, + class TracingSegment( + segmentName: String, category: String, library: String, - tags: Map[String, String]) extends MetricsOnlySegment(segmentName, category, library, tags) { + tags: Map[String, String] + ) extends MetricsOnlySegment(segmentName, category, library, tags) { private val metadata = TrieMap.empty[String, String] override def addMetadata(key: String, value: String): Unit = metadata.put(key, value) diff --git a/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala b/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala index c757027c..556366b0 100644 --- a/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala +++ b/kamon-core/src/main/scala/kamon/trace/logging/MdcKeysSupport.scala @@ -17,7 +17,7 @@ package kamon.trace.logging import kamon.trace.TraceLocal.AvailableToMdc -import kamon.trace.{ EmptyTraceContext, MetricsOnlyContext, TraceContext, Tracer } +import kamon.trace.{EmptyTraceContext, MetricsOnlyContext, TraceContext, Tracer} import kamon.util.Supplier import org.slf4j.MDC @@ -44,7 +44,7 @@ trait MdcKeysSupport { MDC.put(traceNameKey, ctx.name) defaultKeys ++ ctx.traceLocalStorage.underlyingStorage.collect { - case (available: AvailableToMdc, value) ⇒ Map(available.mdcKey -> String.valueOf(value)) + case (available: AvailableToMdc, value) ⇒ Map(available.mdcKey → String.valueOf(value)) }.flatMap { value ⇒ value.map { case (k, v) ⇒ MDC.put(k, v); k } } case EmptyTraceContext ⇒ Iterable.empty[String] diff --git a/kamon-core/src/main/scala/kamon/util/ConfigTools.scala b/kamon-core/src/main/scala/kamon/util/ConfigTools.scala index d0665764..cbf530e4 100644 --- a/kamon-core/src/main/scala/kamon/util/ConfigTools.scala +++ b/kamon-core/src/main/scala/kamon/util/ConfigTools.scala @@ -22,7 +22,7 @@ import com.typesafe.config.Config import scala.concurrent.duration.FiniteDuration -import kamon.metric.instrument.{ Memory, Time } +import kamon.metric.instrument.{Memory, Time} object ConfigTools { implicit class Syntax(val config: Config) extends AnyVal { diff --git a/kamon-core/src/main/scala/kamon/util/FastDispatch.scala b/kamon-core/src/main/scala/kamon/util/FastDispatch.scala index d2748847..7a94aefc 100644 --- a/kamon-core/src/main/scala/kamon/util/FastDispatch.scala +++ b/kamon-core/src/main/scala/kamon/util/FastDispatch.scala @@ -18,7 +18,7 @@ package kamon.util import akka.actor.ActorRef -import scala.concurrent.{ ExecutionContext, Future } +import scala.concurrent.{ExecutionContext, Future} /** * Extension for Future[ActorRef]. Try to dispatch a message to a Future[ActorRef] in the same thread if it has already diff --git a/kamon-core/src/main/scala/kamon/util/LazyActorRef.scala b/kamon-core/src/main/scala/kamon/util/LazyActorRef.scala index e2fb747a..a07abea6 100644 --- a/kamon-core/src/main/scala/kamon/util/LazyActorRef.scala +++ b/kamon-core/src/main/scala/kamon/util/LazyActorRef.scala @@ -19,7 +19,7 @@ package kamon.util import java.util import java.util.concurrent.ConcurrentLinkedQueue -import akka.actor.{ Actor, ActorRef } +import akka.actor.{Actor, ActorRef} import org.HdrHistogram.WriterReaderPhaser import scala.annotation.tailrec diff --git a/kamon-core/src/main/scala/kamon/util/MapMerge.scala b/kamon-core/src/main/scala/kamon/util/MapMerge.scala index 8573358b..6fc6fb15 100644 --- a/kamon-core/src/main/scala/kamon/util/MapMerge.scala +++ b/kamon-core/src/main/scala/kamon/util/MapMerge.scala @@ -28,7 +28,7 @@ object MapMerge { map.foreach { case (key, value) ⇒ val mergedValue = that.get(key).map(v ⇒ valueMerge(value, v)).getOrElse(value) - merged += key -> mergedValue + merged += key → mergedValue } that.foreach { diff --git a/kamon-core/src/main/scala/kamon/util/NeedToScale.scala b/kamon-core/src/main/scala/kamon/util/NeedToScale.scala index 19e1ae06..1397050f 100644 --- a/kamon-core/src/main/scala/kamon/util/NeedToScale.scala +++ b/kamon-core/src/main/scala/kamon/util/NeedToScale.scala @@ -17,7 +17,7 @@ package kamon.util import com.typesafe.config.Config -import kamon.metric.instrument.{ Memory, Time } +import kamon.metric.instrument.{Memory, Time} import kamon.util.ConfigTools._ object NeedToScale { @@ -30,7 +30,7 @@ object NeedToScale { val scaleMemoryTo: Option[Memory] = if (config.hasPath(MemoryUnits)) Some(config.memory(MemoryUnits)) else None - if (scaleTimeTo.isDefined || scaleMemoryTo.isDefined) Some(scaleTimeTo -> scaleMemoryTo) + if (scaleTimeTo.isDefined || scaleMemoryTo.isDefined) Some(scaleTimeTo → scaleMemoryTo) else None } } diff --git a/kamon-core/src/main/scala/kamon/util/executors/ExecutorMetricRecorder.scala b/kamon-core/src/main/scala/kamon/util/executors/ExecutorMetricRecorder.scala index 82655e9a..732e189e 100644 --- a/kamon-core/src/main/scala/kamon/util/executors/ExecutorMetricRecorder.scala +++ b/kamon-core/src/main/scala/kamon/util/executors/ExecutorMetricRecorder.scala @@ -16,9 +16,9 @@ package kamon.util.executors -import kamon.metric.{ EntityRecorderFactory, GenericEntityRecorder } -import kamon.metric.instrument.{ Gauge, MinMaxCounter, DifferentialValueCollector, InstrumentFactory } -import java.util.concurrent.{ ForkJoinPool ⇒ JavaForkJoinPool, ThreadPoolExecutor } +import kamon.metric.{EntityRecorderFactory, GenericEntityRecorder} +import kamon.metric.instrument.{Gauge, MinMaxCounter, DifferentialValueCollector, InstrumentFactory} +import java.util.concurrent.{ForkJoinPool ⇒ JavaForkJoinPool, ThreadPoolExecutor} import kamon.util.executors.ForkJoinPools.ForkJoinMetrics import scala.concurrent.forkjoin.ForkJoinPool diff --git a/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala b/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala index 98d2ea0c..60612beb 100644 --- a/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala +++ b/kamon-core/src/main/scala/kamon/util/executors/ExecutorServiceMetrics.scala @@ -16,7 +16,7 @@ package kamon.util.executors -import java.util.concurrent.{ ExecutorService, ForkJoinPool ⇒ JavaForkJoinPool, ThreadPoolExecutor } +import java.util.concurrent.{ExecutorService, ForkJoinPool ⇒ JavaForkJoinPool, ThreadPoolExecutor} import kamon.Kamon import kamon.metric.Entity @@ -49,7 +49,7 @@ object ExecutorServiceMetrics { * @param tags The tags associated to the [[ThreadPoolExecutor]] */ @inline private def registerThreadPool(name: String, threadPool: ThreadPoolExecutor, tags: Map[String, String]): Entity = { - val threadPoolEntity = Entity(name, Category, tags + ("executor-type" -> "thread-pool-executor")) + val threadPoolEntity = Entity(name, Category, tags + ("executor-type" → "thread-pool-executor")) Kamon.metrics.entity(ThreadPoolExecutorMetrics.factory(threadPool, Category), threadPoolEntity) threadPoolEntity } @@ -63,7 +63,7 @@ object ExecutorServiceMetrics { * @param tags The tags associated to the [[ForkJoinPool]] */ @inline private def registerScalaForkJoin(name: String, forkJoinPool: ForkJoinPool, tags: Map[String, String]): Entity = { - val forkJoinEntity = Entity(name, Category, tags + ("executor-type" -> "fork-join-pool")) + val forkJoinEntity = Entity(name, Category, tags + ("executor-type" → "fork-join-pool")) Kamon.metrics.entity(ForkJoinPoolMetrics.factory(forkJoinPool, Category), forkJoinEntity) forkJoinEntity } @@ -77,7 +77,7 @@ object ExecutorServiceMetrics { * @param tags The tags associated to the [[JavaForkJoinPool]] */ @inline private def registerJavaForkJoin(name: String, forkJoinPool: JavaForkJoinPool, tags: Map[String, String]): Entity = { - val forkJoinEntity = Entity(name, Category, tags + ("executor-type" -> "fork-join-pool")) + val forkJoinEntity = Entity(name, Category, tags + ("executor-type" → "fork-join-pool")) Kamon.metrics.entity(ForkJoinPoolMetrics.factory(forkJoinPool, Category), forkJoinEntity) forkJoinEntity } @@ -97,7 +97,7 @@ object ExecutorServiceMetrics { case delegatedExecutor: ExecutorService if delegatedExecutor.getClass.isAssignableFrom(DelegatedExecutor) ⇒ registerDelegatedExecutor(name, delegatedExecutor, tags) case delegatedScheduledExecutor: ExecutorService if delegatedScheduledExecutor.getClass.isAssignableFrom(DelegateScheduled) ⇒ registerDelegatedExecutor(name, delegatedScheduledExecutor, tags) case finalizableDelegatedExecutor: ExecutorService if finalizableDelegatedExecutor.getClass.isAssignableFrom(FinalizableDelegated) ⇒ registerDelegatedExecutor(name, finalizableDelegatedExecutor, tags) - case other ⇒ throw new NotSupportedException(s"The ExecutorService $name is not supported.") + case other ⇒ throw NotSupportedException(s"The ExecutorService $name is not supported.") } //Java variant diff --git a/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala b/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala index 81e8fb8b..929fef4f 100644 --- a/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala +++ b/kamon-core/src/main/scala/kamon/util/http/HttpServerMetrics.scala @@ -16,7 +16,7 @@ package kamon.util.http -import kamon.metric.{ EntityRecorderFactory, GenericEntityRecorder } +import kamon.metric.{EntityRecorderFactory, GenericEntityRecorder} import kamon.metric.instrument.InstrumentFactory /** diff --git a/kamon-core/src/main/scala/kamon/util/logger/LazyLogger.scala b/kamon-core/src/main/scala/kamon/util/logger/LazyLogger.scala index c70c316d..11be7bbe 100644 --- a/kamon-core/src/main/scala/kamon/util/logger/LazyLogger.scala +++ b/kamon-core/src/main/scala/kamon/util/logger/LazyLogger.scala @@ -15,7 +15,7 @@ package kamon.util.logger -import org.slf4j.{ Logger ⇒ SLF4JLogger } +import org.slf4j.{Logger ⇒ SLF4JLogger} class LazyLogger(val logger: SLF4JLogger) { @@ -41,7 +41,7 @@ class LazyLogger(val logger: SLF4JLogger) { } object LazyLogger { - import scala.reflect.{ classTag, ClassTag } + import scala.reflect.{classTag, ClassTag} def apply(name: String): LazyLogger = new LazyLogger(org.slf4j.LoggerFactory.getLogger(name)) def apply(cls: Class[_]): LazyLogger = apply(cls.getName) |