Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Added trace and span info to context (#32399)

Browse Source
This commit is contained in:
Nidhi 2024-04-04 12:02:06 +05:30 committed by GitHub
parent 57b62797ff
commit 9571ff0f7b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/MDCConfig.java
View File

@ -2,6 +2,8 @@ package com.appsmith.server.configurations;
import com.appsmith.server.filters.MDCFilter;
import com.appsmith.server.helpers.LogHelper;
import io.micrometer.observation.Observation;
import io.micrometer.tracing.handler.TracingObservationHandler;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import org.reactivestreams.Subscription;
@ -13,11 +15,15 @@ import reactor.core.publisher.Operators;
import reactor.util.context.Context;
import java.util.Map;
import java.util.Optional;
@Configuration
public class MDCConfig {
private static final String MDC_CONTEXT_REACTOR_KEY = "MDCConfig";
private static final String OBSERVATION = "micrometer.observation";
private static final String TRACE_ID = "traceId";
private static final String SPAN_ID = "spanId";
@PostConstruct
void contextOperatorHook() {
@ -78,6 +84,15 @@ public class MDCConfig {
Map<String, String> map = context.get(LogHelper.CONTEXT_MAP);
map.put(MDCFilter.THREAD, Thread.currentThread().getName());
Optional<Observation> observationOptional = context.getOrEmpty(OBSERVATION);
observationOptional.ifPresent(observation -> {
TracingObservationHandler.TracingContext tracingContext =
observation.getContext().get(TracingObservationHandler.TracingContext.class);
if (tracingContext != null && tracingContext.getSpan() != null) {
map.put(TRACE_ID, tracingContext.getSpan().context().traceId());
map.put(SPAN_ID, tracingContext.getSpan().context().spanId());
}
});
MDC.setContextMap(map);
} else {
MDC.clear();