aboutsummaryrefslogtreecommitdiff
path: root/kamon-akka-remote/src/test/scala/kamon
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into release-legacy-akka-2.2Ivan Topolnjak2015-05-091-9/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: kamon-akka/src/test/scala/kamon/akka/RouterMetricsSpec.scala kamon-akka/src/test/scala/kamon/akka/instrumentation/ActorCellInstrumentationSpec.scala kamon-akka/src/test/scala/kamon/akka/instrumentation/AskPatternInstrumentationSpec.scala kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala project/Dependencies.scala project/Settings.scala
| * = core: add commodity trace context manipulation methods to the Tracer.Ivan Topolnjak2015-04-171-6/+6
| |
| * ! core: move the TraceContext manipulation API to the Tracer companion object.Ivan Topolnjak2015-02-151-9/+9
| |
* | Merge branch 'single-kamon-instance-per-jvm' into release-legacy-akka-2.2Ivan Topolnjak2015-02-141-26/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: kamon-akka-remote/src/test/scala/kamon/akka/instrumentation/RemotingInstrumentationSpec.scala kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala kamon-core/src/main/scala/kamon/instrumentation/akka/AskPatternInstrumentation.scala kamon-core/src/main/scala/kamon/metric/MetricsExtension.scala kamon-core/src/main/scala/kamon/metric/Subscriptions.scala kamon-core/src/main/scala/kamon/metric/instrument/Gauge.scala kamon-core/src/main/scala/kamon/metric/instrument/MinMaxCounter.scala kamon-core/src/test/scala/kamon/instrumentation/akka/ActorCellInstrumentationSpec.scala kamon-core/src/test/scala/kamon/metric/ActorMetricsSpec.scala kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala kamon-core/src/test/scala/kamon/metric/SubscriptionsProtocolSpec.scala kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala kamon-core/src/test/scala/kamon/metric/UserMetricsSpec.scala kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala kamon-datadog/src/main/scala/kamon/datadog/Datadog.scala kamon-newrelic/src/main/scala/kamon/newrelic/Agent.scala kamon-newrelic/src/main/scala/kamon/newrelic/MetricReporter.scala kamon-play/src/main/scala/kamon/play/Play.scala kamon-play/src/main/scala/kamon/play/action/KamonTraceActions.scala kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala kamon-play/src/test/scala/kamon/play/RequestInstrumentationSpec.scala kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala project/Dependencies.scala version.sbt
| * ! all: Kamon now works as a single instance in a companion object.Ivan Topolnjak2015-02-131-25/+28
| |
| * ! all: improve the metric recorders infrastructureIvan Topolnjak2015-01-241-10/+16
| |
* | Merge branch 'master' into release-0.2, kamon-play still need fixes.Ivan Topolnjak2014-11-031-3/+6
|/ | | | | | | | | | | | | Conflicts: kamon-core/src/main/scala/kamon/instrumentation/akka/ActorCellInstrumentation.scala kamon-core/src/test/scala/kamon/metric/RouterMetricsSpec.scala kamon-newrelic/src/main/scala/kamon/newrelic/NewRelic.scala kamon-play/src/main/scala/kamon/play/instrumentation/RequestInstrumentation.scala kamon-play/src/main/scala/kamon/play/instrumentation/WSInstrumentation.scala kamon-play/src/test/scala/kamon/play/WSInstrumentationSpec.scala kamon-playground/src/main/scala/test/SimpleRequestProcessor.scala kamon-statsd/src/main/scala/kamon/statsd/StatsD.scala project/Dependencies.scala
* = all: upgrade to be compatible with the latest code in coreIvan Topolnjak2014-10-261-7/+5
|
* + akka-remote: create a new kamon-akka-remote module, closes #99Ivan Topolnjak2014-10-241-0/+169
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-11 17:01:17 +0000