From 953e4f27f1d40eb33ae08df0e20f70e2f87d8a5b Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 27 Aug 2015 22:25:40 -0300 Subject: = akka-remote: add @transient to kamon.trace.SegmentAware::segment to avoid error in chill/kryo serialization and closes #160 --- kamon-core/src/main/scala/kamon/trace/TraceContext.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kamon-core/src/main') diff --git a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala index 1bd72089..9642233a 100644 --- a/kamon-core/src/main/scala/kamon/trace/TraceContext.scala +++ b/kamon-core/src/main/scala/kamon/trace/TraceContext.scala @@ -158,7 +158,7 @@ object TimestampedTraceContextAware { } trait SegmentAware { - @volatile var segment: Segment = EmptyTraceContext.EmptySegment + @volatile @transient var segment: Segment = EmptyTraceContext.EmptySegment } object SegmentAware { -- cgit v1.2.3 From bae00c1a12dec1f08c5d587523a6fba5bea06654 Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Wed, 30 Sep 2015 13:59:18 -0400 Subject: = core: fix typo in kamon auto-start error message --- kamon-core/src/main/scala/kamon/Kamon.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kamon-core/src/main') diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 1c560d9f..9f4a7e3e 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -95,7 +95,7 @@ object Kamon { start() thunk(_coreComponents.get) - } else sys.error("Kamon has not been started yet. You must either explicitlt call Kamon.start(...) or enable " + + } else sys.error("Kamon has not been started yet. You must either explicitly call Kamon.start(...) or enable " + "automatic startup by adding -Dkamon.auto-start=true to your JVM options.") } -- cgit v1.2.3 From 66436e404be1e565463a758f0d0e577e4fef5f02 Mon Sep 17 00:00:00 2001 From: Eugene Platonov Date: Wed, 30 Sep 2015 14:27:35 -0400 Subject: = core: don't throw an NPE during shutdown if Kamon hasn't been started --- kamon-core/src/main/scala/kamon/Kamon.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'kamon-core/src/main') diff --git a/kamon-core/src/main/scala/kamon/Kamon.scala b/kamon-core/src/main/scala/kamon/Kamon.scala index 1c560d9f..9c843eb4 100644 --- a/kamon-core/src/main/scala/kamon/Kamon.scala +++ b/kamon-core/src/main/scala/kamon/Kamon.scala @@ -68,8 +68,10 @@ object Kamon { def shutdown(): Unit = { _coreComponents = None - _system.shutdown() - _system = null + if (_system ne null) { + _system.shutdown() + _system = null + } } def metrics: MetricsModule = -- cgit v1.2.3