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

Revert "chore: Improve logging format for debugging OOM issues" (#29368)

Browse Source 
Reverts appsmithorg/appsmith#29330
This commit is contained in:
Trisha Anand 2023-12-06 11:43:31 +05:30 committed by GitHub
parent 77575fdae0
commit 907a1d4a1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/server/appsmith-server/pom.xml
View File

@ -41,12 +41,6 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-tools</artifactId>
<version>3.6.0</version>
<classifier>original</classifier>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>

13
app/server/appsmith-server/src/main/java/com/appsmith/server/ServerApplication.java
View File

@ -4,7 +4,6 @@ import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.aop.ObservedAspect;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.boot.Banner;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -12,26 +11,14 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.scheduling.annotation.EnableScheduling;
import reactor.tools.agent.ReactorDebugAgent;
import static com.appsmith.server.constants.EnvVariables.APPSMITH_NEW_RELIC_ACCOUNT_ENABLE;
import static com.appsmith.server.constants.EnvVariables.APPSMITH_VERBOSE_LOGGING_ENABLED;
@SpringBootApplication
@EnableScheduling
@Slf4j
public class ServerApplication {
public static void main(String[] args) {
String loggingEnabled = System.getenv(String.valueOf(APPSMITH_VERBOSE_LOGGING_ENABLED));
if ("true".equalsIgnoreCase(loggingEnabled)) {
log.info("Enabling Reactor Debug Agent enabled");
ReactorDebugAgent.init();
} else {
log.info("Reactor Debug Agent not enabled");
}
new SpringApplicationBuilder(ServerApplication.class)
.bannerMode(Banner.Mode.OFF)
.run(args);

55
app/server/appsmith-server/src/main/java/com/appsmith/server/performancelogging/PerformanceLoggingHandler.java
View File

@ -1,6 +1,5 @@
package com.appsmith.server.performancelogging;
import io.micrometer.common.KeyValue;
import io.micrometer.observation.Observation;
import io.micrometer.observation.Observation.Context;
import io.micrometer.observation.ObservationHandler;
@ -8,44 +7,13 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
@Component
@Slf4j
@ConditionalOnExpression("${logging.verbose.enabled}")
class PerformanceLoggingHandler implements ObservationHandler<Observation.Context> {
@Override
public void onStart(Context context) {
if (needsLogStatement(context)) {
context.put("executionTime", System.currentTimeMillis());
KeyValue url = context.getHighCardinalityKeyValue("http.url");
String urlName = url == null ? "null" : url.getValue();
log.info("Execution Started : {}, Context : {}, {}", context.getName(), urlName, memoryFootprint());
}
}
private String memoryFootprint() {
MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
return String.format(
"Initial memory: %.2f GB, Used heap memory: %.2f GB, Max heap memory: %.2f GB, Committed memory: %.2f GB",
(double) memoryMXBean.getHeapMemoryUsage().getInit() / 1073741824,
(double) memoryMXBean.getHeapMemoryUsage().getUsed() / 1073741824,
(double) memoryMXBean.getHeapMemoryUsage().getMax() / 1073741824,
(double) memoryMXBean.getHeapMemoryUsage().getCommitted() / 1073741824);
}
private Boolean needsLogStatement(Context context) {
String name = context.getName();
if (name.equals("spring.security.authorizations")
|| name.equals("spring.security.filterchains")
|| name.equals("spring.security.http.secured.requests")) {
return false;
} else {
return true;
}
context.put("executionTime", System.currentTimeMillis());
}
@Override
@ -55,20 +23,13 @@ class PerformanceLoggingHandler implements ObservationHandler<Observation.Contex
@Override
public void onStop(Context context) {
if (needsLogStatement(context)) {
long startTime = context.getOrDefault("executionTime", 0L);
long executionTime = System.currentTimeMillis() - startTime;
KeyValue url = context.getHighCardinalityKeyValue("http.url");
String urlName = url == null ? "null" : url.getValue();
log.info(
"Execution Complete: {} | Total Time Taken: {} ms | Context: {}, {}",
context.getName(),
executionTime,
urlName,
memoryFootprint());
}
long startTime = context.getOrDefault("executionTime", 0L);
long executionTime = System.currentTimeMillis() - startTime;
log.info(
"Execution Complete: {} | Total Time Taken: {} ms | Context: {}",
context.getName(),
executionTime,
context.toString());
}
@Override

4
deploy/docker/fs/opt/appsmith/templates/supervisord/application_process/backend.conf
View File

@ -10,7 +10,7 @@ stdout_logfile=/appsmith-stacks/logs/%(program_name)s/%(program_name)s-%(ENV_HOS
redirect_stderr=true
stdout_logfile_maxbytes=10MB
stderr_logfile_maxbytes=10MB
stdout_logfile_backups=10
stderr_logfile_backups=10
stdout_logfile_backups=2
stderr_logfile_backups=2
stdout_events_enabled=true
stderr_events_enabled=true