From ac485ee326b1d75b1d83326998b84b8076c82c90 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Fri, 24 Jul 2020 12:20:43 +0200 Subject: [PATCH] Tag `spring.batch.job.active` metric with the job name Resolves #3750 --- .../java/org/springframework/batch/core/job/AbstractJob.java | 5 +++-- .../batch/sample/metrics/BatchMetricsTests.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java index 808f1c450..1115e4e98 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2019 the original author or authors. + * Copyright 2006-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -301,7 +301,8 @@ InitializingBean { } JobSynchronizationManager.register(execution); - LongTaskTimer longTaskTimer = BatchMetrics.createLongTaskTimer("job.active", "Active jobs"); + LongTaskTimer longTaskTimer = BatchMetrics.createLongTaskTimer("job.active", "Active jobs", + Tag.of("name", execution.getJobInstance().getJobName())); LongTaskTimer.Sample longTaskTimerSample = longTaskTimer.start(); Timer.Sample timerSample = BatchMetrics.createTimerSample(); try { diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java index efbdbcf50..d95566d7c 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/metrics/BatchMetricsTests.java @@ -162,6 +162,7 @@ public class BatchMetricsTests { try { Metrics.globalRegistry.get("spring.batch.job.active") + .tag("name", "job") .longTaskTimer(); } catch (Exception e) { fail("There should be a meter of type LONG_TASK_TIMER named spring.batch.job.active" +