Skip to content

chore: Add plugin name to server execution metrics #39413

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
ApekshaBhosale merged 8 commits into from
Mar 3, 2025
Merged

chore: Add plugin name to server execution metrics #39413

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6ca77e6
made changes to fetch plugin name
ApekshaBhosale Feb 24, 2025
e882245
Merge branch 'release' into add-plugin-server-execution-fix
ApekshaBhosale Feb 24, 2025
4d57634
made new changes
ApekshaBhosale Feb 24, 2025
b059249
nut null check
ApekshaBhosale Feb 24, 2025
c9dde0c
added some checks
ApekshaBhosale Feb 24, 2025
aa9826b
switchIFEmpty use
ApekshaBhosale Feb 26, 2025
1ff69f2
removed repeated code
ApekshaBhosale Feb 26, 2025
3908bbe
removed switch empty
ApekshaBhosale Feb 27, 2025
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
2 changes: 2 additions & 0 deletions app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/ExecuteActionMetaDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.appsmith.server.dtos;

import com.appsmith.server.domains.Plugin;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand All @@ -14,4 +15,5 @@ public class ExecuteActionMetaDTO {
String environmentId;
HttpHeaders headers;
boolean operateWithoutPermission = false;
Plugin plugin;
}
23 changes: 17 additions & 6 deletions ...-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,11 +292,22 @@ public Mono<ActionExecutionResult> executeAction(
.operateWithoutPermission(operateWithoutPermission)
.environmentId(environmentId)
.build();
Mono<ExecuteActionDTO> executeActionDTOMono = createExecuteActionDTO(partFlux);
return executeActionDTOMono
.flatMap(executeActionDTO -> populateAndExecuteAction(executeActionDTO, executeActionMetaDTO))
.name(ACTION_EXECUTION_SERVER_EXECUTION)
.tap(Micrometer.observation(observationRegistry));
Mono<ExecuteActionDTO> executeActionDTOMono =
createExecuteActionDTO(partFlux).cache();
Mono<Plugin> pluginMono = executeActionDTOMono.flatMap(executeActionDTO -> newActionService
.findById(executeActionDTO.getActionId())
.flatMap(newAction -> pluginService.findById(newAction.getPluginId()))
Comment thread
ApekshaBhosale marked this conversation as resolved.
Outdated
.cache());

return pluginMono.flatMap(plugin -> {
String pluginName = plugin.getName();
executeActionMetaDTO.setPlugin(plugin);
return executeActionDTOMono
.flatMap(executeActionDTO -> populateAndExecuteAction(executeActionDTO, executeActionMetaDTO))
.tag("plugin", pluginName)
.name(ACTION_EXECUTION_SERVER_EXECUTION)
.tap(Micrometer.observation(observationRegistry));
});
}

/**
Expand All @@ -322,7 +333,7 @@ public Mono<ActionExecutionResult> executeAction(

// 3. Instantiate the implementation class based on the query type
Mono<DatasourceStorage> datasourceStorageMono = getCachedDatasourceStorage(actionDTOMono, executeActionMetaDTO);
Mono<Plugin> pluginMono = getCachedPluginForActionExecution(datasourceStorageMono);
Mono<Plugin> pluginMono = Mono.just(executeActionMetaDTO.getPlugin());
Comment thread
ApekshaBhosale marked this conversation as resolved.
Outdated
Mono<PluginExecutor> pluginExecutorMono = pluginExecutorHelper.getPluginExecutor(pluginMono);

// 4. Execute the query
Expand Down