chore: Add organizationId in MDC logs to ease debugging in multi-org setup (appsmithorg#40211)

Author: abhvsn

appsmith-server/src/main/java/com/appsmith/server/filters/MDCFilter.java

@@ -2,12 +2,13 @@
 
 import com.appsmith.server.domains.User;
 import com.appsmith.server.helpers.LogHelper;
+import com.appsmith.server.helpers.UserOrganizationHelper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.security.core.context.ReactiveSecurityContextHolder;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
 import org.springframework.web.server.WebFilterChain;
@@ -17,6 +18,7 @@
 import java.util.Map;
 
 import static com.appsmith.external.constants.MDCConstants.USER_EMAIL;
+import static com.appsmith.server.constants.ce.FieldNameCE.ORGANIZATION_ID;
 import static java.util.stream.Collectors.toMap;
 
 /**
@@ -27,6 +29,7 @@
 @Slf4j
 public class MDCFilter implements WebFilter {
 
+    private final UserOrganizationHelper userOrganizationHelper;
     private static final String MDC_HEADER_PREFIX = "X-MDC-";
 
     /**
@@ -38,23 +41,33 @@ public class MDCFilter implements WebFilter {
 
     public static final String REQUEST_ID_HEADER = "X-Request-Id";
 
+    public MDCFilter(UserOrganizationHelper userOrganizationHelper) {
+        this.userOrganizationHelper = userOrganizationHelper;
+    }
+
     @Override
     public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
         try {
             return ReactiveSecurityContextHolder.getContext()
                     .map(ctx -> ctx.getAuthentication().getPrincipal())
-                    .flatMap(principal -> {
+                    .zipWith(userOrganizationHelper
+                            .getCurrentUserOrganizationId()
+                            .defaultIfEmpty(""))
+                    .flatMap(tuple2 -> {
+                        final Object principal = tuple2.getT1();
+                        final String organizationId = tuple2.getT2();
                         final User user = principal instanceof User ? (User) principal : null;
                         return chain.filter(exchange)
-                                .contextWrite(ctx -> addRequestHeadersToContext(exchange.getRequest(), ctx, user));
+                                .contextWrite(ctx ->
+                                        addRequestHeadersToContext(exchange.getRequest(), ctx, user, organizationId));
                     });
         } finally {
             MDC.clear();
         }
     }
 
     private Context addRequestHeadersToContext(
-            final ServerHttpRequest request, final Context context, final User user) {
+            final ServerHttpRequest request, final Context context, final User user, final String organizationId) {
         final Map<String, String> contextMap = request.getHeaders().toSingleValueMap().entrySet().stream()
                 .filter(x -> x.getKey().startsWith(MDC_HEADER_PREFIX))
                 .collect(toMap(v -> v.getKey().substring((MDC_HEADER_PREFIX.length())), Map.Entry::getValue));
@@ -63,6 +76,10 @@ private Context addRequestHeadersToContext(
             contextMap.put(USER_EMAIL, user.getEmail());
         }
 
+        if (StringUtils.hasLength(organizationId)) {
+            contextMap.put(ORGANIZATION_ID, organizationId);
+        }
+
         final String internalRequestId = request.getHeaders().getFirst(INTERNAL_REQUEST_ID_HEADER);
         contextMap.put(INTERNAL_REQUEST_ID_HEADER, internalRequestId);
 

appsmith-server/src/main/resources/application-ce.properties

@@ -32,7 +32,7 @@ appsmith.codec.max-in-memory-size=${APPSMITH_CODEC_SIZE:150}
 logging.level.root=info
 logging.level.com.appsmith=debug
 logging.level.com.external.plugins=debug
-logging.pattern.console=[%d{ISO8601, UTC}] [%t] requestId=%X{X-Appsmith-Request-Id} userEmail=%X{userEmail} traceId=%X{traceId} spanId=%X{spanId} - %m%n
+logging.pattern.console=[%d{ISO8601, UTC}] [%t] requestId=%X{X-Appsmith-Request-Id} userEmail=%X{userEmail} orgId=%X{organizationId} traceId=%X{traceId} spanId=%X{spanId} - %m%n
 
 #Spring security
 spring.security.oauth2.client.registration.google.client-id=${APPSMITH_OAUTH2_GOOGLE_CLIENT_ID:missing_value_sentinel}