You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/10/27 09:32:00 UTC
[incubator-streampipes] branch dev updated: [STREAMPIPES-603] Add config extractor to function definition
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 3a3140243 [STREAMPIPES-603] Add config extractor to function definition
3a3140243 is described below
commit 3a3140243ff0dfd03d8c75b01b3999c84ffac9be
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Oct 27 11:31:50 2022 +0200
[STREAMPIPES-603] Add config extractor to function definition
---
.../container/extensions/ExtensionsModelSubmitter.java | 2 +-
.../extensions/function/StreamPipesFunctionHandler.java | 9 +++++----
.../container/declarer/IStreamPipesFunctionDeclarer.java | 2 +-
.../wrapper/standalone/function/FunctionContext.java | 16 ++++++++++++++--
.../standalone/function/FunctionContextGenerator.java | 5 ++++-
.../wrapper/standalone/function/StreamPipesFunction.java | 5 +++--
6 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
index 7ea994097..a11fa8a9d 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/ExtensionsModelSubmitter.java
@@ -54,7 +54,7 @@ public abstract class ExtensionsModelSubmitter extends StreamPipesExtensionsServ
@Override
public void afterServiceRegistered(SpServiceDefinition serviceDef) {
new ConnectWorkerRegistrationService().registerWorker(serviceDef);
- StreamPipesFunctionHandler.INSTANCE.initializeFunctions();
+ StreamPipesFunctionHandler.INSTANCE.initializeFunctions(serviceDef.getServiceGroup());
}
@Override
diff --git a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java
index be4726e66..152011118 100644
--- a/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java
+++ b/streampipes-container-extensions/src/main/java/org/apache/streampipes/container/extensions/function/StreamPipesFunctionHandler.java
@@ -38,13 +38,14 @@ public enum StreamPipesFunctionHandler {
this.runningInstances = new HashMap<>();
}
- public void initializeFunctions() {
- initializeFunctions(DeclarersSingleton.getInstance().getFunctions().values());
+ public void initializeFunctions(String serviceId) {
+ initializeFunctions(DeclarersSingleton.getInstance().getFunctions().values(), serviceId);
}
- public void initializeFunctions(Collection<IStreamPipesFunctionDeclarer> functions) {
+ public void initializeFunctions(Collection<IStreamPipesFunctionDeclarer> functions,
+ String serviceGroup) {
functions.forEach(function -> {
- Runnable r = function::invokeRuntime;
+ Runnable r = () -> function.invokeRuntime(serviceGroup);
new Thread(r).start();
runningInstances.put(function.getFunctionId().getId(), function);
});
diff --git a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/IStreamPipesFunctionDeclarer.java b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/IStreamPipesFunctionDeclarer.java
index 30f500e38..47936fc14 100644
--- a/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/IStreamPipesFunctionDeclarer.java
+++ b/streampipes-container/src/main/java/org/apache/streampipes/container/declarer/IStreamPipesFunctionDeclarer.java
@@ -28,7 +28,7 @@ public interface IStreamPipesFunctionDeclarer {
List<String> requiredStreamIds();
- void invokeRuntime();
+ void invokeRuntime(String serviceGroup);
void discardRuntime();
diff --git a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContext.java b/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContext.java
index 9e803512d..9242ef586 100644
--- a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContext.java
+++ b/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContext.java
@@ -19,6 +19,7 @@
package org.apache.streampipes.wrapper.standalone.function;
import org.apache.streampipes.client.StreamPipesClient;
+import org.apache.streampipes.container.config.ConfigExtractor;
import org.apache.streampipes.container.monitoring.SpMonitoringManager;
import org.apache.streampipes.model.SpDataStream;
import org.apache.streampipes.model.monitoring.SpLogEntry;
@@ -31,19 +32,22 @@ import java.util.Map;
public class FunctionContext {
- Map<String, SpDataStream> streams;
- StreamPipesClient client;
+ private final Map<String, SpDataStream> streams;
+ private StreamPipesClient client;
private String functionId;
+ private ConfigExtractor config;
public FunctionContext() {
this.streams = new HashMap<>();
}
public FunctionContext(String functionId,
+ String serviceGroup,
List<SpDataStream> streams,
StreamPipesClient client) {
this();
streams.forEach(stream -> this.streams.put(stream.getElementId(), stream));
+ this.config = ConfigExtractor.from(serviceGroup);
this.functionId = functionId;
this.client = client;
}
@@ -60,6 +64,14 @@ public class FunctionContext {
return client;
}
+ public ConfigExtractor getConfig() {
+ return config;
+ }
+
+ public String getFunctionId() {
+ return functionId;
+ }
+
public void log(SpLogEntry logEntry) {
SpMonitoringManager.INSTANCE.addErrorMessage(functionId, logEntry);
}
diff --git a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContextGenerator.java b/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContextGenerator.java
index a6bae1997..c1e3d63f3 100644
--- a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContextGenerator.java
+++ b/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/FunctionContextGenerator.java
@@ -29,10 +29,13 @@ public class FunctionContextGenerator {
private final List<String> streamIds;
private final String functionId;
+ private final String serviceGroup;
public FunctionContextGenerator(String functionId,
+ String serviceGroup,
List<String> streamIds) {
this.streamIds = streamIds;
+ this.serviceGroup = serviceGroup;
this.functionId = functionId;
}
@@ -40,7 +43,7 @@ public class FunctionContextGenerator {
var client = makeClient();
var streams = receiveStreams(client);
- return new FunctionContext(functionId, streams, client);
+ return new FunctionContext(functionId, serviceGroup, streams, client);
}
private StreamPipesClient makeClient() {
diff --git a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/StreamPipesFunction.java b/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/StreamPipesFunction.java
index 8d4a9fcad..8287bd45e 100644
--- a/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/StreamPipesFunction.java
+++ b/streampipes-wrapper-standalone/src/main/java/org/apache/streampipes/wrapper/standalone/function/StreamPipesFunction.java
@@ -48,9 +48,10 @@ public abstract class StreamPipesFunction implements IStreamPipesFunctionDeclare
this.sourceInfoMapper = new HashMap<>();
}
- public void invokeRuntime() {
+ @Override
+ public void invokeRuntime(String serviceGroup) {
FunctionContext context = new FunctionContextGenerator(
- this.getFunctionId().getId(), this.requiredStreamIds()
+ this.getFunctionId().getId(), serviceGroup, this.requiredStreamIds()
).generate();
context.getStreams().forEach(stream -> sourceInfoMapper.put(getTopic(stream), stream.getElementId()));
this.inputCollectors = getInputCollectors(context.getStreams());