Repository: incubator-samza Updated Branches: refs/heads/master df8436ddb -> a7b1282b0
SAMZA-361: Remove Grizzled SLF4J Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/a7b1282b Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/a7b1282b Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/a7b1282b Branch: refs/heads/master Commit: a7b1282b05db88aec1e4aa70a5abaf44fb9fccd9 Parents: df8436d Author: Yan Fang <[email protected]> Authored: Fri Aug 22 09:16:04 2014 -0700 Committer: Yan Fang <[email protected]> Committed: Fri Aug 22 09:16:04 2014 -0700 ---------------------------------------------------------------------- build.gradle | 9 +- gradle/dependency-versions-scala-2.10.gradle | 1 - gradle/dependency-versions-scala-2.9.2.gradle | 1 - .../samza/checkpoint/CheckpointTool.scala | 2 +- .../apache/samza/checkpoint/OffsetManager.scala | 2 +- .../org/apache/samza/config/StorageConfig.scala | 2 +- .../org/apache/samza/config/StreamConfig.scala | 2 +- .../org/apache/samza/config/SystemConfig.scala | 3 +- .../factories/PropertiesConfigFactory.scala | 2 +- .../org/apache/samza/container/RunLoop.scala | 2 +- .../apache/samza/container/SamzaContainer.scala | 2 +- .../apache/samza/container/TaskInstance.scala | 2 +- .../TaskNamesToSystemStreamPartitions.scala | 2 +- .../scala/org/apache/samza/job/JobRunner.scala | 2 +- .../org/apache/samza/job/local/ProcessJob.scala | 2 +- .../samza/job/local/ProcessJobFactory.scala | 2 +- .../org/apache/samza/job/local/ThreadJob.scala | 2 +- .../samza/job/local/ThreadJobFactory.scala | 2 +- .../org/apache/samza/metrics/JmxServer.scala | 2 +- .../org/apache/samza/metrics/JvmMetrics.scala | 2 +- .../samza/metrics/MetricsRegistryMap.scala | 2 +- .../samza/metrics/reporter/JmxReporter.scala | 2 +- .../reporter/MetricsSnapshotReporter.scala | 2 +- .../MetricsSnapshotReporterFactory.scala | 2 +- .../samza/serializers/CheckpointSerde.scala | 2 +- .../samza/storage/TaskStorageManager.scala | 2 +- .../samza/system/StreamMetadataCache.scala | 2 +- .../apache/samza/system/SystemConsumers.scala | 2 +- .../apache/samza/system/SystemProducers.scala | 2 +- .../samza/system/chooser/BatchingChooser.scala | 2 +- .../system/chooser/BootstrappingChooser.scala | 2 +- .../samza/system/chooser/DefaultChooser.scala | 2 +- .../system/chooser/TieredPriorityChooser.scala | 2 +- .../filereader/FileReaderSystemAdmin.scala | 2 +- .../filereader/FileReaderSystemConsumer.scala | 2 +- .../samza/task/TaskInstanceCollector.scala | 2 +- .../scala/org/apache/samza/util/Logging.scala | 136 +++++++++++++++++++ .../main/scala/org/apache/samza/util/Util.scala | 1 - .../apache/samza/metrics/TestJmxServer.scala | 2 +- .../kafka/KafkaCheckpointManager.scala | 2 +- .../kafka/KafkaCheckpointManagerFactory.scala | 2 +- .../samza/config/RegExTopicGenerator.scala | 2 +- .../apache/samza/system/kafka/BrokerProxy.scala | 2 +- .../apache/samza/system/kafka/GetOffset.scala | 2 +- .../samza/system/kafka/KafkaSystemAdmin.scala | 2 +- .../system/kafka/KafkaSystemConsumer.scala | 2 +- .../system/kafka/KafkaSystemProducer.scala | 2 +- .../samza/system/kafka/TopicMetadataCache.scala | 2 +- .../util/ClientUtilTopicMetadataStore.scala | 2 +- .../samza/system/kafka/TestBrokerProxy.scala | 2 +- .../kv/inmemory/InMemoryKeyValueStore.scala | 2 +- .../samza/storage/kv/LevelDbKeyValueStore.scala | 7 +- .../apache/samza/storage/kv/CachedStore.scala | 2 +- .../storage/kv/KeyValueStorageEngine.scala | 2 +- .../apache/samza/storage/kv/LoggedStore.scala | 2 +- .../storage/kv/SerializedKeyValueStore.scala | 2 +- .../performance/TestKeyValuePerformance.scala | 2 +- .../test/performance/TestPerformanceTask.scala | 2 +- .../TestSamzaContainerPerformance.scala | 2 +- .../apache/samza/job/yarn/ClientHelper.scala | 2 +- .../apache/samza/job/yarn/SamzaAppMaster.scala | 2 +- .../job/yarn/SamzaAppMasterLifecycle.scala | 2 +- .../samza/job/yarn/SamzaAppMasterMetrics.scala | 2 +- .../samza/job/yarn/SamzaAppMasterService.scala | 2 +- .../samza/job/yarn/SamzaAppMasterState.scala | 2 +- .../job/yarn/SamzaAppMasterTaskManager.scala | 2 +- .../samza/util/hadoop/HttpFileSystem.scala | 2 +- 67 files changed, 201 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 357bb0e..ef527d9 100644 --- a/build.gradle +++ b/build.gradle @@ -112,7 +112,7 @@ project(":samza-core_$scalaVersion") { dependencies { compile project(':samza-api') compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" + compile "org.slf4j:slf4j-api:$slf4jVersion" compile "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion" compile "org.codehaus.jackson:jackson-jaxrs:$jacksonVersion" @@ -140,7 +140,6 @@ project(":samza-kafka_$scalaVersion") { compile project(":samza-core_$scalaVersion") compile project(":samza-serializers_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" compile "com.101tec:zkclient:$zkClientVersion" compile "org.apache.zookeeper:zookeeper:$zookeeperVersion" compile "org.codehaus.jackson:jackson-jaxrs:$jacksonVersion" @@ -178,7 +177,6 @@ project(":samza-serializers_$scalaVersion") { compile project(':samza-api') compile project(":samza-core_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" compile "org.codehaus.jackson:jackson-jaxrs:$jacksonVersion" testCompile "junit:junit:$junitVersion" } @@ -193,7 +191,6 @@ project(":samza-yarn_$scalaVersion") { compile project(":samza-core_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" compile "org.scala-lang:scala-compiler:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" compile "org.codehaus.jackson:jackson-jaxrs:$jacksonVersion" compile "commons-httpclient:commons-httpclient:$commonsHttpClientVersion" compile "org.eclipse.jetty:jetty-webapp:$jettyVersion" @@ -307,7 +304,6 @@ project(":samza-kv_$scalaVersion") { compile project(':samza-api') compile project(":samza-core_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" testCompile "junit:junit:$junitVersion" } } @@ -320,7 +316,6 @@ project(":samza-kv-inmemory_$scalaVersion") { compile project(":samza-core_$scalaVersion") compile project(":samza-kv_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" compile "com.google.guava:guava:$guavaVersion" testCompile "junit:junit:$junitVersion" } @@ -335,7 +330,6 @@ project(":samza-kv-leveldb_$scalaVersion") { compile project(":samza-kv_$scalaVersion") compile project(":samza-kv-inmemory_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" compile "org.fusesource.leveldbjni:leveldbjni-all:$leveldbVersion" testCompile "junit:junit:$junitVersion" testCompile "org.scalatest:scalatest_$scalaVersion:$scalaTestVersion" @@ -357,7 +351,6 @@ project(":samza-test_$scalaVersion") { compile project(":samza-kv-leveldb_$scalaVersion") compile project(":samza-core_$scalaVersion") compile "org.scala-lang:scala-library:$scalaLibVersion" - compile "org.clapper:grizzled-slf4j_$scalaVersion:$grizzledVersion" compile "net.sf.jopt-simple:jopt-simple:$joptSimpleVersion" compile "javax.mail:mail:1.4" compile "junit:junit:$junitVersion" http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/gradle/dependency-versions-scala-2.10.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.10.gradle b/gradle/dependency-versions-scala-2.10.gradle index ba54099..f12beaf 100644 --- a/gradle/dependency-versions-scala-2.10.gradle +++ b/gradle/dependency-versions-scala-2.10.gradle @@ -24,7 +24,6 @@ ext { // -language:implicitConversions: Allow the use of implicit conversions without warning or library import // -language:reflectiveCalls: Allow the automatic use of reflection to access fields without warning or library import scalaOptions = "-feature -language:implicitConversions -language:reflectiveCalls" - grizzledVersion = "1.0.1" scalatraVersion = "2.2.1" jettyVersion = "8.1.8.v20121106" } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/gradle/dependency-versions-scala-2.9.2.gradle ---------------------------------------------------------------------- diff --git a/gradle/dependency-versions-scala-2.9.2.gradle b/gradle/dependency-versions-scala-2.9.2.gradle index 78d000f..8e75bac 100644 --- a/gradle/dependency-versions-scala-2.9.2.gradle +++ b/gradle/dependency-versions-scala-2.9.2.gradle @@ -20,7 +20,6 @@ ext { scalaVersion = "2.9.2" scalaLibVersion = "2.9.2" scalaOptions = "" - grizzledVersion = "0.6.10" scalatraVersion = "2.2.1" jettyVersion = "8.1.8.v20121106" } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/checkpoint/CheckpointTool.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/checkpoint/CheckpointTool.scala b/samza-core/src/main/scala/org/apache/samza/checkpoint/CheckpointTool.scala index 84ea4ca..64a5078 100644 --- a/samza-core/src/main/scala/org/apache/samza/checkpoint/CheckpointTool.scala +++ b/samza-core/src/main/scala/org/apache/samza/checkpoint/CheckpointTool.scala @@ -19,7 +19,6 @@ package org.apache.samza.checkpoint -import grizzled.slf4j.Logging import java.net.URI import java.util.regex.Pattern import joptsimple.OptionSet @@ -32,6 +31,7 @@ import org.apache.samza.system.SystemStreamPartition import org.apache.samza.util.{CommandLine, Util} import org.apache.samza.{Partition, SamzaException} import scala.collection.JavaConversions._ +import org.apache.samza.util.Logging /** * Command-line tool for inspecting and manipulating the checkpoints for a job. http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala b/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala index 4efe997..80c8d0e 100644 --- a/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala +++ b/samza-core/src/main/scala/org/apache/samza/checkpoint/OffsetManager.scala @@ -25,7 +25,7 @@ import org.apache.samza.system.SystemStreamMetadata import org.apache.samza.system.SystemStreamMetadata.OffsetType import org.apache.samza.SamzaException import scala.collection.JavaConversions._ -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.config.Config import org.apache.samza.config.StreamConfig.Config2Stream import org.apache.samza.config.SystemConfig.Config2System http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/config/StorageConfig.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/config/StorageConfig.scala b/samza-core/src/main/scala/org/apache/samza/config/StorageConfig.scala index abcb034..f977b8b 100644 --- a/samza-core/src/main/scala/org/apache/samza/config/StorageConfig.scala +++ b/samza-core/src/main/scala/org/apache/samza/config/StorageConfig.scala @@ -21,7 +21,7 @@ package org.apache.samza.config import scala.collection.JavaConversions._ -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging object StorageConfig { // stream config constants http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/config/StreamConfig.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/config/StreamConfig.scala b/samza-core/src/main/scala/org/apache/samza/config/StreamConfig.scala index d71ead1..adef09e 100644 --- a/samza-core/src/main/scala/org/apache/samza/config/StreamConfig.scala +++ b/samza-core/src/main/scala/org/apache/samza/config/StreamConfig.scala @@ -19,7 +19,7 @@ package org.apache.samza.config -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import scala.collection.JavaConversions._ import org.apache.samza.SamzaException import org.apache.samza.util.Util http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/config/SystemConfig.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/config/SystemConfig.scala b/samza-core/src/main/scala/org/apache/samza/config/SystemConfig.scala index 4cfdcc2..bf974df 100644 --- a/samza-core/src/main/scala/org/apache/samza/config/SystemConfig.scala +++ b/samza-core/src/main/scala/org/apache/samza/config/SystemConfig.scala @@ -20,8 +20,7 @@ package org.apache.samza.config import scala.collection.JavaConversions._ - -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging object SystemConfig { // system config constants http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/config/factories/PropertiesConfigFactory.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/config/factories/PropertiesConfigFactory.scala b/samza-core/src/main/scala/org/apache/samza/config/factories/PropertiesConfigFactory.scala index 768cfa4..ea91872 100644 --- a/samza-core/src/main/scala/org/apache/samza/config/factories/PropertiesConfigFactory.scala +++ b/samza-core/src/main/scala/org/apache/samza/config/factories/PropertiesConfigFactory.scala @@ -25,7 +25,7 @@ import scala.collection.JavaConversions._ import org.apache.samza.config.Config import org.apache.samza.config.ConfigFactory import org.apache.samza.config.MapConfig -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException class PropertiesConfigFactory extends ConfigFactory with Logging { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/container/RunLoop.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/container/RunLoop.scala b/samza-core/src/main/scala/org/apache/samza/container/RunLoop.scala index 6862460..499f5c6 100644 --- a/samza-core/src/main/scala/org/apache/samza/container/RunLoop.scala +++ b/samza-core/src/main/scala/org/apache/samza/container/RunLoop.scala @@ -19,7 +19,7 @@ package org.apache.samza.container -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.system.{ SystemStreamPartition, SystemConsumers } import org.apache.samza.task.ReadableCoordinator import org.apache.samza.util.TimerUtils http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala index 04edf50..3288bf7 100644 --- a/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala +++ b/samza-core/src/main/scala/org/apache/samza/container/SamzaContainer.scala @@ -19,7 +19,7 @@ package org.apache.samza.container -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.io.File import org.apache.samza.Partition import org.apache.samza.SamzaException http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/container/TaskInstance.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/container/TaskInstance.scala b/samza-core/src/main/scala/org/apache/samza/container/TaskInstance.scala index 92d48eb..b86fb0d 100644 --- a/samza-core/src/main/scala/org/apache/samza/container/TaskInstance.scala +++ b/samza-core/src/main/scala/org/apache/samza/container/TaskInstance.scala @@ -21,7 +21,7 @@ package org.apache.samza.container import org.apache.samza.metrics.MetricsReporter import org.apache.samza.config.Config -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.storage.TaskStorageManager import org.apache.samza.system.SystemStreamPartition import org.apache.samza.task.TaskContext http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/container/TaskNamesToSystemStreamPartitions.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/container/TaskNamesToSystemStreamPartitions.scala b/samza-core/src/main/scala/org/apache/samza/container/TaskNamesToSystemStreamPartitions.scala index 427119e..da15346 100644 --- a/samza-core/src/main/scala/org/apache/samza/container/TaskNamesToSystemStreamPartitions.scala +++ b/samza-core/src/main/scala/org/apache/samza/container/TaskNamesToSystemStreamPartitions.scala @@ -18,7 +18,7 @@ */ package org.apache.samza.container -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException import org.apache.samza.system.{SystemStream, SystemStreamPartition} import scala.collection.{immutable, Map, MapLike} http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/job/JobRunner.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/job/JobRunner.scala b/samza-core/src/main/scala/org/apache/samza/job/JobRunner.scala index 19c9538..16345cd 100644 --- a/samza-core/src/main/scala/org/apache/samza/job/JobRunner.scala +++ b/samza-core/src/main/scala/org/apache/samza/job/JobRunner.scala @@ -26,7 +26,7 @@ import org.apache.samza.config.factories.PropertiesConfigFactory import org.apache.samza.job.ApplicationStatus.Running import org.apache.samza.util.Util import org.apache.samza.util.CommandLine -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import scala.collection.JavaConversions._ object JobRunner extends Logging { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJob.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJob.scala b/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJob.scala index a9ecd97..c8d8bb8 100644 --- a/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJob.scala +++ b/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJob.scala @@ -25,7 +25,7 @@ import org.apache.samza.job.ApplicationStatus.SuccessfulFinish import org.apache.samza.job.ApplicationStatus.UnsuccessfulFinish import org.apache.samza.job.ApplicationStatus import org.apache.samza.job.StreamJob -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.util.concurrent.CountDownLatch import java.io.BufferedReader import java.io.InputStreamReader http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJobFactory.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJobFactory.scala b/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJobFactory.scala index 74b9367..8125cbb 100644 --- a/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJobFactory.scala +++ b/samza-core/src/main/scala/org/apache/samza/job/local/ProcessJobFactory.scala @@ -20,7 +20,7 @@ package org.apache.samza.job.local import org.apache.samza.container.{TaskNamesToSystemStreamPartitions, SamzaContainer} -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException import org.apache.samza.config.Config import org.apache.samza.config.TaskConfig._ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJob.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJob.scala b/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJob.scala index 0acc3de..63754c5 100644 --- a/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJob.scala +++ b/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJob.scala @@ -19,7 +19,7 @@ package org.apache.samza.job.local -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.job.StreamJob import org.apache.samza.job.ApplicationStatus import org.apache.samza.job.ApplicationStatus.New http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJobFactory.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJobFactory.scala b/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJobFactory.scala index c0ea0af..766df76 100644 --- a/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJobFactory.scala +++ b/samza-core/src/main/scala/org/apache/samza/job/local/ThreadJobFactory.scala @@ -19,7 +19,7 @@ package org.apache.samza.job.local -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException import org.apache.samza.config.Config import org.apache.samza.config.ShellCommandConfig._ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala b/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala index 0ff88e7..f343faf 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/JmxServer.scala @@ -19,7 +19,7 @@ package org.apache.samza.metrics -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.rmi.server.RMIServerSocketFactory import java.net.{ InetAddress, ServerSocket } import java.rmi.registry.LocateRegistry http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/metrics/JvmMetrics.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/JvmMetrics.scala b/samza-core/src/main/scala/org/apache/samza/metrics/JvmMetrics.scala index ed1e8af..a95a0ec 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/JvmMetrics.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/JvmMetrics.scala @@ -25,7 +25,7 @@ import scala.collection.JavaConversions._ import java.lang.Thread.State._ import java.util.concurrent.Executors import java.util.concurrent.TimeUnit -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.util.DaemonThreadFactory /** http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/metrics/MetricsRegistryMap.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/MetricsRegistryMap.scala b/samza-core/src/main/scala/org/apache/samza/metrics/MetricsRegistryMap.scala index aac241b..40ffee2 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/MetricsRegistryMap.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/MetricsRegistryMap.scala @@ -19,7 +19,7 @@ package org.apache.samza.metrics -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.util.concurrent.ConcurrentHashMap /** http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/JmxReporter.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/JmxReporter.scala b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/JmxReporter.scala index d66efc2..e966102 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/JmxReporter.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/JmxReporter.scala @@ -20,7 +20,7 @@ package org.apache.samza.metrics.reporter import java.lang.management.ManagementFactory -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import javax.management.MBeanServer import javax.management.ObjectName import org.apache.samza.config.Config http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporter.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporter.scala b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporter.scala index 319c74d..b6696f8 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporter.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporter.scala @@ -22,7 +22,7 @@ package org.apache.samza.metrics.reporter import java.util.HashMap import java.util.Map import scala.collection.JavaConversions._ -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.metrics.Counter import org.apache.samza.metrics.Gauge import org.apache.samza.metrics.Timer http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporterFactory.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporterFactory.scala b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporterFactory.scala index 9711043..dcf0435 100644 --- a/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporterFactory.scala +++ b/samza-core/src/main/scala/org/apache/samza/metrics/reporter/MetricsSnapshotReporterFactory.scala @@ -20,7 +20,7 @@ package org.apache.samza.metrics.reporter import java.net.InetAddress -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException import org.apache.samza.config.Config import org.apache.samza.config.JobConfig.Config2Job http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala b/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala index 34c846c..fd8455a 100644 --- a/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala +++ b/samza-core/src/main/scala/org/apache/samza/serializers/CheckpointSerde.scala @@ -19,7 +19,7 @@ package org.apache.samza.serializers -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.util import org.apache.samza.checkpoint.Checkpoint import org.apache.samza.container.TaskName http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/storage/TaskStorageManager.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/storage/TaskStorageManager.scala b/samza-core/src/main/scala/org/apache/samza/storage/TaskStorageManager.scala index 0cfdbb3..b8719c3 100644 --- a/samza-core/src/main/scala/org/apache/samza/storage/TaskStorageManager.scala +++ b/samza-core/src/main/scala/org/apache/samza/storage/TaskStorageManager.scala @@ -21,7 +21,7 @@ package org.apache.samza.storage import java.io.File import scala.collection.Map -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.Partition import org.apache.samza.system.SystemConsumer import org.apache.samza.system.SystemStream http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/StreamMetadataCache.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/StreamMetadataCache.scala b/samza-core/src/main/scala/org/apache/samza/system/StreamMetadataCache.scala index 7f8bca7..155c3d1 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/StreamMetadataCache.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/StreamMetadataCache.scala @@ -19,7 +19,7 @@ package org.apache.samza.system -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException import org.apache.samza.util.{Clock, SystemClock} import scala.collection.JavaConversions._ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/SystemConsumers.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/SystemConsumers.scala b/samza-core/src/main/scala/org/apache/samza/system/SystemConsumers.scala index deb966b..125d376 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/SystemConsumers.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/SystemConsumers.scala @@ -21,7 +21,7 @@ package org.apache.samza.system import scala.collection.JavaConversions._ import org.apache.samza.serializers.SerdeManager -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.system.chooser.MessageChooser import org.apache.samza.SamzaException import java.util.HashMap http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/SystemProducers.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/SystemProducers.scala b/samza-core/src/main/scala/org/apache/samza/system/SystemProducers.scala index 928b47e..a022b2e 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/SystemProducers.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/SystemProducers.scala @@ -20,7 +20,7 @@ package org.apache.samza.system import org.apache.samza.serializers.SerdeManager -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException class SystemProducers( http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/chooser/BatchingChooser.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/chooser/BatchingChooser.scala b/samza-core/src/main/scala/org/apache/samza/system/chooser/BatchingChooser.scala index 7120e62..b08817c 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/chooser/BatchingChooser.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/chooser/BatchingChooser.scala @@ -24,7 +24,7 @@ import org.apache.samza.system.IncomingMessageEnvelope import org.apache.samza.metrics.MetricsHelper import org.apache.samza.metrics.MetricsRegistryMap import org.apache.samza.metrics.MetricsRegistry -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging /** * BatchingChooser provides a batching functionality on top of an existing http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/chooser/BootstrappingChooser.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/chooser/BootstrappingChooser.scala b/samza-core/src/main/scala/org/apache/samza/system/chooser/BootstrappingChooser.scala index ad21a08..dd500b9 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/chooser/BootstrappingChooser.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/chooser/BootstrappingChooser.scala @@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger import org.apache.samza.system.SystemStream import org.apache.samza.system.SystemStreamPartition import org.apache.samza.system.IncomingMessageEnvelope -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.metrics.MetricsHelper import org.apache.samza.metrics.MetricsRegistryMap import org.apache.samza.metrics.MetricsRegistry http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/chooser/DefaultChooser.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/chooser/DefaultChooser.scala b/samza-core/src/main/scala/org/apache/samza/system/chooser/DefaultChooser.scala index 52b8fc4..95bd188 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/chooser/DefaultChooser.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/chooser/DefaultChooser.scala @@ -34,7 +34,7 @@ import org.apache.samza.system.SystemAdmin import org.apache.samza.metrics.MetricsRegistry import org.apache.samza.metrics.MetricsRegistryMap import org.apache.samza.system.SystemStreamMetadata -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging object DefaultChooser extends Logging { def apply(inputStreamMetadata: Map[SystemStream, SystemStreamMetadata], chooserFactory: MessageChooserFactory, config: Config, registry: MetricsRegistry) = { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/chooser/TieredPriorityChooser.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/chooser/TieredPriorityChooser.scala b/samza-core/src/main/scala/org/apache/samza/system/chooser/TieredPriorityChooser.scala index e4232d3..6a3980e 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/chooser/TieredPriorityChooser.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/chooser/TieredPriorityChooser.scala @@ -24,7 +24,7 @@ import org.apache.samza.SamzaException import org.apache.samza.system.SystemStream import org.apache.samza.system.IncomingMessageEnvelope import org.apache.samza.system.SystemStreamPartition -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging /** * TieredPriorityChooser groups messages into priority tiers. Each priority http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemAdmin.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemAdmin.scala b/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemAdmin.scala index 9c99a59..98e92bc 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemAdmin.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemAdmin.scala @@ -27,7 +27,7 @@ import scala.collection.JavaConversions._ import java.io.RandomAccessFile import scala.util.control.Breaks import org.apache.samza.Partition -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException class FileReaderSystemAdmin extends SystemAdmin with Logging { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemConsumer.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemConsumer.scala b/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemConsumer.scala index c0e1bb6..61dfd33 100644 --- a/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemConsumer.scala +++ b/samza-core/src/main/scala/org/apache/samza/system/filereader/FileReaderSystemConsumer.scala @@ -34,7 +34,7 @@ import java.util.concurrent.Executors import java.util.concurrent.ExecutorService import org.apache.samza.util.DaemonThreadFactory import org.apache.samza.SamzaException -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging object FileReaderSystemConsumer { /** http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/task/TaskInstanceCollector.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/task/TaskInstanceCollector.scala b/samza-core/src/main/scala/org/apache/samza/task/TaskInstanceCollector.scala index ec6b6f4..3b91180 100644 --- a/samza-core/src/main/scala/org/apache/samza/task/TaskInstanceCollector.scala +++ b/samza-core/src/main/scala/org/apache/samza/task/TaskInstanceCollector.scala @@ -22,7 +22,7 @@ package org.apache.samza.task import org.apache.samza.system.OutgoingMessageEnvelope import org.apache.samza.system.SystemProducers import org.apache.samza.container.TaskInstanceMetrics -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging /** * TaskInstanceCollector is an implementation of MessageCollector that sends http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/util/Logging.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/util/Logging.scala b/samza-core/src/main/scala/org/apache/samza/util/Logging.scala new file mode 100644 index 0000000..250de1e --- /dev/null +++ b/samza-core/src/main/scala/org/apache/samza/util/Logging.scala @@ -0,0 +1,136 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.samza.util + +import org.slf4j.LoggerFactory +import org.slf4j.MDC + +trait Logging { + val loggerName = this.getClass.getName + lazy val logger = LoggerFactory.getLogger(loggerName) + + def trace(message: => Any): Unit = { + if (logger.isTraceEnabled()) { + logger.trace(message.toString) + } + } + + def trace(message: => Any, e: => Throwable) = { + if (logger.isTraceEnabled()) { + logger.trace(message, e) + } + } + + def debug(message: => Any): Unit = { + if (logger.isDebugEnabled()) { + logger.debug(message.toString) + } + } + + def debug(message: => Any, e: => Throwable) = { + if (logger.isDebugEnabled()) { + logger.debug(message, e) + } + } + + def info(message: => Any): Unit = { + if (logger.isInfoEnabled()) { + logger.info(message.toString) + } + } + + def info(message: => Any, e: => Throwable) = { + if (logger.isInfoEnabled()) { + logger.info(message, e) + } + } + + def warn(message: => Any): Unit = { + logger.warn(message.toString) + } + + def warn(message: => Any, e: => Throwable) = { + logger.warn(message, e) + } + + def error(message: => Any): Unit = { + logger.error(message.toString) + } + + def error(message: => Any, e: => Throwable) = { + logger.error(message, e) + } + + /** + * Put a diagnostic context value (the value parameter) + * and its key into the current thread's diagnostic + * context map. + * + * @param key non-null key + * @param value value for the key + * + * @throws IllegalArgumentException if key is null + */ + def putMDC(key: => String, value: => String) = { + MDC.put(key, value) + } + + /** + * Get the diagnostic context based on the key. + * + * @param key non-null key + * + * @throws IllegalArgumentException if key is null + */ + def getMDC(key: => String) = { + MDC.get(key) + } + + /** + * Remove the diagnostic context identified by the key. + * This method does not do anything if there is no previous + * value for this key + * + * @param key non-null key + * + * @throws IllegalArgumentException if key is null + */ + def removeMDC(key: => String) = { + MDC.remove(key) + } + + /** + * Clear all the entries in MDC + */ + def clearMDC = { + MDC.clear + } + + /** + * Converts any type into a String. If the message object is null, + * returns a "<null>" String. Otherwise, calls "toString" of the + * object. + */ + private implicit def _anytype2String(message: Any): String = + message match { + case null => "<null>" + case _ => message.toString + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/main/scala/org/apache/samza/util/Util.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/main/scala/org/apache/samza/util/Util.scala b/samza-core/src/main/scala/org/apache/samza/util/Util.scala index 16ad5a2..7d50352 100644 --- a/samza-core/src/main/scala/org/apache/samza/util/Util.scala +++ b/samza-core/src/main/scala/org/apache/samza/util/Util.scala @@ -19,7 +19,6 @@ package org.apache.samza.util -import grizzled.slf4j.Logging import java.io._ import java.lang.management.ManagementFactory import java.util http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-core/src/test/scala/org/apache/samza/metrics/TestJmxServer.scala ---------------------------------------------------------------------- diff --git a/samza-core/src/test/scala/org/apache/samza/metrics/TestJmxServer.scala b/samza-core/src/test/scala/org/apache/samza/metrics/TestJmxServer.scala index d425e86..f01117d 100644 --- a/samza-core/src/test/scala/org/apache/samza/metrics/TestJmxServer.scala +++ b/samza-core/src/test/scala/org/apache/samza/metrics/TestJmxServer.scala @@ -21,7 +21,7 @@ package org.apache.samza.metrics import org.junit.Assert._ import org.junit.Test -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import javax.management.remote.{JMXConnector, JMXConnectorFactory, JMXServiceURL} import java.io.IOException http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala index fff62e4..f3e954a 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManager.scala @@ -19,7 +19,7 @@ package org.apache.samza.checkpoint.kafka -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.nio.ByteBuffer import java.util import kafka.admin.AdminUtils http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManagerFactory.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManagerFactory.scala b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManagerFactory.scala index 087c6ad..977330f 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManagerFactory.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/checkpoint/kafka/KafkaCheckpointManagerFactory.scala @@ -19,7 +19,7 @@ package org.apache.samza.checkpoint.kafka -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.producer.Producer import kafka.utils.ZKStringSerializer import org.I0Itec.zkclient.ZkClient http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala b/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala index 90e4041..a34c3f2 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/config/RegExTopicGenerator.scala @@ -24,7 +24,7 @@ import kafka.utils.{ ZkUtils, ZKStringSerializer } import org.apache.samza.config.KafkaConfig.{ Config2Kafka, REGEX_RESOLVED_STREAMS } import org.apache.samza.SamzaException import collection.JavaConversions._ -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import scala.collection._ import org.apache.samza.config.TaskConfig.Config2Task import org.apache.samza.system.SystemStream http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala index f094fa0..7604193 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/BrokerProxy.scala @@ -26,7 +26,7 @@ import kafka.common.{NotLeaderForPartitionException, UnknownTopicOrPartitionExce import java.util.concurrent.{ConcurrentHashMap, CountDownLatch} import scala.collection.JavaConversions._ import kafka.message.MessageSet -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.nio.channels.ClosedByInterruptException import java.util.Map.Entry import scala.collection.mutable http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/GetOffset.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/GetOffset.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/GetOffset.scala index 26fc187..147aabc 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/GetOffset.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/GetOffset.scala @@ -25,7 +25,7 @@ import kafka.common.{ OffsetOutOfRangeException, ErrorMapping } import kafka.api._ import kafka.common.TopicAndPartition import kafka.api.PartitionOffsetRequestInfo -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.message.MessageAndOffset /** http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala index 662df99..5ac33ea 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemAdmin.scala @@ -33,7 +33,7 @@ import kafka.client.ClientUtils import kafka.common.TopicAndPartition import kafka.common.ErrorMapping import kafka.cluster.Broker -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.util.UUID import scala.collection.JavaConversions._ import org.apache.samza.system.SystemStreamMetadata.SystemStreamPartitionMetadata http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala index 2163d57..4918e3e 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemConsumer.scala @@ -20,7 +20,7 @@ package org.apache.samza.system.kafka import kafka.common.TopicAndPartition -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.message.MessageAndOffset import org.apache.samza.Partition import kafka.utils.Utils http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala index 3264cbd..a0e1ccb 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/KafkaSystemProducer.scala @@ -20,7 +20,7 @@ package org.apache.samza.system.kafka import scala.collection.mutable.ArrayBuffer -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.producer.KeyedMessage import kafka.producer.Producer import org.apache.samza.system.SystemProducer http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/TopicMetadataCache.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/TopicMetadataCache.scala b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/TopicMetadataCache.scala index 9553050..4a49d22 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/system/kafka/TopicMetadataCache.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/system/kafka/TopicMetadataCache.scala @@ -19,7 +19,7 @@ package org.apache.samza.system.kafka -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.api.TopicMetadata import kafka.common.ErrorMapping http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/main/scala/org/apache/samza/util/ClientUtilTopicMetadataStore.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/main/scala/org/apache/samza/util/ClientUtilTopicMetadataStore.scala b/samza-kafka/src/main/scala/org/apache/samza/util/ClientUtilTopicMetadataStore.scala index 0bc1867..1f415d2 100644 --- a/samza-kafka/src/main/scala/org/apache/samza/util/ClientUtilTopicMetadataStore.scala +++ b/samza-kafka/src/main/scala/org/apache/samza/util/ClientUtilTopicMetadataStore.scala @@ -22,7 +22,7 @@ package org.apache.samza.util import kafka.api.{ TopicMetadataResponse, TopicMetadata } import org.apache.samza.SamzaException import kafka.client.ClientUtils -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.common.ErrorMapping import kafka.cluster.Broker import java.util.concurrent.atomic.AtomicInteger http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestBrokerProxy.scala ---------------------------------------------------------------------- diff --git a/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestBrokerProxy.scala b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestBrokerProxy.scala index b4e7178..9143e6c 100644 --- a/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestBrokerProxy.scala +++ b/samza-kafka/src/test/scala/org/apache/samza/system/kafka/TestBrokerProxy.scala @@ -33,7 +33,7 @@ import kafka.common.TopicAndPartition import kafka.api.PartitionOffsetsResponse import java.nio.ByteBuffer import org.apache.samza.SamzaException -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import kafka.common.ErrorMapping import org.mockito.stubbing.Answer import org.mockito.invocation.InvocationOnMock http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kv-inmemory/src/main/scala/org/apache/samza/storage/kv/inmemory/InMemoryKeyValueStore.scala ---------------------------------------------------------------------- diff --git a/samza-kv-inmemory/src/main/scala/org/apache/samza/storage/kv/inmemory/InMemoryKeyValueStore.scala b/samza-kv-inmemory/src/main/scala/org/apache/samza/storage/kv/inmemory/InMemoryKeyValueStore.scala index 8e1493a..217333c 100644 --- a/samza-kv-inmemory/src/main/scala/org/apache/samza/storage/kv/inmemory/InMemoryKeyValueStore.scala +++ b/samza-kv-inmemory/src/main/scala/org/apache/samza/storage/kv/inmemory/InMemoryKeyValueStore.scala @@ -19,7 +19,7 @@ package org.apache.samza.storage.kv.inmemory import com.google.common.primitives.UnsignedBytes -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.storage.kv.{KeyValueStoreMetrics, KeyValueIterator, Entry, KeyValueStore} import java.util http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kv-leveldb/src/main/scala/org/apache/samza/storage/kv/LevelDbKeyValueStore.scala ---------------------------------------------------------------------- diff --git a/samza-kv-leveldb/src/main/scala/org/apache/samza/storage/kv/LevelDbKeyValueStore.scala b/samza-kv-leveldb/src/main/scala/org/apache/samza/storage/kv/LevelDbKeyValueStore.scala index 6652f6b..853de12 100644 --- a/samza-kv-leveldb/src/main/scala/org/apache/samza/storage/kv/LevelDbKeyValueStore.scala +++ b/samza-kv-leveldb/src/main/scala/org/apache/samza/storage/kv/LevelDbKeyValueStore.scala @@ -24,10 +24,9 @@ import org.fusesource.leveldbjni.JniDBFactory._ import java.io._ import org.apache.samza.config.Config import org.apache.samza.container.SamzaContainerContext -import grizzled.slf4j.{ Logger, Logging } +import org.apache.samza.util.Logging -object LevelDbKeyValueStore { - private lazy val logger = Logger(classOf[LevelDbKeyValueStore]) +object LevelDbKeyValueStore extends Logging { def options(storeConfig: Config, containerContext: SamzaContainerContext) = { val cacheSize = storeConfig.getLong("container.cache.size.bytes", 100 * 1024 * 1024L) @@ -43,7 +42,7 @@ object LevelDbKeyValueStore { case "snappy" => CompressionType.SNAPPY case "none" => CompressionType.NONE case _ => - logger.warn("Unknown leveldb.compression codec %s, defaulting to Snappy" format storeConfig.get("leveldb.compression", "snappy")) + warn("Unknown leveldb.compression codec %s, defaulting to Snappy" format storeConfig.get("leveldb.compression", "snappy")) CompressionType.SNAPPY }) options.createIfMissing(true) http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kv/src/main/scala/org/apache/samza/storage/kv/CachedStore.scala ---------------------------------------------------------------------- diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/CachedStore.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/CachedStore.scala index 5764093..7a5e510 100644 --- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/CachedStore.scala +++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/CachedStore.scala @@ -19,7 +19,7 @@ package org.apache.samza.storage.kv -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import scala.collection._ http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala ---------------------------------------------------------------------- diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala index c084144..3a23daf 100644 --- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala +++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/KeyValueStorageEngine.scala @@ -19,7 +19,7 @@ package org.apache.samza.storage.kv -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.storage.StorageEngine import org.apache.samza.system.IncomingMessageEnvelope http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kv/src/main/scala/org/apache/samza/storage/kv/LoggedStore.scala ---------------------------------------------------------------------- diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/LoggedStore.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/LoggedStore.scala index 4ad6312..26f4cd9 100644 --- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/LoggedStore.scala +++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/LoggedStore.scala @@ -19,7 +19,7 @@ package org.apache.samza.storage.kv -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.system.{OutgoingMessageEnvelope, SystemStreamPartition} import org.apache.samza.task.MessageCollector http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-kv/src/main/scala/org/apache/samza/storage/kv/SerializedKeyValueStore.scala ---------------------------------------------------------------------- diff --git a/samza-kv/src/main/scala/org/apache/samza/storage/kv/SerializedKeyValueStore.scala b/samza-kv/src/main/scala/org/apache/samza/storage/kv/SerializedKeyValueStore.scala index 51ee68f..531e8be 100644 --- a/samza-kv/src/main/scala/org/apache/samza/storage/kv/SerializedKeyValueStore.scala +++ b/samza-kv/src/main/scala/org/apache/samza/storage/kv/SerializedKeyValueStore.scala @@ -19,7 +19,7 @@ package org.apache.samza.storage.kv -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.serializers._ /** http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-test/src/main/scala/org/apache/samza/test/performance/TestKeyValuePerformance.scala ---------------------------------------------------------------------- diff --git a/samza-test/src/main/scala/org/apache/samza/test/performance/TestKeyValuePerformance.scala b/samza-test/src/main/scala/org/apache/samza/test/performance/TestKeyValuePerformance.scala index 7f8663d..8fd33f1 100644 --- a/samza-test/src/main/scala/org/apache/samza/test/performance/TestKeyValuePerformance.scala +++ b/samza-test/src/main/scala/org/apache/samza/test/performance/TestKeyValuePerformance.scala @@ -19,7 +19,7 @@ package org.apache.samza.test.performance -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.config.Config import org.apache.samza.config.StorageConfig._ import org.apache.samza.container.{ TaskName, SamzaContainerContext } http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-test/src/main/scala/org/apache/samza/test/performance/TestPerformanceTask.scala ---------------------------------------------------------------------- diff --git a/samza-test/src/main/scala/org/apache/samza/test/performance/TestPerformanceTask.scala b/samza-test/src/main/scala/org/apache/samza/test/performance/TestPerformanceTask.scala index 1661b43..45c76e8 100644 --- a/samza-test/src/main/scala/org/apache/samza/test/performance/TestPerformanceTask.scala +++ b/samza-test/src/main/scala/org/apache/samza/test/performance/TestPerformanceTask.scala @@ -27,7 +27,7 @@ import org.apache.samza.task.StreamTask import org.apache.samza.task.TaskCoordinator import org.apache.samza.task.TaskCoordinator.RequestScope import org.apache.samza.config.Config -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.system.SystemStream import org.apache.samza.system.OutgoingMessageEnvelope import org.apache.samza.util.Util http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-test/src/test/scala/org/apache/samza/test/performance/TestSamzaContainerPerformance.scala ---------------------------------------------------------------------- diff --git a/samza-test/src/test/scala/org/apache/samza/test/performance/TestSamzaContainerPerformance.scala b/samza-test/src/test/scala/org/apache/samza/test/performance/TestSamzaContainerPerformance.scala index 688e74e..1ff898d 100644 --- a/samza-test/src/test/scala/org/apache/samza/test/performance/TestSamzaContainerPerformance.scala +++ b/samza-test/src/test/scala/org/apache/samza/test/performance/TestSamzaContainerPerformance.scala @@ -31,7 +31,7 @@ import org.apache.samza.job.ShellCommandBuilder import org.apache.samza.task.InitableTask import org.apache.samza.task.TaskContext import org.apache.samza.config.Config -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging /** * A simple unit test that drives the TestPerformanceTask. This unit test can http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala index 2339960..a2b9279 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/ClientHelper.scala @@ -44,7 +44,7 @@ import org.apache.samza.job.ApplicationStatus.New import org.apache.samza.job.ApplicationStatus.Running import org.apache.samza.job.ApplicationStatus.SuccessfulFinish import org.apache.samza.job.ApplicationStatus.UnsuccessfulFinish -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import java.util.Collections object ClientHelper { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMaster.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMaster.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMaster.scala index c28c9a6..ab8278f 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMaster.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMaster.scala @@ -38,7 +38,7 @@ import org.apache.samza.metrics.JmxServer import org.apache.samza.metrics.MetricsRegistryMap import org.apache.samza.util.hadoop.HttpFileSystem -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging /** * When YARN executes an application master, it needs a bash command to http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterLifecycle.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterLifecycle.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterLifecycle.scala index 8cb9490..3d17632 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterLifecycle.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterLifecycle.scala @@ -24,7 +24,7 @@ import org.apache.hadoop.yarn.client.api.AMRMClient.ContainerRequest import org.apache.hadoop.yarn.client.api.async.AMRMClientAsync import org.apache.samza.SamzaException -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging /** * Responsible for managing the lifecycle of the application master. Mostly, http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterMetrics.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterMetrics.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterMetrics.scala index 28ed2c8..09b1237 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterMetrics.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterMetrics.scala @@ -29,7 +29,7 @@ import org.apache.samza.config.MetricsConfig.Config2Metrics import org.apache.samza.metrics.MetricsReporterFactory import org.apache.samza.util.Util import org.apache.samza.metrics.ReadableMetricsRegistry -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.SamzaException import java.util.Timer import java.util.TimerTask http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterService.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterService.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterService.scala index ab13d43..d1a73a7 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterService.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterService.scala @@ -19,7 +19,7 @@ package org.apache.samza.job.yarn -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.webapp._ import org.apache.samza.config.Config import org.apache.samza.metrics.ReadableMetricsRegistry http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterState.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterState.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterState.scala index d9dfbc6..471eff4 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterState.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterState.scala @@ -18,7 +18,7 @@ */ package org.apache.samza.job.yarn -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.hadoop.yarn.api.records.FinalApplicationStatus import org.apache.hadoop.yarn.api.records.ContainerId import java.util http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala index 0dd244d..ee08cfb 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/job/yarn/SamzaAppMasterTaskManager.scala @@ -46,7 +46,7 @@ import org.apache.samza.job.CommandBuilder import org.apache.samza.job.ShellCommandBuilder import org.apache.samza.util.Util -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging import org.apache.samza.container.TaskNamesToSystemStreamPartitions object SamzaAppMasterTaskManager { http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/a7b1282b/samza-yarn/src/main/scala/org/apache/samza/util/hadoop/HttpFileSystem.scala ---------------------------------------------------------------------- diff --git a/samza-yarn/src/main/scala/org/apache/samza/util/hadoop/HttpFileSystem.scala b/samza-yarn/src/main/scala/org/apache/samza/util/hadoop/HttpFileSystem.scala index 85813b1..7dff90e 100644 --- a/samza-yarn/src/main/scala/org/apache/samza/util/hadoop/HttpFileSystem.scala +++ b/samza-yarn/src/main/scala/org/apache/samza/util/hadoop/HttpFileSystem.scala @@ -34,7 +34,7 @@ import org.apache.hadoop.fs.FileSystem import org.apache.hadoop.fs.Path import org.apache.hadoop.util.Progressable -import grizzled.slf4j.Logging +import org.apache.samza.util.Logging class HttpFileSystem extends FileSystem with Logging { val DEFAULT_BLOCK_SIZE = 4 * 1024;
