Skip to content
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

CxODEV-459 Conductor: Add support for publishing wf/task events to RabbitMQ #1

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

CxODEV-459 Conductor: Add support for publishing wf/task events to RabbitMQ #1

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2066923
add new message publisher moduler
darkobuvac Dec 27, 2023
dfd9043
add rabbit mq properties class
darkobuvac Dec 27, 2023
6e2b4a4
add configuration class and register amqp connection class as bean
darkobuvac Dec 27, 2023
8a5ceaa
rabbitmq service with implementation
darkobuvac Dec 27, 2023
21303db
register rabbitmq service
darkobuvac Dec 27, 2023
9e03dfc
wf status listener implementation
darkobuvac Dec 27, 2023
e957ed4
register wf status listener conditionally
darkobuvac Dec 27, 2023
4590f39
add task status publihser as task status listener implementation
darkobuvac Dec 27, 2023
c9e002c
register task publisher conditionally
darkobuvac Dec 27, 2023
6892da5
enable wf listener through configuration and change condition for reg…
darkobuvac Dec 27, 2023
c865e37
include module rabbitmq publisher and add default appliction properties
darkobuvac Dec 27, 2023
1b537bb
remove proxy bean methods
darkobuvac Dec 27, 2023
fc53210
rename property
darkobuvac Jan 4, 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
1 change: 1 addition & 0 deletions community-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ dependencies {
implementation project(':task:conductor-kafka')

implementation project(':conductor-workflow-event-listener')
implementation project(':message-publisher:conductor-rabbitmq-message-publisher')

implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-validation'
Expand Down
17 changes: 17 additions & 0 deletions community-server/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,20 @@ management.metrics.export.datadog.enabled=false
#optional - default Datadog instance is https://app.datadoghq.com/
# management.metrics.export.datadog.uri=<your DD instance>
#management.metrics.export.datadog.step=10s

#Following properties set for using for publishing workflow/task status change event to RabbitMQ:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style: Looking around, I see that "non-code" comments should have a space between # and the sentence (not unlike our own .NET Coding Conventions)

#(To enable support of RabbitMQ publishers)
#conductor.message-publisher.type=rabbitmq

#conductor.workflow-status-listener.type=rabbitmq
#conductor.task-status-listener.type=rabbitmq
#conductor.message-publisher.rabbitmq.hosts=<rabbitmq serverip>
#conductor.message-publisher.rabbitmq.username=<username>
#conductor.message-publisher.rabbitmq.password=<password>
#conductor.message-publisher.rabbitmq.port=5672
#conductor.message-publisher.rabbitmq.workflowStatusExchange=workflow.status.exchange
#conductor.message-publisher.rabbitmq.taskStatusExchange=task.status.exchange
#conductor.message-publisher.rabbitmq.workflowStatusListenerEnabled=true
#conductor.message-publisher.rabbitmq.allowedTaskStatuses=COMPLETED,IN_PROGRESS,FAILED
# Task statuses
# IN_PROGRESS,CANCELED,FAILED,FAILED_WITH_TERMINAL_ERROR,COMPLETED,COMPLETED_WITH_ERRORS,SCHEDULED,TIMED_OUT,SKIPPED
23 changes: 23 additions & 0 deletions message-publisher/rabbitmq-message-publisher/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
plugins {
id 'groovy'
}
dependencies {

implementation "com.netflix.conductor:conductor-common:${revConductor}"
implementation "com.netflix.conductor:conductor-core:${revConductor}"
implementation "com.netflix.conductor:conductor-amqp:${revConductor}"

implementation "com.rabbitmq:amqp-client:${revAmqpClient}"

compileOnly 'org.springframework.boot:spring-boot-starter'
compileOnly 'org.springframework.boot:spring-boot-starter-web'

testImplementation "org.codehaus.groovy:groovy-all:${revGroovy}"
testImplementation "org.spockframework:spock-core:${revSpock}"
testImplementation "org.spockframework:spock-spring:${revSpock}"


testImplementation "com.netflix.conductor:conductor-server:${revConductor}"
testImplementation 'org.springframework.boot:spring-boot-starter-web'
testImplementation project(':conductor-test-util').sourceSets.test.output
}
261 changes: 261 additions & 0 deletions message-publisher/rabbitmq-message-publisher/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,261 @@
{
"annotationProcessor": {
"org.springframework.boot:spring-boot-configuration-processor": {
"locked": "2.7.16"
}
},
"compileClasspath": {
"com.netflix.conductor:conductor-amqp": {
"project": true
},
"com.netflix.conductor:conductor-common": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.15.0"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-web": {
"locked": "2.7.16"
}
},
"runtimeClasspath": {
"com.google.guava:guava": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "32.1.2-jre"
},
"com.netflix.conductor:conductor-amqp": {
"project": true
},
"com.netflix.conductor:conductor-common": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "3.15.0"
},
"com.rabbitmq:amqp-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "5.14.3"
},
"io.reactivex:rxjava": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "1.3.8"
},
"org.apache.commons:commons-lang3": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "3.12.0"
},
"org.apache.logging.log4j:log4j-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
}
},
"testCompileClasspath": {
"com.netflix.conductor:conductor-amqp": {
"project": true
},
"com.netflix.conductor:conductor-common": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-server": {
"locked": "3.15.0"
},
"junit:junit": {
"locked": "4.13.2"
},
"org.apache.logging.log4j:log4j-api": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "3.0.19"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.spockframework:spock-core": {
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-web": {
"locked": "2.7.16"
}
},
"testRuntimeClasspath": {
"com.google.guava:guava": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "32.1.2-jre"
},
"com.netflix.conductor:conductor-amqp": {
"project": true
},
"com.netflix.conductor:conductor-common": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "3.15.0"
},
"com.netflix.conductor:conductor-server": {
"locked": "3.15.0"
},
"com.rabbitmq:amqp-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "5.14.3"
},
"io.reactivex:rxjava": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "1.3.8"
},
"junit:junit": {
"locked": "4.13.2"
},
"org.apache.commons:commons-lang3": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "3.12.0"
},
"org.apache.logging.log4j:log4j-api": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-core": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-jul": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-slf4j-impl": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.apache.logging.log4j:log4j-web": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-amqp"
],
"locked": "2.17.2"
},
"org.codehaus.groovy:groovy-all": {
"locked": "3.0.19"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
},
"org.spockframework:spock-core": {
"locked": "2.3-groovy-3.0"
},
"org.spockframework:spock-spring": {
"locked": "2.3-groovy-3.0"
},
"org.springframework.boot:spring-boot-starter-log4j2": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-test": {
"locked": "2.7.16"
},
"org.springframework.boot:spring-boot-starter-web": {
"locked": "2.7.16"
}
}
}
79 changes: 79 additions & 0 deletions ...-publisher/src/main/java/com/netflix/conductor/rabbitmq/config/RabbitMQConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* specific language governing permissions and limitations under the License.
*/
package com.netflix.conductor.rabbitmq.config;

import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import com.netflix.conductor.contribs.queue.amqp.AMQPConnection;
import com.netflix.conductor.contribs.queue.amqp.config.AMQPRetryPattern;
import com.netflix.conductor.rabbitmq.listener.TaskStatusPublisherRabbitMQ;
import com.netflix.conductor.rabbitmq.listener.WorkflowStatusPublisherRabbitMQ;
import com.netflix.conductor.rabbitmq.services.RabbitMQService;
import com.netflix.conductor.rabbitmq.services.RabbitMQServiceImpl;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.rabbitmq.client.Address;
import com.rabbitmq.client.ConnectionFactory;

@Configuration
@EnableConfigurationProperties(RabbitMQProperties.class)
@ConditionalOnProperty(name = "conductor.message-publisher.type", havingValue = "rabbitmq")
public class RabbitMQConfiguration {

@Bean
public AMQPConnection amqpConnection(RabbitMQProperties rabbitMQProperties) {
ConnectionFactory connectionFactory = new ConnectionFactory();

connectionFactory.setHost(rabbitMQProperties.getHosts());
connectionFactory.setPort(rabbitMQProperties.getPort());
connectionFactory.setUsername(rabbitMQProperties.getUsername());
connectionFactory.setPassword(rabbitMQProperties.getPassword());

Address[] addresses =
new Address[] {
new Address(rabbitMQProperties.getHosts(), rabbitMQProperties.getPort())
};

AMQPRetryPattern retryPattern = new AMQPRetryPattern();

return AMQPConnection.getInstance(connectionFactory, addresses, retryPattern);
}

@Bean
public RabbitMQService rabbitMQService(
AMQPConnection amqpConnection, ObjectMapper objectMapper) {
return new RabbitMQServiceImpl(amqpConnection, objectMapper);
}

@ConditionalOnProperty(
name = "conductor.workflow-status-listener.type",
havingValue = "rabbitmq",
matchIfMissing = false)
@Bean
public WorkflowStatusPublisherRabbitMQ workflowStatusListenerRabbitMQ(
RabbitMQService rabbitMQService, RabbitMQProperties rabbitMQProperties) {
return new WorkflowStatusPublisherRabbitMQ(rabbitMQService, rabbitMQProperties);
}

@ConditionalOnProperty(
name = "conductor.task-status-listener.type",
havingValue = "rabbitmq",
matchIfMissing = false)
@Bean
public TaskStatusPublisherRabbitMQ taskStatusPublisherRabbitMQ(
RabbitMQService rabbitMQService, RabbitMQProperties rabbitMQProperties) {
return new TaskStatusPublisherRabbitMQ(rabbitMQService, rabbitMQProperties);
}
}
Loading