Skip to content

chore: Added spans to health check #37980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohanarpit merged 1 commit into from
Dec 5, 2024
Merged

chore: Added spans to health check #37980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...r/appsmith-interfaces/src/main/java/com/appsmith/external/constants/spans/HealthSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.appsmith.external.constants.spans;

import com.appsmith.external.constants.spans.ce.HealthSpanCE;

public class HealthSpan extends HealthSpanCE {}
10 changes: 10 additions & 0 deletions ...smith-interfaces/src/main/java/com/appsmith/external/constants/spans/ce/HealthSpanCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.appsmith.external.constants.spans.ce;

import com.appsmith.external.constants.spans.BaseSpan;

public class HealthSpanCE {

public static final String HEALTH = "health.";
public static final String MONGO_HEALTH = BaseSpan.APPSMITH_SPAN_PREFIX + HEALTH + "mongo";
public static final String REDIS_HEALTH = BaseSpan.APPSMITH_SPAN_PREFIX + HEALTH + "redis";
}
6 changes: 4 additions & 2 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/services/HealthCheckServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.appsmith.server.services;

import com.appsmith.server.services.ce.HealthCheckServiceCEImpl;
import io.micrometer.observation.ObservationRegistry;
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
import org.springframework.stereotype.Component;
Expand All @@ -9,7 +10,8 @@
public class HealthCheckServiceImpl extends HealthCheckServiceCEImpl implements HealthCheckService {
public HealthCheckServiceImpl(
ReactiveRedisConnectionFactory reactiveRedisConnectionFactory,
ReactiveMongoTemplate reactiveMongoTemplate) {
super(reactiveRedisConnectionFactory, reactiveMongoTemplate);
ReactiveMongoTemplate reactiveMongoTemplate,
ObservationRegistry observationRegistry) {
super(reactiveRedisConnectionFactory, reactiveMongoTemplate, observationRegistry);
}
}
18 changes: 15 additions & 3 deletions ...psmith-server/src/main/java/com/appsmith/server/services/ce/HealthCheckServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,37 @@

import com.appsmith.server.exceptions.AppsmithError;
import com.appsmith.server.exceptions.AppsmithException;
import io.micrometer.observation.ObservationRegistry;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.actuate.data.mongo.MongoReactiveHealthIndicator;
import org.springframework.boot.actuate.data.redis.RedisReactiveHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
import reactor.core.observability.micrometer.Micrometer;
import reactor.core.publisher.Mono;

import java.time.Duration;
import java.util.concurrent.TimeoutException;
import java.util.function.Function;

import static com.appsmith.external.constants.spans.ce.HealthSpanCE.MONGO_HEALTH;
import static com.appsmith.external.constants.spans.ce.HealthSpanCE.REDIS_HEALTH;

@Slf4j
public class HealthCheckServiceCEImpl implements HealthCheckServiceCE {

private final ReactiveRedisConnectionFactory reactiveRedisConnectionFactory;
private final ReactiveMongoTemplate reactiveMongoTemplate;
private final ObservationRegistry observationRegistry;

public HealthCheckServiceCEImpl(
ReactiveRedisConnectionFactory reactiveRedisConnectionFactory,
ReactiveMongoTemplate reactiveMongoTemplate) {
ReactiveMongoTemplate reactiveMongoTemplate,
ObservationRegistry observationRegistry) {
this.reactiveRedisConnectionFactory = reactiveRedisConnectionFactory;
this.reactiveMongoTemplate = reactiveMongoTemplate;
this.observationRegistry = observationRegistry;
}

@Override
Expand All @@ -42,7 +50,9 @@ private Mono<Health> getRedisHealth() {
return redisReactiveHealthIndicator
.health()
.timeout(Duration.ofSeconds(3))
.onErrorMap(TimeoutException.class, healthTimeout);
.onErrorMap(TimeoutException.class, healthTimeout)
.name(REDIS_HEALTH)
.tap(Micrometer.observation(observationRegistry));
}

private Mono<Health> getMongoHealth() {
Expand All @@ -55,6 +65,8 @@ private Mono<Health> getMongoHealth() {
return mongoReactiveHealthIndicator
.health()
.timeout(Duration.ofSeconds(1))
.onErrorMap(TimeoutException.class, healthTimeout);
.onErrorMap(TimeoutException.class, healthTimeout)
.name(MONGO_HEALTH)
.tap(Micrometer.observation(observationRegistry));
}
}