Support artifact listing in new ICP #4457
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![wso2-engineering[bot]](https://avatars.githubusercontent.com/in/1856828?s=60&v=4){kind=small}
Comment on lines
73
to
81
| public static void invokeHeartbeatExecutorService() { | ||
|
|
||
| // Check if new ICP is configured | ||
| if (ICPHeartBeatComponent.isICPConfigured()) { | ||
| log.info("New ICP configuration detected. Starting ICP heartbeat service."); | ||
| ICPHeartBeatComponent.invokeICPHeartbeatExecutorService(); | ||
| return; | ||
| } | ||
| // Fall back to old dashboard heartbeat | ||
| String heartbeatApiUrl = configs.get(DASHBOARD_CONFIG_URL) + "/heartbeat"; |
Contributor
There was a problem hiding this comment.
Log Improvement Suggestion No: 1
Suggested change
| public static void invokeHeartbeatExecutorService() { | |
| // Check if new ICP is configured | |
| if (ICPHeartBeatComponent.isICPConfigured()) { | |
| log.info("New ICP configuration detected. Starting ICP heartbeat service."); | |
| ICPHeartBeatComponent.invokeICPHeartbeatExecutorService(); | |
| return; | |
| } | |
| // Fall back to old dashboard heartbeat | |
| String heartbeatApiUrl = configs.get(DASHBOARD_CONFIG_URL) + "/heartbeat"; | |
| // Check if new ICP is configured | |
| if (ICPHeartBeatComponent.isICPConfigured()) { | |
| log.info("New ICP configuration detected. Starting ICP heartbeat service."); | |
| ICPHeartBeatComponent.invokeICPHeartbeatExecutorService(); | |
| return; | |
| } | |
| // Fall back to old dashboard heartbeat | |
| if (log.isDebugEnabled()) { | |
| log.debug("Starting dashboard heartbeat service with URL: " + heartbeatApiUrl); | |
| } |
Comment on lines
188
to
+192
| String stringResponse = getStringResponse(response); | ||
| JsonObject responseObject = null; | ||
| try { | ||
| responseObject = new JsonParser().parse(stringResponse).getAsJsonObject(); | ||
| Gson gson = new Gson(); | ||
| responseObject = gson.fromJson(stringResponse, JsonObject.class); |
Contributor
There was a problem hiding this comment.
Log Improvement Suggestion No: 2
Suggested change
| String stringResponse = getStringResponse(response); | |
| JsonObject responseObject = null; | |
| try { | |
| responseObject = new JsonParser().parse(stringResponse).getAsJsonObject(); | |
| Gson gson = new Gson(); | |
| responseObject = gson.fromJson(stringResponse, JsonObject.class); | |
| JsonObject responseObject = null; | |
| try { | |
| Gson gson = new Gson(); | |
| responseObject = gson.fromJson(stringResponse, JsonObject.class); | |
| if (log.isDebugEnabled()) { | |
| log.debug("Successfully parsed heartbeat response"); | |
| } |
Comment on lines
84
to
136
| * and full heartbeats when requested by the ICP. | ||
| */ | ||
| public static void invokeICPHeartbeatExecutorService() { | ||
| String icpUrl = getConfigValue(ICP_CONFIG_URL, null); | ||
| if (icpUrl == null) { | ||
| log.warn("ICP URL not configured. ICP heartbeat will not be started."); |
Contributor
There was a problem hiding this comment.
Log Improvement Suggestion No: 3
Suggested change
| * and full heartbeats when requested by the ICP. | |
| */ | |
| public static void invokeICPHeartbeatExecutorService() { | |
| String icpUrl = getConfigValue(ICP_CONFIG_URL, null); | |
| if (icpUrl == null) { | |
| log.warn("ICP URL not configured. ICP heartbeat will not be started."); | |
| log.info("Starting ICP heartbeat service. Runtime: " + runtime + ", Interval: " + interval + "s"); | |
| ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); | |
| Runnable runnableTask = () -> { | |
| try { | |
| log.debug("Executing scheduled ICP heartbeat task"); | |
| sendDeltaHeartbeat(runtime, icpUrl); |
Comment on lines
+992
to
+977
| private static JsonArray collectLocalEntries(SynapseConfiguration synapseConfig) { | ||
| JsonArray localEntries = new JsonArray(); | ||
| try { | ||
| @SuppressWarnings("unchecked") | ||
| Map<String, Object> entryMap = synapseConfig.getLocalRegistry(); | ||
| for (Map.Entry<String, Object> entry : entryMap.entrySet()) { | ||
| JsonObject entryObj = new JsonObject(); | ||
| entryObj.addProperty("name", entry.getKey()); | ||
| entryObj.addProperty("type", "LocalEntry"); | ||
| entryObj.addProperty("valueType", entry.getValue().getClass().getSimpleName()); | ||
| localEntries.add(entryObj); | ||
| } | ||
| } catch (Exception e) { | ||
| log.error("Error collecting Local Entries", e); | ||
| } |
Contributor
There was a problem hiding this comment.
Log Improvement Suggestion No: 4
Suggested change
| private static JsonArray collectLocalEntries(SynapseConfiguration synapseConfig) { | |
| JsonArray localEntries = new JsonArray(); | |
| try { | |
| @SuppressWarnings("unchecked") | |
| Map<String, Object> entryMap = synapseConfig.getLocalRegistry(); | |
| for (Map.Entry<String, Object> entry : entryMap.entrySet()) { | |
| JsonObject entryObj = new JsonObject(); | |
| entryObj.addProperty("name", entry.getKey()); | |
| entryObj.addProperty("type", "LocalEntry"); | |
| entryObj.addProperty("valueType", entry.getValue().getClass().getSimpleName()); | |
| localEntries.add(entryObj); | |
| } | |
| } catch (Exception e) { | |
| log.error("Error collecting Local Entries", e); | |
| } | |
| */ | |
| private static JsonArray collectDataServices(SynapseConfiguration synapseConfig) { | |
| JsonArray dataServices = new JsonArray(); | |
| try { | |
| if (synapseConfig == null || synapseConfig.getAxisConfiguration() == null) { | |
| log.debug("Synapse configuration or Axis configuration is not available for data services collection"); | |
| return dataServices; | |
| } | |
| log.info("Starting data services collection"); | |
| AxisConfiguration axisConfiguration = synapseConfig.getAxisConfiguration(); | |
| // Get available data service names using DBUtils | |
| String[] dataServiceNames = org.wso2.micro.integrator.dataservices.core.DBUtils.getAvailableDS(axisConfiguration); | |
| log.info("Found " + dataServiceNames.length + " data services to process"); |
Contributor
There was a problem hiding this comment.
AI Agent Log Improvement Checklist
- The log-related comments and suggestions in this review were generated by an AI tool to assist with identifying potential improvements. Purpose of reviewing the code for log improvements is to improve the troubleshooting capabilities of our products.
- Please make sure to manually review and validate all suggestions before applying any changes. Not every code suggestion would make sense or add value to our purpose. Therefore, you have the freedom to decide which of the suggestions are helpful.
✅ Before merging this pull request:
- Review all AI-generated comments for accuracy and relevance.
- Complete and verify the table below. We need your feedback to measure the accuracy of these suggestions and the value they add. If you are rejecting a certain code suggestion, please mention the reason briefly in the suggestion for us to capture it.
| Comment | Accepted (Y/N) | Reason |
|---|---|---|
| #### Log Improvement Suggestion No: 1 | ||
| #### Log Improvement Suggestion No: 2 | ||
| #### Log Improvement Suggestion No: 3 | ||
| #### Log Improvement Suggestion No: 4 |
|
Important Review skippedDraft detected. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Dilhasha
force-pushed
the
icp2-changes
branch
from
4b4989c to
66cf458
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Adds the following.
Goals
Support artifact listing in new ICP version
Approach
User stories
Release note
Documentation
Training
Certification
Marketing
Automation tests
Security checks
Samples
Related PRs
Migrations (if applicable)
Test environment
Learning