diff options
author | PJ Fanning <pjfanning@users.noreply.github.com> | 2017-05-25 18:02:06 +0100 |
---|---|---|
committer | Diego Parra <diegolparra@gmail.com> | 2017-05-25 19:02:06 +0200 |
commit | dc35b4f842eb7ee63b3472a5be1bb530bb391697 (patch) | |
tree | 33a9f68b1bc1400170f4d44b2e59c06a37e69213 | |
parent | 016966381897cd8e7f4bdc42cee511f4233f14c5 (diff) | |
download | Kamon-dc35b4f842eb7ee63b3472a5be1bb530bb391697.tar.gz Kamon-dc35b4f842eb7ee63b3472a5be1bb530bb391697.tar.bz2 Kamon-dc35b4f842eb7ee63b3472a5be1bb530bb391697.zip |
[#461] issue with kamon reference.conf when using akka-2.3 (#462)
* [#461] issue with kamon reference.conf when using akka-2.3
* [#461] add test case for kamon-core reference.conf change
* fix #461
-rw-r--r-- | kamon-core/src/main/resources/reference.conf | 8 | ||||
-rw-r--r-- | kamon-core/src/test/scala/kamon/ReferenceConfSpec.scala | 29 |
2 files changed, 33 insertions, 4 deletions
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf index 48441493..59a80c4d 100644 --- a/kamon-core/src/main/resources/reference.conf +++ b/kamon-core/src/main/resources/reference.conf @@ -141,13 +141,13 @@ kamon { } } - # All settings included under the internal-config key will be used to repleace the akka.* and spray.* settings. By + # All settings included under the internal-config key will be used to replace the akka.* and spray.* settings. By # doing this we avoid applying custom settings that might make sense for the user application to the internal actor # system and Spray facilities used by Kamon. internal-config { akka.actor { - provider = "local" + provider = "akka.actor.LocalActorRefProvider" default-dispatcher { fork-join-executor { parallelism-min = 2 @@ -171,7 +171,7 @@ kamon { # settings in a module-info section. } - # Add tags to all reported metrics. Can be useful to identify the source of metrics from a particluar JVM instance. + # Add tags to all reported metrics. Can be useful to identify the source of metrics from a particular JVM instance. # Example: # # default-tags { @@ -181,4 +181,4 @@ kamon { default-tags { } -}
\ No newline at end of file +} diff --git a/kamon-core/src/test/scala/kamon/ReferenceConfSpec.scala b/kamon-core/src/test/scala/kamon/ReferenceConfSpec.scala new file mode 100644 index 00000000..40e1c9fa --- /dev/null +++ b/kamon-core/src/test/scala/kamon/ReferenceConfSpec.scala @@ -0,0 +1,29 @@ +/* + * ========================================================================================= + * Copyright © 2013-2017 the kamon project <http://kamon.io/> + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ +package kamon + +import com.typesafe.config.ConfigFactory +import org.scalatest.{Matchers, WordSpec} + +class ReferenceConfSpec extends WordSpec with Matchers { + + "reference.conf" should { + "have internal-config akka.actor.provider that is akka 2.3 compatible" in { + val conf = ConfigFactory.load("reference.conf") + conf.getString("kamon.internal-config.akka.actor.provider") shouldEqual "akka.actor.LocalActorRefProvider" + } + } +} |