From 110fff9745a0c1f154ee3d7a5149cd9f162a879f Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Fri, 28 Aug 2015 13:02:09 +0200 Subject: wip, core/akka/spray are kind of migrated. --- .../src/test/scala/kamon/metric/SimpleMetricsSpec.scala | 9 --------- .../scala/kamon/metric/TickMetricSnapshotBufferSpec.scala | 15 --------------- .../src/test/scala/kamon/metric/TraceMetricsSpec.scala | 15 --------------- .../src/test/scala/kamon/testkit/BaseKamonSpec.scala | 4 ++-- .../src/test/scala/kamon/trace/SimpleTraceSpec.scala | 15 --------------- .../scala/kamon/trace/TraceContextManipulationSpec.scala | 14 -------------- 6 files changed, 2 insertions(+), 70 deletions(-) (limited to 'kamon-core/src/test/scala') diff --git a/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala index 0180e980..6d753888 100644 --- a/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/SimpleMetricsSpec.scala @@ -16,21 +16,12 @@ package kamon.metric -import com.typesafe.config.ConfigFactory import kamon.Kamon import kamon.metric.instrument.Histogram.DynamicRange import kamon.testkit.BaseKamonSpec import scala.concurrent.duration._ class SimpleMetricsSpec extends BaseKamonSpec("simple-metrics-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - |} - """.stripMargin) "the SimpleMetrics extension" should { diff --git a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala index ac35cf58..97bf0e2c 100644 --- a/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TickMetricSnapshotBufferSpec.scala @@ -26,21 +26,6 @@ import scala.concurrent.duration._ import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot class TickMetricSnapshotBufferSpec extends BaseKamonSpec("trace-metrics-spec") with ImplicitSender { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - | - | filters { - | trace { - | includes = [ "*" ] - | excludes = [ "non-tracked-trace" ] - | } - | } - |} - """.stripMargin) "the TickMetricSnapshotBuffer" should { "merge TickMetricSnapshots received until the flush timeout is reached and fix the from/to fields" in new SnapshotFixtures { diff --git a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala index efdcb79b..3e3e2d8e 100644 --- a/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/TraceMetricsSpec.scala @@ -23,21 +23,6 @@ import kamon.trace.Tracer import kamon.metric.instrument.Histogram class TraceMetricsSpec extends BaseKamonSpec("trace-metrics-spec") with ImplicitSender { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | default-collection-context-buffer-size = 10 - | - | filters { - | trace { - | includes = [ "*" ] - | excludes = [ "non-tracked-trace"] - | } - | } - |} - """.stripMargin) "the TraceMetrics" should { "record the elapsed time between a trace creation and finish" in { diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala index cb909ad9..f23d974c 100644 --- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala +++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala @@ -28,12 +28,12 @@ import org.scalatest.{ BeforeAndAfterAll, Matchers, WordSpecLike } abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with WordSpecLike with Matchers with ImplicitSender with BeforeAndAfterAll { lazy val collectionContext = Kamon.metrics.buildDefaultCollectionContext implicit lazy val system: ActorSystem = { - Kamon.start(config.withFallback(ConfigFactory.load())) + Kamon.start() ActorSystem(actorSystemName, config) } def config: Config = - ConfigFactory.empty() + Kamon.config def newContext(name: String): TraceContext = Kamon.tracer.newContext(name) diff --git a/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala b/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala index c8f1ebf6..d6886d4c 100644 --- a/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/SimpleTraceSpec.scala @@ -23,21 +23,6 @@ import scala.concurrent.duration._ class SimpleTraceSpec extends BaseKamonSpec("simple-trace-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon { - | metric { - | tick-interval = 1 hour - | } - | - | trace { - | level-of-detail = simple-trace - | sampling = all - | } - |} - """.stripMargin) - "the simple tracing" should { "send a TraceInfo when the trace has finished and all segments are finished" in { Kamon.tracer.subscribe(testActor) diff --git a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala index 46620461..ecef9271 100644 --- a/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala +++ b/kamon-core/src/test/scala/kamon/trace/TraceContextManipulationSpec.scala @@ -20,20 +20,6 @@ import com.typesafe.config.ConfigFactory import kamon.testkit.BaseKamonSpec class TraceContextManipulationSpec extends BaseKamonSpec("trace-metrics-spec") { - override lazy val config = - ConfigFactory.parseString( - """ - |kamon.metric { - | tick-interval = 1 hour - | - | filters { - | trace { - | includes = [ "*" ] - | excludes = [ "non-tracked-trace"] - | } - | } - |} - """.stripMargin) "the TraceContext api" should { "allow starting a trace within a specified block of code, and only within that block of code" in { -- cgit v1.2.3