From dcf360a7d7f993ca0bc9ae8402a32e18fce30e6e Mon Sep 17 00:00:00 2001 From: a10zn8 Date: Wed, 29 Mar 2023 21:19:30 +0400 Subject: [PATCH] add empty tag reactor_scheduler_id for metric correctness (#190) --- src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt | 4 +++- .../io/emeraldpay/dshackle/config/context/SchedulersConfig.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt b/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt index 3d8b6d01..49d24c89 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/GrpcServer.kt @@ -26,6 +26,7 @@ import io.grpc.ServerInterceptor import io.grpc.netty.NettyServerBuilder import io.grpc.protobuf.services.ProtoReflectionService import io.micrometer.core.instrument.Metrics +import io.micrometer.core.instrument.Tag import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics import org.slf4j.LoggerFactory import org.springframework.scheduling.concurrent.CustomizableThreadFactory @@ -95,7 +96,8 @@ open class GrpcServer( ExecutorServiceMetrics.monitor( Metrics.globalRegistry, pool, - "fixed-grpc-executor" + "fixed-grpc-executor", + Tag.of("reactor_scheduler_id", "_") ) else pool diff --git a/src/main/kotlin/io/emeraldpay/dshackle/config/context/SchedulersConfig.kt b/src/main/kotlin/io/emeraldpay/dshackle/config/context/SchedulersConfig.kt index b357f6e3..47da250f 100644 --- a/src/main/kotlin/io/emeraldpay/dshackle/config/context/SchedulersConfig.kt +++ b/src/main/kotlin/io/emeraldpay/dshackle/config/context/SchedulersConfig.kt @@ -2,6 +2,7 @@ package io.emeraldpay.dshackle.config.context import io.emeraldpay.dshackle.config.MonitoringConfig import io.micrometer.core.instrument.Metrics +import io.micrometer.core.instrument.Tag import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration @@ -45,7 +46,8 @@ open class SchedulersConfig { ExecutorServiceMetrics.monitor( Metrics.globalRegistry, pool, - name + name, + Tag.of("reactor_scheduler_id", "_") ) else pool