2 files changed, 44 insertions, 0 deletions
diff --git a/kamon-core/src/main/scala/kamon/util/JavaTags.scala b/kamon-core/src/main/scala/kamon/util/JavaTags.scala
new file mode 100644
index 00000000..90bece5c
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/util/JavaTags.scala
@@ -0,0 +1,14 @@
+package kamon.util
+
+object JavaTags {
+
+  /**
+   *  Helper method to transform Java maps into Scala maps. Typically this will be used as a static import from
+   *  Java code that wants to use tags, as tags are defined as scala.collection.mutable.Map[String, String] and
+   *  creating them directly from Java is quite verbose.
+   */
+  def tagsFromMap(tags: java.util.Map[String, String]): Map[String, String] = {
+    import scala.collection.JavaConversions._
+    tags.toMap
+  }
+}
diff --git a/kamon-core/src/main/scala/kamon/util/SameThreadExecutionContext.scala b/kamon-core/src/main/scala/kamon/util/SameThreadExecutionContext.scala
new file mode 100644
index 00000000..2aae526f
--- /dev/null
+++ b/kamon-core/src/main/scala/kamon/util/SameThreadExecutionContext.scala
@@ -0,0 +1,30 @@
+/*
+ * =========================================================================================
+ * Copyright © 2013-2015 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.util
+
+import scala.concurrent.ExecutionContext
+import org.slf4j.LoggerFactory
+
+/**
+ * For small code blocks that don't need to be run on a separate thread.
+ */
+object SameThreadExecutionContext extends ExecutionContext {
+  val logger = LoggerFactory.getLogger("SameThreadExecutionContext")
+
+  override def execute(runnable: Runnable): Unit = runnable.run
+  override def reportFailure(t: Throwable): Unit = logger.error(t.getMessage, t)
+}