Skip to content

fix: logger-not-working-in-plugins #36231

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nerbos merged 7 commits into from
Sep 17, 2024
Merged

fix: logger-not-working-in-plugins #36231

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d9a696a
fix:logger-not-working-in-plugins
AnnaHariprasad5123 Sep 10, 2024
262762a
fix: changed-sout-to-logs
AnnaHariprasad5123 Sep 10, 2024
8fa09e3
fix: logged-exceptions
AnnaHariprasad5123 Sep 10, 2024
e2a8dea
replace-plus-to-comma
AnnaHariprasad5123 Sep 10, 2024
55f428c
replaced-sysOutFn-in-all-plugins
AnnaHariprasad5123 Sep 11, 2024
78483cc
changed-all-logs
AnnaHariprasad5123 Sep 16, 2024
2bdf166
fixed-logging-issue
AnnaHariprasad5123 Sep 17, 2024
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
8 changes: 0 additions & 8 deletions app/server/appsmith-interfaces/src/main/java/com/appsmith/external/helpers/Stopwatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ public void stopAndLogTimeInMillis() {
* This is a temporary function created to log stopwatch timer within the plugin package
* Due to this bug https://github.com/appsmithorg/appsmith/issues/36073 logging is not working in the plugin package
*/
public void stopAndLogTimeInMillisWithSysOut() {
if (!this.watch.isStopped()) {
this.watch.stop();
}
System.out.println(String.format(
"Execute time: %s, Time elapsed: %dms", this.flow, this.watch.getTime(TimeUnit.MILLISECONDS)));
}

public void stopTimer() {
if (!this.watch.isStopped()) {
this.watch.stop();
Expand Down
43 changes: 21 additions & 22 deletions ...er/appsmith-plugins/amazons3Plugin/src/main/java/com/external/plugins/AmazonS3Plugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ public Mono<ActionExecutionResult> executeParameterized(

String printMessage =
Thread.currentThread().getName() + ": executeParameterized() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
Comment thread
NilanshBansal marked this conversation as resolved.
Outdated
final Map<String, Object> formData = actionConfiguration.getFormData();
List<Map.Entry<String, String>> parameters = new ArrayList<>();

Expand Down Expand Up @@ -468,7 +468,7 @@ private Mono<ActionExecutionResult> executeCommon(
ActionConfiguration actionConfiguration) {

String printMessage = Thread.currentThread().getName() + ": executeCommon() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
Comment thread
NilanshBansal marked this conversation as resolved.
Outdated
final String[] query = new String[1];
Map<String, Object> requestProperties = new HashMap<>();
List<RequestParamDTO> requestParams = new ArrayList<>();
Expand Down Expand Up @@ -544,7 +544,7 @@ private Mono<ActionExecutionResult> executeCommon(
Object actionResult;
switch (s3Action) {
case LIST:
System.out.println(
log.debug(
Thread.currentThread().getName() + ": LIST action called for AmazonS3 plugin.");
String prefix = getDataValueSafelyFromFormData(formData, LIST_PREFIX, STRING_TYPE, "");
requestParams.add(new RequestParamDTO(LIST_PREFIX, prefix, null, null, null));
Expand Down Expand Up @@ -644,7 +644,7 @@ private Mono<ActionExecutionResult> executeCommon(

break;
case UPLOAD_FILE_FROM_BODY: {
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": UPLOAD_FILE_FROM_BODY action called for AmazonS3 plugin.");
requestParams.add(
new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
Expand Down Expand Up @@ -697,7 +697,7 @@ private Mono<ActionExecutionResult> executeCommon(
break;
}
case UPLOAD_MULTIPLE_FILES_FROM_BODY: {
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": UPLOAD_MULTIPLE_FILES_FROM_BODY action called for AmazonS3 plugin.");
requestParams.add(
new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
Expand Down Expand Up @@ -751,7 +751,7 @@ private Mono<ActionExecutionResult> executeCommon(
break;
}
case READ_FILE:
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": READ_FILE action called for AmazonS3 plugin.");
requestParams.add(
new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
Expand All @@ -770,7 +770,7 @@ private Mono<ActionExecutionResult> executeCommon(
actionResult = Map.of("fileData", result);
break;
case DELETE_FILE:
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": DELETE_FILE action called for AmazonS3 plugin.");
requestParams.add(
new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
Expand All @@ -783,7 +783,7 @@ private Mono<ActionExecutionResult> executeCommon(
actionResult = Map.of("status", "File deleted successfully");
break;
case DELETE_MULTIPLE_FILES:
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": DELETE_MULTIPLE_FILES action called for AmazonS3 plugin.");
requestParams.add(
new RequestParamDTO(ACTION_CONFIGURATION_PATH, path, null, null, null));
Expand Down Expand Up @@ -823,7 +823,7 @@ private Mono<ActionExecutionResult> executeCommon(
ActionExecutionResult actionExecutionResult = new ActionExecutionResult();
actionExecutionResult.setBody(result);
actionExecutionResult.setIsExecutionSuccess(true);
System.out.println("In the S3 Plugin, got action execution result");
log.debug("In the S3 Plugin, got action execution result");
return Mono.just(actionExecutionResult);
})
.onErrorResume(e -> {
Expand All @@ -842,7 +842,7 @@ private Mono<ActionExecutionResult> executeCommon(
})
// Now set the request in the result to be returned to the server
.map(actionExecutionResult -> {
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": Setting the actionExecutionResult for AmazonS3 plugin.");
ActionExecutionRequest actionExecutionRequest = new ActionExecutionRequest();
actionExecutionRequest.setQuery(query[0]);
Expand Down Expand Up @@ -893,7 +893,7 @@ private DeleteObjectsRequest getDeleteObjectsRequest(String bucketName, List<Str
@Override
public Mono<AmazonS3> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
String printMessage = Thread.currentThread().getName() + ": datasourceCreate() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
Comment thread
NilanshBansal marked this conversation as resolved.
Outdated
try {
Class.forName(S3_DRIVER);
} catch (ClassNotFoundException e) {
Expand Down Expand Up @@ -923,15 +923,14 @@ public Mono<AmazonS3> datasourceCreate(DatasourceConfiguration datasourceConfigu
public void datasourceDestroy(AmazonS3 connection) {
String printMessage =
Thread.currentThread().getName() + ": datasourceDestroy() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
Comment thread
NilanshBansal marked this conversation as resolved.
Outdated
if (connection != null) {
Mono.fromCallable(() -> {
connection.shutdown();
return connection;
})
.onErrorResume(exception -> {
System.out.println("Error closing S3 connection.");
exception.printStackTrace();
log.debug("Error closing S3 connection.", exception);
Comment thread
NilanshBansal marked this conversation as resolved.
Outdated
return Mono.empty();
})
.subscribeOn(scheduler)
Expand All @@ -943,7 +942,7 @@ public void datasourceDestroy(AmazonS3 connection) {
public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
String printMessage =
Thread.currentThread().getName() + ": validateDatasource() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
Set<String> invalids = new HashSet<>();

if (datasourceConfiguration == null || datasourceConfiguration.getAuthentication() == null) {
Expand Down Expand Up @@ -1006,7 +1005,7 @@ public Set<String> validateDatasource(DatasourceConfiguration datasourceConfigur
@Override
public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
String printMessage = Thread.currentThread().getName() + ": testDatasource() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
if (datasourceConfiguration == null) {
return Mono.just(new DatasourceTestResult(
S3ErrorMessages.DS_AT_LEAST_ONE_MANDATORY_PARAMETER_MISSING_ERROR_MSG));
Expand All @@ -1029,7 +1028,7 @@ public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasou
* object with wrong credentials does not throw any exception.
* - Hence, adding a listBuckets() method call to test the connection.
*/
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": listBuckets() called for AmazonS3 plugin.");
connection.listBuckets();
return new DatasourceTestResult();
Expand Down Expand Up @@ -1068,7 +1067,7 @@ private Mono<DatasourceTestResult> testGoogleCloudStorage(DatasourceConfiguratio
return datasourceCreate(datasourceConfiguration)
.flatMap(connection -> Mono.fromCallable(() -> {
connection.listObjects(defaultBucket);
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": connection.listObjects() called for AmazonS3 plugin.");
return new DatasourceTestResult();
})
Expand Down Expand Up @@ -1096,11 +1095,11 @@ public Mono<DatasourceStructure> getStructure(
AmazonS3 connection, DatasourceConfiguration datasourceConfiguration) {

String printMessage = Thread.currentThread().getName() + ": getStructure() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
return Mono.fromSupplier(() -> {
List<DatasourceStructure.Table> tableList;
try {
System.out.println(Thread.currentThread().getName()
log.debug(Thread.currentThread().getName()
+ ": connection.listBuckets() called for AmazonS3 plugin.");
tableList = connection.listBuckets().stream()
/* Get name of each bucket */
Expand Down Expand Up @@ -1152,7 +1151,7 @@ public Object substituteValueInInput(
Param param = (Param) args[0];
String printMessage =
Thread.currentThread().getName() + ": substituteValueInInput() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
return DataTypeStringUtils.jsonSmartReplacementPlaceholderWithValue(
jsonBody, value, null, insertedParams, null, param);
}
Expand Down Expand Up @@ -1200,7 +1199,7 @@ public Mono<Void> sanitizeGenerateCRUDPageTemplateInfo(
List<ActionConfiguration> actionConfigurationList, Object... args) {
String printMessage = Thread.currentThread().getName()
+ ": sanitizeGenerateCRUDPageTemplateInfo() called for AmazonS3 plugin.";
System.out.println(printMessage);
log.debug(printMessage);
if (isEmpty(actionConfigurationList)) {
return Mono.empty();
}
Expand Down
4 changes: 3 additions & 1 deletion ...ver/appsmith-plugins/amazons3Plugin/src/main/java/com/external/utils/DatasourceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.appsmith.external.models.DatasourceConfiguration;
import com.appsmith.external.models.Property;
import com.external.plugins.exceptions.S3ErrorMessages;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;

import java.util.List;
Expand All @@ -26,6 +27,7 @@
import static com.external.plugins.constants.S3PluginConstants.S3_SERVICE_PROVIDER_PROPERTY_INDEX;
import static com.external.utils.DatasourceUtils.S3ServiceProvider.AMAZON;

@Slf4j
public class DatasourceUtils {

/**
Expand Down Expand Up @@ -101,7 +103,7 @@ public static S3ServiceProvider fromString(String name) throws AppsmithPluginExc
*/
public static AmazonS3ClientBuilder getS3ClientBuilder(DatasourceConfiguration datasourceConfiguration)
throws AppsmithPluginException {
System.out.println(Thread.currentThread().getName() + ": getS3ClientBuilder action called.");
log.debug(Thread.currentThread().getName() + ": getS3ClientBuilder action called.");
DBAuth authentication = (DBAuth) datasourceConfiguration.getAuthentication();
String accessKey = authentication.getUsername();
String secretKey = authentication.getPassword();
Expand Down
8 changes: 4 additions & 4 deletions .../appsmith-plugins/anthropicPlugin/src/main/java/com/external/plugins/AnthropicPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ protected AnthropicPluginExecutor(SharedConfig sharedConfig) {
@Override
public Mono<DatasourceTestResult> testDatasource(DatasourceConfiguration datasourceConfiguration) {
String printMessage = Thread.currentThread().getName() + ": testDatasource() called for Anthropic plugin.";
System.out.println(printMessage);
log.debug(printMessage);
final ApiKeyAuth apiKeyAuth = (ApiKeyAuth) datasourceConfiguration.getAuthentication();
if (!StringUtils.hasText(apiKeyAuth.getValue())) {
return Mono.error(new AppsmithPluginException(
Expand Down Expand Up @@ -115,7 +115,7 @@ public Mono<ActionExecutionResult> executeParameterized(

String printMessage =
Thread.currentThread().getName() + ": executeParameterized() called for Anthropic plugin.";
System.out.println(printMessage);
log.debug(printMessage);
// Get prompt from action configuration
List<Map.Entry<String, String>> parameters = new ArrayList<>();

Expand Down Expand Up @@ -255,7 +255,7 @@ private Object formatResponseBodyAsCompletionAPI(String model, byte[] response)
public Mono<TriggerResultDTO> trigger(
APIConnection connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
String printMessage = Thread.currentThread().getName() + ": trigger() called for Anthropic plugin.";
System.out.println(printMessage);
log.debug(printMessage);
final ApiKeyAuth apiKeyAuth = (ApiKeyAuth) datasourceConfiguration.getAuthentication();
if (!StringUtils.hasText(apiKeyAuth.getValue())) {
return Mono.error(new AppsmithPluginException(
Expand Down Expand Up @@ -319,7 +319,7 @@ public Mono<TriggerResultDTO> trigger(
public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration) {
String printMessage =
Thread.currentThread().getName() + ": validateDatasource() called for Anthropic plugin.";
System.out.println(printMessage);
log.debug(printMessage);
return RequestUtils.validateApiKeyAuthDatasource(datasourceConfiguration);
}

Expand Down
14 changes: 7 additions & 7 deletions ...ppsmith-plugins/appsmithAiPlugin/src/main/java/com/external/plugins/AppsmithAiPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public AppsmithAiPluginExecutor(SharedConfig config) {
public Mono<APIConnection> datasourceCreate(DatasourceConfiguration datasourceConfiguration) {
String printMessage =
Thread.currentThread().getName() + ": datasourceCreate() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
ApiKeyAuth apiKeyAuth = new ApiKeyAuth();
apiKeyAuth.setValue("test-key");
return ApiKeyAuthentication.create(apiKeyAuth)
Expand All @@ -82,7 +82,7 @@ public Mono<APIConnection> datasourceCreate(DatasourceConfiguration datasourceCo
public Mono<TriggerResultDTO> trigger(
APIConnection connection, DatasourceConfiguration datasourceConfiguration, TriggerRequestDTO request) {
String printMessage = Thread.currentThread().getName() + ": trigger() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
SourceDetails sourceDetails = SourceDetails.createSourceDetails(request);
String requestType = request.getRequestType();
if (UPLOAD_FILES.equals(requestType)) {
Expand Down Expand Up @@ -150,7 +150,7 @@ public Mono<ActionExecutionResult> executeParameterized(

String printMessage =
Thread.currentThread().getName() + ": executeParameterized() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
// Get input from action configuration
List<Map.Entry<String, String>> parameters = new ArrayList<>();

Expand All @@ -171,7 +171,7 @@ public Mono<ActionExecutionResult> executeCommon(
ExecuteActionDTO executeActionDTO) {

String printMessage = Thread.currentThread().getName() + ": executeCommon() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
// Initializing object for error condition
ActionExecutionResult errorResult = new ActionExecutionResult();
initUtils.initializeResponseWithError(errorResult);
Expand Down Expand Up @@ -211,14 +211,14 @@ public Mono<ActionExecutionResult> executeCommon(
public Set<String> validateDatasource(DatasourceConfiguration datasourceConfiguration, boolean isEmbedded) {
String printMessage =
Thread.currentThread().getName() + ": validateDatasource() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
return Set.of();
}

@Override
public Mono<DatasourceStorage> preSaveHook(DatasourceStorage datasourceStorage) {
String printMessage = Thread.currentThread().getName() + ": preSaveHook() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
return aiServerService
.associateDatasource(createAssociateDTO(datasourceStorage))
.thenReturn(datasourceStorage);
Expand All @@ -227,7 +227,7 @@ public Mono<DatasourceStorage> preSaveHook(DatasourceStorage datasourceStorage)
@Override
public Mono<DatasourceStorage> preDeleteHook(DatasourceStorage datasourceStorage) {
String printMessage = Thread.currentThread().getName() + ": preDeleteHook() called for AppsmithAI plugin.";
System.out.println(printMessage);
log.debug(printMessage);
DatasourceConfiguration datasourceConfiguration = datasourceStorage.getDatasourceConfiguration();
if (hasFiles(datasourceConfiguration)) {
return aiServerService
Expand Down
Loading