You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by rg...@apache.org on 2022/10/03 16:30:56 UTC
[flume] branch flume-spring-boot created (now 65644d9f6)
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a change to branch flume-spring-boot
in repository https://gitbox.apache.org/repos/asf/flume.git
at 65644d9f6 FLUME-3440 - Add Spring Boot support
This branch includes the following new commits:
new 38afaeb4c Update version
new 4e4f5e562 Update for release
new bbae4b8b7 Spring Boot support
new 65644d9f6 FLUME-3440 - Add Spring Boot support
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[flume] 04/04: FLUME-3440 - Add Spring Boot support
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-spring-boot
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 65644d9f6ba047d167ffb437a98050fa4589c17e
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Oct 3 09:28:17 2022 -0700
FLUME-3440 - Add Spring Boot support
---
.../{Application.java => FlumeApplication.java} | 10 ++---
.../boot/config/AbstractFlumeConfiguration.java | 32 +++++++++++++-
.../flume/spring/boot/config/FlumeInitializer.java | 51 ++++++++++++++++++++++
.../FlumePackageProvider.java} | 21 +++++----
.../PackageProvider.java} | 17 +++-----
.../boot/controller/FlumeMetricsController.java | 48 ++++++++++++++++++++
...apache.flume.spring.boot.config.PackageProvider | 15 +++++++
.../src/main/resources/META-INF/spring.factories | 16 +++++++
.../AppTest.java => app/TestSpringFlume.java} | 24 ++++++++--
.../spring/{boot => app}/config/AppConfig.java | 9 ++--
.../spring/app/config/AppPackageProvider.java} | 21 ++++-----
...apache.flume.spring.boot.config.PackageProvider | 1 +
.../src/test/resources/application.yml | 7 +++
flume-spring-boot/src/test/resources/bootstrap.yml | 3 ++
.../src/test/resources/log4j2-test.xml | 2 +-
pom.xml | 1 +
16 files changed, 228 insertions(+), 50 deletions(-)
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/FlumeApplication.java
similarity index 78%
copy from flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
copy to flume-spring-boot/src/main/java/org/apache/flume/spring/boot/FlumeApplication.java
index 4edbad5f5..d4a5146ab 100644
--- a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/FlumeApplication.java
@@ -19,15 +19,13 @@ package org.apache.flume.spring.boot;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
/**
- *
+ * The application to run.
*/
-@SpringBootApplication(scanBasePackages = {"org.apache.flume.spring.boot"})
-@EnableConfigurationProperties
-public class Application {
+@SpringBootApplication
+public class FlumeApplication {
public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
+ SpringApplication.run(FlumeApplication.class, args);
}
}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
index 0846e46dd..79db4521b 100644
--- a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
@@ -21,6 +21,8 @@ import org.apache.flume.ChannelSelector;
import org.apache.flume.Context;
import org.apache.flume.FlumeException;
import org.apache.flume.Sink;
+import org.apache.flume.SinkProcessor;
+import org.apache.flume.SinkRunner;
import org.apache.flume.Source;
import org.apache.flume.SourceRunner;
import org.apache.flume.channel.ChannelProcessor;
@@ -62,12 +64,38 @@ public abstract class AbstractFlumeConfiguration {
return SourceRunner.forSource(source);
}
- protected <T extends Sink> Sink configureSink(final String name, final Class<T> clazz,
+ protected <T extends Source> SourceRunner configureSource(final T source,
+ final ChannelSelector selector, final Map<String, String> params) {
+ source.setChannelProcessor(new ChannelProcessor(selector));
+ return SourceRunner.forSource(source);
+ }
+
+ protected <T extends SinkProcessor> T configureSinkProcessor(final Map<String, String> params,
+ final Class<T> clazz, final List<Sink> sinks) {
+ T processor;
+ try {
+ processor = clazz.newInstance();
+ } catch (Exception ex) {
+ throw new FlumeException("Unable to create SinkProcessor of type: " + clazz.getName(), ex);
+ }
+ processor.setSinks(sinks);
+ Configurables.configure(processor, createContext(params));
+ return processor;
+ }
+
+
+ protected SinkRunner createSinkRunner(SinkProcessor sinkProcessor) {
+ SinkRunner runner = new SinkRunner(sinkProcessor);
+ runner.setSink(sinkProcessor);
+ return runner;
+ }
+
+ protected <T extends Sink> Sink configureSink(final String name, final Class<T> sinkClazz,
final Channel channel,
final Map<String, String> params) {
T sink;
try {
- sink = clazz.newInstance();
+ sink = sinkClazz.newInstance();
} catch (Exception ex) {
throw new FlumeException("Unable to create sink " + name, ex);
}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/FlumeInitializer.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/FlumeInitializer.java
new file mode 100644
index 000000000..ad98c6b02
--- /dev/null
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/FlumeInitializer.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot.config;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ServiceLoader;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigRegistry;
+
+/**
+ * Dynamically add to the ApplicationContext.
+ */
+public class FlumeInitializer implements ApplicationContextInitializer {
+ private Logger logger = LoggerFactory.getLogger(FlumeInitializer.class);
+
+ @Override
+ public void initialize(ConfigurableApplicationContext applicationContext) {
+ if (applicationContext instanceof AnnotationConfigRegistry) {
+ AnnotationConfigRegistry registry = (AnnotationConfigRegistry) applicationContext;
+ ServiceLoader<PackageProvider> serviceLoader =
+ ServiceLoader.load(PackageProvider.class, FlumeInitializer.class.getClassLoader());
+ List<String> basePackages = new ArrayList<>();
+ for (PackageProvider provider : serviceLoader) {
+ basePackages.addAll(provider.getPackages());
+ }
+ logger.debug("Adding packages {} for component scanning", basePackages);
+ registry.scan(basePackages.toArray(new String[0]));
+ } else {
+ logger.warn("ApplicationContext is not an AnnotationConfigRegistry. Application loading will likely fail");
+ }
+ }
+}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/FlumePackageProvider.java
similarity index 63%
copy from flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
copy to flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/FlumePackageProvider.java
index 4edbad5f5..8cb91f8bb 100644
--- a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/FlumePackageProvider.java
@@ -14,20 +14,19 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
+package org.apache.flume.spring.boot.config;
-package org.apache.flume.spring.boot;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import java.util.Collections;
+import java.util.List;
/**
- *
+ * Defines the Flume Spring package.
*/
-@SpringBootApplication(scanBasePackages = {"org.apache.flume.spring.boot"})
-@EnableConfigurationProperties
-public class Application {
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
+public class FlumePackageProvider implements PackageProvider {
+ private static final String PACKAGE = "org.apache.flume.spring.boot";
+
+ @Override
+ public List<String> getPackages() {
+ return Collections.singletonList(PACKAGE);
}
}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/PackageProvider.java
similarity index 63%
copy from flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
copy to flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/PackageProvider.java
index 4edbad5f5..4157c6705 100644
--- a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/PackageProvider.java
@@ -14,20 +14,13 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
+package org.apache.flume.spring.boot.config;
-package org.apache.flume.spring.boot;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import java.util.List;
/**
- *
+ * Retrieves a List of packages to include.
*/
-@SpringBootApplication(scanBasePackages = {"org.apache.flume.spring.boot"})
-@EnableConfigurationProperties
-public class Application {
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
- }
+public interface PackageProvider {
+ List<String> getPackages();
}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/controller/FlumeMetricsController.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/controller/FlumeMetricsController.java
new file mode 100644
index 000000000..3f4642cd7
--- /dev/null
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/controller/FlumeMetricsController.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot.controller;
+
+import java.lang.reflect.Type;
+import java.util.Map;
+
+import org.apache.flume.instrumentation.util.JMXPollUtil;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+/**
+ * Retrieves Flume Metrics.
+ */
+@RestController
+@ConditionalOnProperty(prefix = "flume", name = "metrics", havingValue = "http")
+public class FlumeMetricsController {
+
+ private final Type mapType = new MapTypeToken().getType();
+ private final Gson gson = new Gson();
+
+ @GetMapping(value = "/metrics", produces = "application/json;charset=utf-8")
+ public String metrics() {
+ Map<String, Map<String, String>> metricsMap = JMXPollUtil.getAllMBeans();
+ return gson.toJson(metricsMap, mapType);
+ }
+
+ private static class MapTypeToken extends TypeToken<Map<String, Map<String, String>>> {
+ }
+}
diff --git a/flume-spring-boot/src/main/resources/META-INF/services/org.apache.flume.spring.boot.config.PackageProvider b/flume-spring-boot/src/main/resources/META-INF/services/org.apache.flume.spring.boot.config.PackageProvider
new file mode 100644
index 000000000..ccfbf561e
--- /dev/null
+++ b/flume-spring-boot/src/main/resources/META-INF/services/org.apache.flume.spring.boot.config.PackageProvider
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+org.apache.flume.spring.boot.config.FlumePackageProvider
\ No newline at end of file
diff --git a/flume-spring-boot/src/main/resources/META-INF/spring.factories b/flume-spring-boot/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000000000..6f7899871
--- /dev/null
+++ b/flume-spring-boot/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+
+org.springframework.context.ApplicationContextInitializer=org.apache.flume.spring.boot.config.FlumeInitializer
\ No newline at end of file
diff --git a/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/AppTest.java b/flume-spring-boot/src/test/java/org/apache/flume/spring/app/TestSpringFlume.java
similarity index 64%
rename from flume-spring-boot/src/test/java/org/apache/flume/spring/boot/AppTest.java
rename to flume-spring-boot/src/test/java/org/apache/flume/spring/app/TestSpringFlume.java
index af2654348..b30af8857 100644
--- a/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/AppTest.java
+++ b/flume-spring-boot/src/test/java/org/apache/flume/spring/app/TestSpringFlume.java
@@ -14,22 +14,36 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.flume.spring.boot;
+package org.apache.flume.spring.app;
+
+import java.net.URI;
import org.apache.flume.node.MaterializedConfiguration;
+import org.apache.flume.spring.boot.FlumeApplication;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.test.context.junit.jupiter.SpringExtension;
/**
*
*/
@ExtendWith(SpringExtension.class)
-@SpringBootTest
-public class AppTest {
+@SpringBootTest(classes = {FlumeApplication.class},
+ webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class TestSpringFlume {
+
+ @LocalServerPort
+ private int port;
+
+ @Autowired
+ private TestRestTemplate restTemplate;
@Autowired
MaterializedConfiguration configuration;
@@ -39,5 +53,9 @@ public class AppTest {
Assertions.assertThat(configuration).isNotNull();
Assertions.assertThat(configuration.getSinkRunners()).isNotNull();
Assertions.assertThat(configuration.getSinkRunners().size()).isEqualTo(1);
+ String uri = "http://localhost:" + port + "/metrics";
+ ResponseEntity<String> response = restTemplate.getForEntity(URI.create(uri), String.class);
+ Assertions.assertThat(response).isNotNull();
+ Assertions.assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
}
}
diff --git a/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/config/AppConfig.java b/flume-spring-boot/src/test/java/org/apache/flume/spring/app/config/AppConfig.java
similarity index 91%
rename from flume-spring-boot/src/test/java/org/apache/flume/spring/boot/config/AppConfig.java
rename to flume-spring-boot/src/test/java/org/apache/flume/spring/app/config/AppConfig.java
index cc9534376..ac57a9985 100644
--- a/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/config/AppConfig.java
+++ b/flume-spring-boot/src/test/java/org/apache/flume/spring/app/config/AppConfig.java
@@ -14,12 +14,11 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
-package org.apache.flume.spring.boot.config;
+package org.apache.flume.spring.app.config;
import org.apache.flume.Channel;
import org.apache.flume.ChannelSelector;
import org.apache.flume.Sink;
-import org.apache.flume.SinkProcessor;
import org.apache.flume.SinkRunner;
import org.apache.flume.SourceRunner;
import org.apache.flume.channel.MemoryChannel;
@@ -27,6 +26,7 @@ import org.apache.flume.channel.ReplicatingChannelSelector;
import org.apache.flume.sink.DefaultSinkProcessor;
import org.apache.flume.sink.NullSink;
import org.apache.flume.source.SequenceGeneratorSource;
+import org.apache.flume.spring.boot.config.AbstractFlumeConfiguration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -67,9 +67,8 @@ public class AppConfig extends AbstractFlumeConfiguration {
@Bean
public SinkRunner nullSink(Channel memoryChannel) {
- SinkProcessor sinkProcessor = new DefaultSinkProcessor();
Sink sink = configureSink("null", NullSink.class, memoryChannel,null);
- sinkProcessor.setSinks(listOf(sink));
- return new SinkRunner(sinkProcessor);
+ return createSinkRunner(configureSinkProcessor(null, DefaultSinkProcessor.class,
+ listOf(sink)));
}
}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java b/flume-spring-boot/src/test/java/org/apache/flume/spring/app/config/AppPackageProvider.java
similarity index 63%
rename from flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
rename to flume-spring-boot/src/test/java/org/apache/flume/spring/app/config/AppPackageProvider.java
index 4edbad5f5..262dc4b16 100644
--- a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
+++ b/flume-spring-boot/src/test/java/org/apache/flume/spring/app/config/AppPackageProvider.java
@@ -14,20 +14,21 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
+package org.apache.flume.spring.app.config;
-package org.apache.flume.spring.boot;
+import java.util.Collections;
+import java.util.List;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.apache.flume.spring.boot.config.PackageProvider;
/**
- *
+ * Defines the Flume Spring package.
*/
-@SpringBootApplication(scanBasePackages = {"org.apache.flume.spring.boot"})
-@EnableConfigurationProperties
-public class Application {
- public static void main(String[] args) {
- SpringApplication.run(Application.class, args);
+public class AppPackageProvider implements PackageProvider {
+ private static final String PACKAGE = "org.apache.flume.spring.app";
+
+ @Override
+ public List<String> getPackages() {
+ return Collections.singletonList(PACKAGE);
}
}
diff --git a/flume-spring-boot/src/test/resources/META-INF/services/org.apache.flume.spring.boot.config.PackageProvider b/flume-spring-boot/src/test/resources/META-INF/services/org.apache.flume.spring.boot.config.PackageProvider
new file mode 100644
index 000000000..5eb81f252
--- /dev/null
+++ b/flume-spring-boot/src/test/resources/META-INF/services/org.apache.flume.spring.boot.config.PackageProvider
@@ -0,0 +1 @@
+org.apache.flume.spring.app.config.AppPackageProvider
\ No newline at end of file
diff --git a/flume-spring-boot/src/test/resources/application.yml b/flume-spring-boot/src/test/resources/application.yml
index 8e2e2e5ed..7b5230923 100644
--- a/flume-spring-boot/src/test/resources/application.yml
+++ b/flume-spring-boot/src/test/resources/application.yml
@@ -1,5 +1,12 @@
+spring:
+ application:
+ name: flume-test
+
+server:
+ port: 41414
flume:
+ metrics: http
sources:
source1:
totalEvents: 10000
diff --git a/flume-spring-boot/src/test/resources/bootstrap.yml b/flume-spring-boot/src/test/resources/bootstrap.yml
new file mode 100644
index 000000000..e2905906c
--- /dev/null
+++ b/flume-spring-boot/src/test/resources/bootstrap.yml
@@ -0,0 +1,3 @@
+flume:
+ app:
+ packages: "org.apache.flume.spring.boot.app"
\ No newline at end of file
diff --git a/flume-spring-boot/src/test/resources/log4j2-test.xml b/flume-spring-boot/src/test/resources/log4j2-test.xml
index d912f3105..a98e44860 100644
--- a/flume-spring-boot/src/test/resources/log4j2-test.xml
+++ b/flume-spring-boot/src/test/resources/log4j2-test.xml
@@ -24,7 +24,7 @@
</Appenders>
<Loggers>
<Logger name="org.apache.flume" level="INFO" />
- <Root level="WARN">
+ <Root level="INFO">
<AppenderRef ref="Console" />
</Root>
</Loggers>
diff --git a/pom.xml b/pom.xml
index edd28148b..755b3ba26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -557,6 +557,7 @@ limitations under the License.
<excludes>
<exclude>**/.idea/</exclude>
<exclude>**/*.iml</exclude>
+ <exclude>src/main/resources/META-INF/services/**/*</exclude>
<exclude>**/nb-configuration.xml</exclude>
<exclude>.git/</exclude>
<exclude>patchprocess/</exclude>
[flume] 01/04: Update version
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-spring-boot
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 38afaeb4cd987037d0acc44754fc98f43d10e0bc
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Jul 31 13:54:44 2022 -0700
Update version
---
flume-ng-doc/sphinx/FlumeDeveloperGuide.rst | 2 +-
flume-ng-doc/sphinx/FlumeUserGuide.rst | 6 +++---
flume-ng-doc/sphinx/index.rst | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
index 2145b5c3c..6a01c6a8c 100644
--- a/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeDeveloperGuide.rst
@@ -15,7 +15,7 @@
======================================
-Flume 2.0.0-SNAPSHOT Developer Guide
+Flume 1.10.1 Developer Guide
======================================
Introduction
diff --git a/flume-ng-doc/sphinx/FlumeUserGuide.rst b/flume-ng-doc/sphinx/FlumeUserGuide.rst
index 9355fad16..fb1ffde92 100644
--- a/flume-ng-doc/sphinx/FlumeUserGuide.rst
+++ b/flume-ng-doc/sphinx/FlumeUserGuide.rst
@@ -15,7 +15,7 @@
================================
-Flume 2.0.0-SNAPSHOT User Guide
+Flume 1.10.1 User Guide
================================
Introduction
@@ -4847,7 +4847,7 @@ Log4J Appender
Appends Log4j events to a flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-2.0.0-SNAPSHOT.jar).
+flume-ng-sdk-1.10.1.jar).
Required properties are in **bold**.
===================== ======= ==================================================================================
@@ -4911,7 +4911,7 @@ Load Balancing Log4J Appender
Appends Log4j events to a list of flume agent's avro source. A client using this
appender must have the flume-ng-sdk in the classpath (eg,
-flume-ng-sdk-2.0.0-SNAPSHOT.jar). This appender supports a round-robin and random
+flume-ng-sdk-1.10.1.jar). This appender supports a round-robin and random
scheme for performing the load balancing. It also supports a configurable backoff
timeout so that down agents are removed temporarily from the set of hosts
Required properties are in **bold**.
diff --git a/flume-ng-doc/sphinx/index.rst b/flume-ng-doc/sphinx/index.rst
index 4a064a2a7..bfbd7fc8b 100644
--- a/flume-ng-doc/sphinx/index.rst
+++ b/flume-ng-doc/sphinx/index.rst
@@ -15,7 +15,7 @@
================================================
-Apache Flume 2.0.0-SNAPSHOT documentation
+Apache Flume 1.10.1 documentation
================================================
Flume is a distributed, reliable, and available system for efficiently
[flume] 03/04: Spring Boot support
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-spring-boot
in repository https://gitbox.apache.org/repos/asf/flume.git
commit bbae4b8b7775bbc2051e6e2f8b5e9b1b9c13ea06
Author: rgoers <ra...@dslextreme.com>
AuthorDate: Thu Sep 22 12:00:48 2022 -0700
Spring Boot support
---
flume-spring-boot/pom.xml | 94 ++++++++++++++++++
.../org/apache/flume/spring/boot/Application.java | 33 +++++++
.../boot/config/AbstractFlumeConfiguration.java | 107 +++++++++++++++++++++
.../spring/boot/config/SpringConfiguration.java | 59 ++++++++++++
.../flume/spring/boot/runner/SpringFlume.java | 59 ++++++++++++
.../java/org/apache/flume/spring/boot/AppTest.java | 43 +++++++++
.../apache/flume/spring/boot/config/AppConfig.java | 75 +++++++++++++++
.../src/test/resources/application.yml | 8 ++
.../src/test/resources/log4j2-test.xml | 31 ++++++
pom.xml | 3 +-
10 files changed, 511 insertions(+), 1 deletion(-)
diff --git a/flume-spring-boot/pom.xml b/flume-spring-boot/pom.xml
new file mode 100644
index 000000000..bfd058fcc
--- /dev/null
+++ b/flume-spring-boot/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>flume-parent</artifactId>
+ <groupId>org.apache.flume</groupId>
+ <version>1.11.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>flume-spring-boot</artifactId>
+ <name>Flume Spring Boot Support</name>
+
+ <properties>
+ <module.name>org.apache.flume.spring.boot</module.name>
+ <spring-boot.version>2.7.3</spring-boot.version>
+ </properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flume</groupId>
+ <artifactId>flume-ng-node</artifactId>
+ </dependency>
+ <!-- Spring Boot dependencies -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- log dependencies -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
new file mode 100644
index 000000000..4edbad5f5
--- /dev/null
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/Application.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+/**
+ *
+ */
+@SpringBootApplication(scanBasePackages = {"org.apache.flume.spring.boot"})
+@EnableConfigurationProperties
+public class Application {
+ public static void main(String[] args) {
+ SpringApplication.run(Application.class, args);
+ }
+}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
new file mode 100644
index 000000000..0846e46dd
--- /dev/null
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/AbstractFlumeConfiguration.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot.config;
+
+import org.apache.flume.Channel;
+import org.apache.flume.ChannelSelector;
+import org.apache.flume.Context;
+import org.apache.flume.FlumeException;
+import org.apache.flume.Sink;
+import org.apache.flume.Source;
+import org.apache.flume.SourceRunner;
+import org.apache.flume.channel.ChannelProcessor;
+import org.apache.flume.conf.Configurables;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ */
+public abstract class AbstractFlumeConfiguration {
+
+ protected <T extends Channel> T configureChannel(final String name, final Class<T> clazz,
+ final Map<String, String> params) {
+ T channel;
+ try {
+ channel = clazz.newInstance();
+ } catch (Exception ex) {
+ throw new FlumeException("Unable to create channel " + name, ex);
+ }
+ channel.setName(name);
+ Configurables.configure(channel, createContext(params));
+ return channel;
+ }
+
+ protected <T extends Source> SourceRunner configureSource(final String name, final Class<T> clazz,
+ final ChannelSelector selector, final Map<String, String> params) {
+ T source;
+ try {
+ source = clazz.newInstance();
+ } catch (Exception ex) {
+ throw new FlumeException("Unable to create source " + name, ex);
+ }
+ source.setName(name);
+ Configurables.configure(source, createContext(params));
+ source.setChannelProcessor(new ChannelProcessor(selector));
+ return SourceRunner.forSource(source);
+ }
+
+ protected <T extends Sink> Sink configureSink(final String name, final Class<T> clazz,
+ final Channel channel,
+ final Map<String, String> params) {
+ T sink;
+ try {
+ sink = clazz.newInstance();
+ } catch (Exception ex) {
+ throw new FlumeException("Unable to create sink " + name, ex);
+ }
+ sink.setName(name);
+ Configurables.configure(sink, createContext(params));
+ sink.setChannel(channel);
+ return sink;
+ }
+
+ protected ChannelSelector createChannelSelector(Class<? extends ChannelSelector> clazz,
+ Map<String, String> params) {
+ ChannelSelector selector;
+ try {
+ selector = clazz.newInstance();
+ } catch (Exception ex) {
+ throw new FlumeException("Unable to create channel selector " + clazz.getName(), ex);
+ }
+ Configurables.configure(selector, createContext(params));
+ return selector;
+ }
+
+ /**
+ * Creates a List from a Varargs array.
+ *
+ * @param items The items to add to the list.
+ * @param <T> The type of objects in the List.
+ * @return a List containing the supplied items.
+ */
+ @SafeVarargs
+ protected final <T> List<T> listOf(T... items) {
+ return Arrays.asList(items);
+ }
+
+ private static Context createContext(Map<String, String> map) {
+ return map != null ? new Context(map) : new Context();
+ }
+}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/SpringConfiguration.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/SpringConfiguration.java
new file mode 100644
index 000000000..eac9a765a
--- /dev/null
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/config/SpringConfiguration.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot.config;
+
+import org.apache.flume.Channel;
+import org.apache.flume.SinkRunner;
+import org.apache.flume.SourceRunner;
+import org.apache.flume.node.MaterializedConfiguration;
+import org.apache.flume.node.SimpleMaterializedConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Map;
+
+/**
+ *
+ */
+@Configuration
+public class SpringConfiguration {
+
+ @Autowired
+ public Map<String, Channel> channels;
+
+ @Autowired
+ public Map<String, SinkRunner> sinkRunners;
+
+ @Autowired
+ public Map<String, SourceRunner> sourceRunners;
+
+ @Bean
+ public MaterializedConfiguration configuration() {
+ MaterializedConfiguration config = new SimpleMaterializedConfiguration();
+ for (Map.Entry<String, Channel> entry : channels.entrySet()) {
+ config.addChannel(entry.getKey(), entry.getValue());
+ }
+ for (Map.Entry<String, SinkRunner> entry : sinkRunners.entrySet()) {
+ config.addSinkRunner(entry.getKey(), entry.getValue());
+ }
+ for (Map.Entry<String, SourceRunner> entry : sourceRunners.entrySet()) {
+ config.addSourceRunner(entry.getKey(), entry.getValue());
+ }
+ return config;
+ }
+}
diff --git a/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/runner/SpringFlume.java b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/runner/SpringFlume.java
new file mode 100644
index 000000000..2ddecad29
--- /dev/null
+++ b/flume-spring-boot/src/main/java/org/apache/flume/spring/boot/runner/SpringFlume.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot.runner;
+
+import com.google.common.collect.Lists;
+import org.apache.flume.lifecycle.LifecycleAware;
+import org.apache.flume.node.Application;
+import org.apache.flume.node.MaterializedConfiguration;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.util.List;
+
+/**
+ *
+ */
+@Component
+public class SpringFlume {
+ private MaterializedConfiguration materializedConfiguration;
+
+ private final Application application;
+
+ @Autowired
+ public SpringFlume(MaterializedConfiguration configuration) {
+ this.materializedConfiguration = configuration;
+ List<LifecycleAware> components = Lists.newArrayList();
+ application = new Application(components);
+ }
+
+ @PostConstruct
+ public void startUp() {
+ application.start();
+ application.handleConfigurationEvent(materializedConfiguration);
+ }
+
+ @PreDestroy
+ public void shutdown() {
+ application.stop();
+ }
+
+
+}
diff --git a/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/AppTest.java b/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/AppTest.java
new file mode 100644
index 000000000..af2654348
--- /dev/null
+++ b/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/AppTest.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot;
+
+import org.apache.flume.node.MaterializedConfiguration;
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+/**
+ *
+ */
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+public class AppTest {
+
+ @Autowired
+ MaterializedConfiguration configuration;
+
+ @Test
+ public void contextLoads() {
+ Assertions.assertThat(configuration).isNotNull();
+ Assertions.assertThat(configuration.getSinkRunners()).isNotNull();
+ Assertions.assertThat(configuration.getSinkRunners().size()).isEqualTo(1);
+ }
+}
diff --git a/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/config/AppConfig.java b/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/config/AppConfig.java
new file mode 100644
index 000000000..cc9534376
--- /dev/null
+++ b/flume-spring-boot/src/test/java/org/apache/flume/spring/boot/config/AppConfig.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.flume.spring.boot.config;
+
+import org.apache.flume.Channel;
+import org.apache.flume.ChannelSelector;
+import org.apache.flume.Sink;
+import org.apache.flume.SinkProcessor;
+import org.apache.flume.SinkRunner;
+import org.apache.flume.SourceRunner;
+import org.apache.flume.channel.MemoryChannel;
+import org.apache.flume.channel.ReplicatingChannelSelector;
+import org.apache.flume.sink.DefaultSinkProcessor;
+import org.apache.flume.sink.NullSink;
+import org.apache.flume.source.SequenceGeneratorSource;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ */
+@Configuration
+public class AppConfig extends AbstractFlumeConfiguration {
+
+ @Bean
+ @ConfigurationProperties(prefix = "flume.sources.source1")
+ public Map<String, String> source1Properties() {
+ return new HashMap<>();
+ }
+
+ @Bean
+ @ConfigurationProperties(prefix = "flume.channels.channel1")
+ public Map<String, String> channel1Properties() {
+ return new HashMap<>();
+ }
+
+ @Bean
+ public Channel memoryChannel(Map<String, String> channel1Properties) {
+ return configureChannel("channel1", MemoryChannel.class, channel1Properties);
+ }
+
+ @Bean
+ public SourceRunner seqSource(Channel memoryChannel, Map<String, String> source1Properties) {
+ ChannelSelector selector = new ReplicatingChannelSelector();
+ selector.setChannels(listOf(memoryChannel));
+ return configureSource("source1", SequenceGeneratorSource.class, selector,
+ source1Properties);
+ }
+
+ @Bean
+ public SinkRunner nullSink(Channel memoryChannel) {
+ SinkProcessor sinkProcessor = new DefaultSinkProcessor();
+ Sink sink = configureSink("null", NullSink.class, memoryChannel,null);
+ sinkProcessor.setSinks(listOf(sink));
+ return new SinkRunner(sinkProcessor);
+ }
+}
diff --git a/flume-spring-boot/src/test/resources/application.yml b/flume-spring-boot/src/test/resources/application.yml
new file mode 100644
index 000000000..8e2e2e5ed
--- /dev/null
+++ b/flume-spring-boot/src/test/resources/application.yml
@@ -0,0 +1,8 @@
+
+flume:
+ sources:
+ source1:
+ totalEvents: 10000
+ channels:
+ channel1:
+ capacity: 10000
diff --git a/flume-spring-boot/src/test/resources/log4j2-test.xml b/flume-spring-boot/src/test/resources/log4j2-test.xml
new file mode 100644
index 000000000..d912f3105
--- /dev/null
+++ b/flume-spring-boot/src/test/resources/log4j2-test.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
+
+-->
+<Configuration status="ERROR">
+ <Appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5level: %msg%n%throwable" />
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.flume" level="INFO" />
+ <Root level="WARN">
+ <AppenderRef ref="Console" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4c657befc..edd28148b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@ limitations under the License.
<fasterxml.jackson.databind.version>2.13.2.1</fasterxml.jackson.databind.version>
<fest-reflect.version>1.4</fest-reflect.version>
<geronimo-jms.version>1.1.1</geronimo-jms.version>
- <gson.version>2.2.2</gson.version>
+ <gson.version>2.9.1</gson.version>
<guava.version>18.0</guava.version>
<guava-old.version>11.0.2</guava-old.version>
<hadoop.version>2.10.1</hadoop.version>
@@ -149,6 +149,7 @@ limitations under the License.
<module>flume-shared</module>
<module>flume-ng-configfilters</module>
<module>build-support</module>
+ <module>flume-spring-boot</module>
</modules>
<profiles>
[flume] 02/04: Update for release
Posted by rg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch flume-spring-boot
in repository https://gitbox.apache.org/repos/asf/flume.git
commit 4e4f5e562cb74654264b93667b8250433e957083
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Aug 13 10:56:02 2022 -0700
Update for release
---
CHANGELOG | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 1206ecdd0..1d69bdbfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,9 +2,11 @@ Release Notes - Flume - Version 1.10.1
** Bug
* [FLUME-3428] - Need better parameter validation
+ * [FLUME-3434] - TwitterSource exceptions on serialization
** Improvement
* [FLUME-3427] - Add support for JPMS
+ * [FLUME-3433] - Limit the default Lookups to a specific few.
Release Notes - Flume - Version 1.10.0