diff options
author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-08 18:23:00 +0200 |
---|---|---|
committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-06-08 18:23:00 +0200 |
commit | 0d3eb13669d3e9297b36d00aef03d177246efa27 (patch) | |
tree | 70af01a669ce37ecbc6a158a2f454b2a8fe55798 /kamon-core/src/test/scala | |
parent | b589b994b16ad96c846b8b63c90f875f38b31851 (diff) | |
parent | a3a00b2137cc803f83e9025b14b8bd01455fc123 (diff) | |
download | Kamon-0d3eb13669d3e9297b36d00aef03d177246efa27.tar.gz Kamon-0d3eb13669d3e9297b36d00aef03d177246efa27.tar.bz2 Kamon-0d3eb13669d3e9297b36d00aef03d177246efa27.zip |
Merge remote-tracking branch 'upstream/kamon-1.0-develop' into kamon-1.0-develop
Diffstat (limited to 'kamon-core/src/test/scala')
5 files changed, 48 insertions, 2 deletions
diff --git a/kamon-core/src/test/scala/kamon/LogInterceptor.scala b/kamon-core/src/test/scala/kamon/LogInterceptor.scala index abdf6ba8..76480a2f 100644 --- a/kamon-core/src/test/scala/kamon/LogInterceptor.scala +++ b/kamon-core/src/test/scala/kamon/LogInterceptor.scala @@ -1,3 +1,19 @@ +/* ========================================================================================= + * 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 uk.org.lidalia.slf4jext.Level diff --git a/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala b/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala index 50938e12..cb2a5d5f 100644 --- a/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/GlobPathFilterSpec.scala @@ -1,6 +1,6 @@ /* * ========================================================================================= - * Copyright © 2013-2014 the kamon project <http://kamon.io/> + * 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 diff --git a/kamon-core/src/test/scala/kamon/metric/RecorderRegistrySpec.scala b/kamon-core/src/test/scala/kamon/metric/RecorderRegistrySpec.scala index 28402d7c..d865e71b 100644 --- a/kamon-core/src/test/scala/kamon/metric/RecorderRegistrySpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/RecorderRegistrySpec.scala @@ -1,3 +1,18 @@ +/* ========================================================================================= + * 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.metric import com.typesafe.config.ConfigFactory diff --git a/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala b/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala index 40fb6039..da095b1b 100644 --- a/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/RegexPathFilterSpec.scala @@ -1,6 +1,6 @@ /* * ========================================================================================= - * Copyright © 2013-2015 the kamon project <http://kamon.io/> + * 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 diff --git a/kamon-core/src/test/scala/kamon/testkit/DefaultInstrumentFactory.scala b/kamon-core/src/test/scala/kamon/testkit/DefaultInstrumentFactory.scala index aa8972bb..77710376 100644 --- a/kamon-core/src/test/scala/kamon/testkit/DefaultInstrumentFactory.scala +++ b/kamon-core/src/test/scala/kamon/testkit/DefaultInstrumentFactory.scala @@ -1,3 +1,18 @@ +/* ========================================================================================= + * 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.testkit import com.typesafe.config.ConfigFactory |