Merge pull request #36106 from appsmithorg/cp/20240904-1

app/server/appsmith-git/src/main/java/com/appsmith/git/files/FileUtilsCEImpl.java

@@ -23,7 +23,6 @@
 import org.json.JSONObject;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.FileSystemUtils;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
@@ -279,12 +278,16 @@ protected Set<String> updateEntitiesInRepo(ApplicationGitReference applicationGi
 
         fileOperations.scanAndDeleteDirectoryForDeletedResources(validPages, baseRepo.resolve(PAGE_DIRECTORY));
 
-        // Save JS Libs if there's at least one change
-        if (modifiedResources != null
-                && (modifiedResources.isAllModified()
-                        || !CollectionUtils.isEmpty(
-                                modifiedResources.getModifiedResourceMap().get(CUSTOM_JS_LIB_LIST)))) {
+        // Earlier this condition included that modified resource not be null, and
+        // it should either have allModified flag turned as true or CUSTOM_JS_LIB_LIST resource map is not empty
+        // Save JS Libs if there's at least one change.
 
+        // What are the possible caveats of making this change?
+        // Since each resource in the entry needs to be present in the Modified resource map to be written
+        // There won't be any differences in writing files.
+        // In terms of performance, we would need to access the customJSLib directory every time to
+        // compare with the valid js libs.
+        if (modifiedResources != null) {
             Path jsLibDirectory = baseRepo.resolve(JS_LIB_DIRECTORY);
             Set<Map.Entry<String, Object>> jsLibEntries =
                     applicationGitReference.getJsLibraries().entrySet();

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/Datasource.java

@@ -54,7 +54,7 @@ public class Datasource extends GitSyncedDomain {
     String templateName;
 
     // This is only kept public for embedded datasource
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     DatasourceConfiguration datasourceConfiguration;
 
     @Transient

app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/DatasourceConfiguration.java

@@ -1,6 +1,7 @@
 package com.appsmith.external.models;
 
 import com.appsmith.external.views.FromRequest;
+import com.appsmith.external.views.Git;
 import com.appsmith.external.views.Views;
 import com.fasterxml.jackson.annotation.JsonView;
 import lombok.AllArgsConstructor;
@@ -37,17 +38,17 @@ public class DatasourceConfiguration implements AppsmithDomain {
 
     Boolean sshProxyEnabled;
 
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     List<Property> properties;
 
     // For REST API.
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     String url;
 
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     List<Property> headers;
 
-    @JsonView({Views.Public.class, FromRequest.class})
+    @JsonView({Views.Public.class, FromRequest.class, Git.class})
     List<Property> queryParameters;
 
     public boolean isSshProxyEnabled() {

app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/CommonConfig.java

@@ -67,6 +67,9 @@ public class CommonConfig {
     @Value("${appsmith.micrometer.tracing.detail.enabled:false}")
     private boolean tracingDetail;
 
+    @Value("${appsmith.micrometer.metrics.detail.enabled:false}")
+    private boolean metricsDetail;
+
     private List<String> allowedDomains;
 
     private String mongoDBVersion;

app/server/appsmith-server/src/main/java/com/appsmith/server/configurations/ReactorNettyConfiguration.java

@@ -0,0 +1,22 @@
+package com.appsmith.server.configurations;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.stereotype.Component;
+
+import java.util.function.Function;
+
+@RequiredArgsConstructor
+@Component
+public class ReactorNettyConfiguration implements WebServerFactoryCustomizer<NettyReactiveWebServerFactory> {
+
+    private final CommonConfig commonConfig;
+
+    @Override
+    public void customize(NettyReactiveWebServerFactory factory) {
+        if (commonConfig.isMetricsDetail()) {
+            factory.addServerCustomizers(httpServer -> httpServer.metrics(true, Function.identity()));
+        }
+    }
+}

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

@@ -123,6 +123,7 @@ appsmith.newrelic.micrometer.metrics.application.name=${APPSMITH_NEWRELIC_MICROM
 spring.application.name=${OTEL_SERVICE_NAME:appsmith-anonymous}
 appsmith.micrometer.metrics.enabled=${APPSMITH_MICROMETER_METRICS_ENABLED:false}
 appsmith.micrometer.tracing.detail.enabled=${APPSMITH_ENABLE_TRACING_DETAIL:false}
+appsmith.micrometer.metrics.detail.enabled=${APPSMITH_ENABLE_METRICS_DETAIL:false}
 
 springdoc.api-docs.path=/v3/docs
 springdoc.swagger-ui.path=/v3/swagger