This is an automated email from the ASF dual-hosted git repository. udo pushed a commit to branch feature/Micrometer in repository https://gitbox.apache.org/repos/asf/geode.git
commit ce9658d32615989a2618bec0750b1554c9b185e5 Author: Udo Kohlmeyer <[email protected]> AuthorDate: Tue Nov 27 17:30:23 2018 -0800 Updating Kotlin to 1.3.10 --- geode-micrometer-stats/build.gradle.kts | 4 ++-- .../micrometer/impl/MicrometerStatisticsManager.kt | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/geode-micrometer-stats/build.gradle.kts b/geode-micrometer-stats/build.gradle.kts index be9d744..7f1cd5a 100644 --- a/geode-micrometer-stats/build.gradle.kts +++ b/geode-micrometer-stats/build.gradle.kts @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.2.70" + kotlin("jvm") version "1.3.10" } group = "org.apache.geode" @@ -37,7 +37,7 @@ dependencies { compile(group = "io.micrometer", name = "micrometer-registry-influx", version = "1.0.6") compile(group = "io.micrometer", name = "micrometer-registry-jmx", version = "1.0.6") compile(group = "io.micrometer", name = "micrometer-registry-prometheus", version = "1.0.6") - compile(group = "test", name = "micrometer-stats", version = "1.0-SNAPSHOT") +// compile(group = "test", name = "micrometer-stats", version = "1.0-SNAPSHOT") } diff --git a/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/internal/micrometer/impl/MicrometerStatisticsManager.kt b/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/internal/micrometer/impl/MicrometerStatisticsManager.kt index 9db85a0..f62bda9 100644 --- a/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/internal/micrometer/impl/MicrometerStatisticsManager.kt +++ b/geode-micrometer-stats/src/main/kotlin/org/apache/geode/statistics/internal/micrometer/impl/MicrometerStatisticsManager.kt @@ -31,13 +31,13 @@ import io.micrometer.jmx.JmxConfig import io.micrometer.jmx.JmxMeterRegistry import io.micrometer.prometheus.PrometheusConfig import io.micrometer.prometheus.PrometheusMeterRegistry -import io.pivotal.gemfire.micrometer.binder.LoadAvgMetrics -import io.pivotal.gemfire.micrometer.binder.MemInfoMetrics -import io.pivotal.gemfire.micrometer.binder.StatMetrics -import io.pivotal.gemfire.micrometer.procOS.ProcOSLoadAvg -import io.pivotal.gemfire.micrometer.procOS.ProcOSMemInfo -import io.pivotal.gemfire.micrometer.procOS.ProcOSReaderFactory -import io.pivotal.gemfire.micrometer.procOS.ProcOSStat +//import io.pivotal.gemfire.micrometer.binder.LoadAvgMetrics +//import io.pivotal.gemfire.micrometer.binder.MemInfoMetrics +//import io.pivotal.gemfire.micrometer.binder.StatMetrics +//import io.pivotal.gemfire.micrometer.procOS.ProcOSLoadAvg +//import io.pivotal.gemfire.micrometer.procOS.ProcOSMemInfo +//import io.pivotal.gemfire.micrometer.procOS.ProcOSReaderFactory +//import io.pivotal.gemfire.micrometer.procOS.ProcOSStat import org.apache.geode.statistics.internal.micrometer.StatisticsManager import org.apache.geode.statistics.internal.micrometer.StatisticsMeterGroup import java.io.IOException @@ -64,10 +64,10 @@ object MicrometerStatisticsManager : StatisticsManager { FileDescriptorMetrics().bindTo(meterRegistry) ProcessorMetrics().bindTo(meterRegistry) UptimeMetrics().bindTo(meterRegistry) - val procOSReaderFactory = ProcOSReaderFactory() - LoadAvgMetrics(procOSLoadAvg = ProcOSLoadAvg(procOSReaderFactory.getInstance(LoadAvgMetrics.LOAD_AVG))).bindTo(meterRegistry) - MemInfoMetrics(procOSMemInfo = ProcOSMemInfo(procOSReaderFactory.getInstance(MemInfoMetrics.MEM_INFO))).bindTo(meterRegistry) - StatMetrics(procOSStat = ProcOSStat(procOSReaderFactory.getInstance(StatMetrics.STAT))).bindTo(meterRegistry) +// val procOSReaderFactory = ProcOSReaderFactory() +// LoadAvgMetrics(procOSLoadAvg = ProcOSLoadAvg(procOSReaderFactory.getInstance(LoadAvgMetrics.LOAD_AVG))).bindTo(meterRegistry) +// MemInfoMetrics(procOSMemInfo = ProcOSMemInfo(procOSReaderFactory.getInstance(MemInfoMetrics.MEM_INFO))).bindTo(meterRegistry) +// StatMetrics(procOSStat = ProcOSStat(procOSReaderFactory.getInstance(StatMetrics.STAT))).bindTo(meterRegistry) } override fun registerMeterRegistry(meterRegistry: MeterRegistry) {
