diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2018-02-13 11:37:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-13 11:37:11 +0100 |
commit | d9ae0f4d50763017b8d33dfcb6094375a30cb361 (patch) | |
tree | ab6be198b4c27ea2237e8ca5b24e4092c8e05fec /kamon-core-tests/src/test/scala | |
parent | 26e8684b88c0c5abc4c6e0a1e5c59cd0be058186 (diff) | |
parent | d64bbb1fdb634cafe13c0a19886550332d08f683 (diff) | |
download | Kamon-d9ae0f4d50763017b8d33dfcb6094375a30cb361.tar.gz Kamon-d9ae0f4d50763017b8d33dfcb6094375a30cb361.tar.bz2 Kamon-d9ae0f4d50763017b8d33dfcb6094375a30cb361.zip |
Merge pull request #515 from ivantopo/issue#510/add-support-for-environment-tags
add support for environment tags, fixes #510
Diffstat (limited to 'kamon-core-tests/src/test/scala')
-rw-r--r-- | kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala b/kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala index 82eed862..dadab5af 100644 --- a/kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala +++ b/kamon-core-tests/src/test/scala/kamon/EnvironmentSpec.scala @@ -27,7 +27,7 @@ class EnvironmentSpec extends WordSpec with Matchers { | instance = auto |} """.stripMargin - ) + ).withFallback(ConfigFactory.defaultReference()) "the Kamon environment" should { "assign a host and instance name when they are set to 'auto'" in { @@ -36,6 +36,7 @@ class EnvironmentSpec extends WordSpec with Matchers { env.host shouldNot be("auto") env.instance shouldNot be("auto") env.instance shouldBe s"environment-spec@${env.host}" + env.tags shouldBe empty } "use the configured host and instance, if provided" in { @@ -51,6 +52,24 @@ class EnvironmentSpec extends WordSpec with Matchers { env.host should be("spec-host") env.instance should be("spec-instance") + env.tags shouldBe empty + } + + "read all environment tags, if provided" in { + val customConfig = ConfigFactory.parseString( + """ + |kamon.environment.tags { + | custom1 = "test1" + | env = staging + |} + """.stripMargin) + + val env = Environment.fromConfig(customConfig.withFallback(baseConfig)) + + env.tags should contain allOf( + ("custom1" -> "test1"), + ("env" -> "staging") + ) } "always return the same incarnation name" in { |