DATAGO-89835: Public DC C-EMA config push #226

CameronRushton · 2025-01-22T19:57:52Z

What is the purpose of this change?

Config push must be able to be performed by several different organizations sharing an EMA.

How was this change implemented?

Use the orgId from the mop message instead of getting it from the app properties to support multi tenancy better.

How was this change tested?

Manually by running the EMA locally and verifying in the debugger that the org ID was set as expected.

Is there anything the reviewers should focus on/be aware of?

None

…fix for config push

…on weekends.

…different envs with different scripts

…st for sending log messages

…an verify that it really is being updated and there is an orgId

CameronRushton · 2025-01-28T14:25:06Z

...lication/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java

-        return executionLog;
+        return null;


This was always null. IntelliJ recommended this.

CameronRushton · 2025-01-28T14:25:50Z

...lication/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java

-    private void finalizeAndSendResponse(CommandRequest request) {
-        request.determineStatus();
+    private void finalizeAndSendResponse(CommandRequest requestBO) {
+        requestBO.determineStatus();


Rename from request -> requestBO because it's hard to tell what was part of the messaging layer and what is internal.

CameronRushton · 2025-01-28T14:26:28Z

...lication/src/main/java/com/solace/maas/ep/event/management/agent/command/CommandManager.java

-                "orgId", eventPortalProperties.getOrganizationId(),
+                "orgId", requestBO.getOrgId(),


No longer grabbing the org ID from the application properties. It now comes from the mop message.

CameronRushton · 2025-01-28T14:29:16Z

...tion/src/main/java/com/solace/maas/ep/event/management/agent/config/SolaceConfiguration.java

+    public String getTopicPrefix(String orgId) {
+        if (StringUtils.isEmpty(orgId)) {
+            log.debug("Attempted to get topic prefix with empty orgId. Defaulting to application properties org ID {}",
+                    eventPortalProperties.getOrganizationId());
+            orgId = eventPortalProperties.getOrganizationId();
        }
-        return topicPrefix;
+        return String.format(TOPIC_PREFIX_FORMAT,
+                orgId,
+                eventPortalProperties.getRuntimeAgentId());
+    }
+
+    public String getTopicPrefix() {
+        return getTopicPrefix(null);
    }


There's several places where we call this to do things like set the config push command subscription and set the topic to send responses to. It's used for scan, config push, and heartbeat. To make this PR low touch, I've only altered anything to do with config push. That's the only case that sends in an orgId right now.
Maybe scan would want to use this as well? cc @rudraneel-chakraborty

CameronRushton · 2025-01-28T14:30:17Z

...n/java/com/solace/maas/ep/event/management/agent/processor/CommandLogStreamingProcessor.java

            Map<String, String> topicDetails = new HashMap<>();
-            topicDetails.put("orgId", eventPortalProperties.getOrganizationId());
+            topicDetails.put("orgId", organizationId);
            topicDetails.put("runtimeAgentId", eventPortalProperties.getRuntimeAgentId());
            topicDetails.put("messagingServiceId", messagingServiceId);
            topicDetails.put(COMMAND_CORRELATION_ID, commandCorrelationId);


This should be some kind of object imo but that can be for later.

CameronRushton · 2025-01-28T14:37:00Z

...tion/src/main/java/com/solace/maas/ep/event/management/agent/publisher/CommandPublisher.java

                        topicDetails.get(Command.COMMAND_CORRELATION_ID));
-
+        log.info("Sending config push response to topic: {}", topicString);


What do we think about logging the topic? It helped with debugging but I wonder if it's too much. I'd like to see a lot of these be debug logs tbh.

I don't think we should log the topics, specially in info level

I've removed this one and kept the subscription one but lowered that one to debug.

rudraneel-chakraborty

Discussed comments with cameron

…g push

sonarqube-solacecloud · 2025-01-31T00:02:23Z

SonarQube Quality Gate

74.3% Coverage on New Code (is less than 80%)

See analysis details on SonarQube

use orgId from mop message instead of application properties

4b3028c

CameronRushton temporarily deployed to build_pr January 22, 2025 19:57 — with GitHub Actions Inactive

CameronRushton marked this pull request as ready for review January 22, 2025 21:48

CameronRushton added 2 commits January 25, 2025 14:36

use orgId from mop message instead of app properties in the topic pre…

882ce82

…fix for config push

REVERT ME: test build workflow with an image worth testing

e9f55d4

CameronRushton temporarily deployed to build_pr January 25, 2025 23:42 — with GitHub Actions Inactive

CameronRushton had a problem deploying to prod January 25, 2025 23:43 — with GitHub Actions Failure

CameronRushton had a problem deploying to prod January 25, 2025 23:51 — with GitHub Actions Error

CameronRushton had a problem deploying to prod January 26, 2025 00:01 — with GitHub Actions Failure

actually grab the code and build it... duh. This is why we dont work …

0295fc9

…on weekends.

CameronRushton had a problem deploying to build_pr January 26, 2025 00:28 — with GitHub Actions Error

Gonna wanna log in if we're not in dev. This should all really be in …

798e120

…different envs with different scripts

CameronRushton had a problem deploying to build_pr January 26, 2025 00:32 — with GitHub Actions Error

CameronRushton had a problem deploying to prod January 26, 2025 00:33 — with GitHub Actions Failure

fix image name we're pushing; remove static code analysis

0061af6

CameronRushton temporarily deployed to prod January 26, 2025 00:40 — with GitHub Actions Inactive

CameronRushton temporarily deployed to build_pr January 26, 2025 00:40 — with GitHub Actions Inactive

use info logs; switch one other place to use the orgId from the reque…

caef0e8

…st for sending log messages

CameronRushton temporarily deployed to build_pr January 27, 2025 03:58 — with GitHub Actions Inactive

CameronRushton temporarily deployed to prod January 27, 2025 03:59 — with GitHub Actions Inactive

alter the logs to have orgId

b615c4e

CameronRushton temporarily deployed to build_pr January 27, 2025 16:40 — with GitHub Actions Inactive

CameronRushton temporarily deployed to prod January 27, 2025 16:43 — with GitHub Actions Inactive

CameronRushton temporarily deployed to prod January 28, 2025 01:23 — with GitHub Actions Inactive

use the method that has an orgId all the time; add another log so I c…

b784d02

…an verify that it really is being updated and there is an orgId

CameronRushton temporarily deployed to build_pr January 28, 2025 02:02 — with GitHub Actions Inactive

CameronRushton temporarily deployed to prod January 28, 2025 02:02 — with GitHub Actions Inactive

add a comment about when we stream logs and remove noisy info log

87ff578

CameronRushton temporarily deployed to build_pr January 28, 2025 04:37 — with GitHub Actions Inactive

CameronRushton commented Jan 28, 2025

View reviewed changes

revert deployment related changes

6db90ac

CameronRushton temporarily deployed to build_pr January 28, 2025 15:17 — with GitHub Actions Inactive

CameronRushton changed the title ~~use orgId from mop message instead of application properties~~ DATAGO-89835: Public DC C-EMA config push Jan 28, 2025

rudraneel-chakraborty requested changes Jan 29, 2025

View reviewed changes

rudraneel-chakraborty approved these changes Jan 29, 2025

View reviewed changes

remove some logs and lower level of any that log topics and subs

22f5ee3

CameronRushton temporarily deployed to build_pr January 30, 2025 14:42 — with GitHub Actions Inactive

add a test to ensure the orgId is used from the mop message for confi…

fdbaedc

…g push

CameronRushton temporarily deployed to build_pr January 30, 2025 23:52 — with GitHub Actions Inactive

CameronRushton merged commit a8c0b75 into main Jan 31, 2025
5 of 6 checks passed

CameronRushton deleted the crushton/DATAGO-89835 branch January 31, 2025 22:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DATAGO-89835: Public DC C-EMA config push #226

DATAGO-89835: Public DC C-EMA config push #226

CameronRushton commented Jan 22, 2025 •

edited

Loading

CameronRushton Jan 28, 2025

CameronRushton Jan 28, 2025

CameronRushton Jan 28, 2025

CameronRushton Jan 28, 2025

CameronRushton Jan 28, 2025

CameronRushton Jan 28, 2025

rudraneel-chakraborty Jan 29, 2025

CameronRushton Jan 30, 2025

rudraneel-chakraborty left a comment

sonarqube-solacecloud bot commented Jan 31, 2025

		"orgId", eventPortalProperties.getOrganizationId(),
		"orgId", requestBO.getOrgId(),

		topicDetails.get(Command.COMMAND_CORRELATION_ID));

		log.info("Sending config push response to topic: {}", topicString);

DATAGO-89835: Public DC C-EMA config push #226

DATAGO-89835: Public DC C-EMA config push #226

Conversation

CameronRushton commented Jan 22, 2025 • edited Loading

What is the purpose of this change?

How was this change implemented?

How was this change tested?

Is there anything the reviewers should focus on/be aware of?

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rudraneel-chakraborty left a comment

Choose a reason for hiding this comment

sonarqube-solacecloud bot commented Jan 31, 2025

CameronRushton commented Jan 22, 2025 •

edited

Loading