This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new 6f58877 Add runtime health endpoint #21
6f58877 is described below
commit 6f58877c47fc2c08c28093b213d6ab8cb0659da0
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Thu Feb 28 19:51:31 2019 +0100
Add runtime health endpoint #21
---
.../maven/processors/CatalogProcessor_2_x.java | 15 ++
.../maven/processors/CatalogProcessor_3_x.java | 15 ++
camel-k-runtime-bom/pom.xml | 11 +-
.../src/main/java/org/apache/camel/k/Runtime.java | 4 +-
.../apache/camel/k/listener/RoutesConfigurer.java | 8 +-
.../services/org.apache.camel.k.Runtime$Listener | 21 +++
camel-k-runtime-health/pom.xml | 135 ++++++++++++++
.../apache/camel/k/health/HealthConfigurer.java | 84 +++++++++
.../org/apache/camel/k/health/HealthEndpoint.java | 130 +++++++++++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
.../services/org.apache.camel.k.Runtime$Listener | 19 ++
.../java/org/apache/camel/k/health/HealthMain.java | 37 ++++
.../src/test/resources/log4j2-test.xml | 18 ++
.../java/org/apache/camel/k/jvm/Application.java | 12 +-
.../org/apache/camel/k/jvm/ApplicationRuntime.java | 26 ++-
pom.xml | 6 +
17 files changed, 738 insertions(+), 17 deletions(-)
diff --git
a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
index a48f819..3c73c70 100644
---
a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
+++
b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_2_x.java
@@ -159,6 +159,21 @@ public class CatalogProcessor_2_x implements
CatalogProcessor {
// ************************
//
+ // camel-k-runtime-health
+ //
+ // ************************
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-runtime-health");
+ artifact.addDependency("org.apache.camel", "camel-netty4-http");
+
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ // ************************
+ //
//
//
// ************************
diff --git
a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
index 94fd552..7f940a5 100644
---
a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
+++
b/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor_3_x.java
@@ -148,6 +148,21 @@ public class CatalogProcessor_3_x implements
CatalogProcessor {
// ************************
//
+ // camel-k-runtime-health
+ //
+ // ************************
+
+ {
+ CamelArtifact artifact = new CamelArtifact();
+ artifact.setGroupId("org.apache.camel.k");
+ artifact.setArtifactId("camel-k-runtime-health");
+ artifact.addDependency("org.apache.camel", "camel-netty4-http");
+
+ artifacts.put(artifact.getArtifactId(), artifact);
+ }
+
+ // ************************
+ //
//
//
// ************************
diff --git a/camel-k-runtime-bom/pom.xml b/camel-k-runtime-bom/pom.xml
index 3bfa694..ffa0a0c 100644
--- a/camel-k-runtime-bom/pom.xml
+++ b/camel-k-runtime-bom/pom.xml
@@ -30,7 +30,7 @@
<artifactId>camel-k-runtime-bom</artifactId>
<version>0.3.1-SNAPSHOT</version>
<packaging>pom</packaging>
-
+
<developers>
<developer>
<name>The Apache Camel Team</name>
@@ -43,12 +43,12 @@
</properties>
</developer>
</developers>
-
+
<issueManagement>
<system>github</system>
<url>https://github.com/apache/camel-k-runtime/issues</url>
</issueManagement>
-
+
<scm>
<connection>scm:git:http://gitbox.apache.org/repos/asf/camel-k-runtime.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/camel-k-runtime.git</developerConnection>
@@ -127,6 +127,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-health</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
<artifactId>camel-knative</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java
index d21e829..6afa3f2 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java
+++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/Runtime.java
@@ -44,7 +44,9 @@ public interface Runtime {
Starting,
ConfigureContext,
ConfigureRoutes,
- Started
+ Started,
+ Stopping,
+ Stopped
}
@FunctionalInterface
diff --git
a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesConfigurer.java
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesConfigurer.java
index 8c1b0eb..6f7a9f9 100644
---
a/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesConfigurer.java
+++
b/camel-k-runtime-core/src/main/java/org/apache/camel/k/listener/RoutesConfigurer.java
@@ -35,10 +35,10 @@ public class RoutesConfigurer extends AbstractPhaseListener
{
@Override
protected void accept(Runtime runtime) {
- final String routes = System.getenv(Constants.ENV_CAMEL_K_ROUTES);
+ final String routes =
System.getenv().getOrDefault(Constants.ENV_CAMEL_K_ROUTES, "");
if (ObjectHelper.isEmpty(routes)) {
- LOGGER.warn("No valid routes found in {} environment variable",
Constants.ENV_CAMEL_K_ROUTES);
+ LOGGER.warn("No routes found in {} environment variable",
Constants.ENV_CAMEL_K_ROUTES);
}
load(runtime, routes.split(",", -1));
@@ -46,6 +46,10 @@ public class RoutesConfigurer extends AbstractPhaseListener {
protected void load(Runtime runtime, String[] routes) {
for (String route: routes) {
+ if (ObjectHelper.isEmpty(route)) {
+ continue;
+ }
+
final Source source;
final RoutesLoader loader;
final RouteBuilder builder;
diff --git
a/camel-k-runtime-core/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
b/camel-k-runtime-core/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
new file mode 100644
index 0000000..75acf2b
--- /dev/null
+++
b/camel-k-runtime-core/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
@@ -0,0 +1,21 @@
+#
+# 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.camel.k.listener.ContextConfigurer
+org.apache.camel.k.listener.ContextLifecycleConfigurer
+org.apache.camel.k.listener.RoutesConfigurer
+org.apache.camel.k.listener.RoutesDumper
diff --git a/camel-k-runtime-health/pom.xml b/camel-k-runtime-health/pom.xml
new file mode 100644
index 0000000..9776afc
--- /dev/null
+++ b/camel-k-runtime-health/pom.xml
@@ -0,0 +1,135 @@
+<?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>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-parent</artifactId>
+ <version>0.3.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-k-runtime-health</artifactId>
+
+ <dependencies>
+
+ <!-- ****************************** -->
+ <!-- -->
+ <!-- RUNTIME -->
+ <!-- -->
+ <!-- ****************************** -->
+
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-netty4-http</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- ****************************** -->
+ <!-- -->
+ <!-- TESTS -->
+ <!-- -->
+ <!-- ****************************** -->
+
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-jvm</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <profiles>
+ <profile>
+ <id>camel3</id>
+ <activation>
+ <property>
+ <name>camel3</name>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- runtime -->
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-adapter-camel-3</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- test -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-properties</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>camel2</id>
+ <activation>
+ <property>
+ <name>!camel3</name>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- runtime -->
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-adapter-camel-2</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
diff --git
a/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthConfigurer.java
b/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthConfigurer.java
new file mode 100644
index 0000000..cea94fe
--- /dev/null
+++
b/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthConfigurer.java
@@ -0,0 +1,84 @@
+/**
+ * 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.camel.k.health;
+
+import org.apache.camel.k.Runtime;
+import org.apache.camel.spi.HasId;
+
+public class HealthConfigurer implements Runtime.Listener, HasId {
+ public static final String ID = "endpoint.health";
+ public static final String DEFAULT_BIND_HOST = "0.0.0.0";
+ public static final int DEFAULT_BIND_PORT = 8081;
+ public static final String DEFAULT_PATH = "/health";
+
+ private HealthEndpoint endpoint;
+
+ private String bindHost;
+ private int bindPort;
+ private String path;
+
+ public HealthConfigurer() {
+ this.bindHost = DEFAULT_BIND_HOST;
+ this.bindPort = DEFAULT_BIND_PORT;
+ this.path = DEFAULT_PATH;
+ }
+
+ public String getBindHost() {
+ return bindHost;
+ }
+
+ public void setBindHost(String bindHost) {
+ this.bindHost = bindHost;
+ }
+
+ public int getBindPort() {
+ return bindPort;
+ }
+
+ public void setBindPort(int bindPort) {
+ this.bindPort = bindPort;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ @Override
+ public void accept(Runtime.Phase phase, Runtime runtime) {
+ try {
+ if (phase == Runtime.Phase.Starting) {
+ endpoint = new HealthEndpoint(runtime.getContext(), bindHost,
bindPort, path);
+ endpoint.start();
+ } else if (phase == Runtime.Phase.Stopping) {
+ if (endpoint != null) {
+ endpoint.stop();
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public String getId() {
+ return ID;
+ }
+}
diff --git
a/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthEndpoint.java
b/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthEndpoint.java
new file mode 100644
index 0000000..995f071
--- /dev/null
+++
b/camel-k-runtime-health/src/main/java/org/apache/camel/k/health/HealthEndpoint.java
@@ -0,0 +1,130 @@
+/**
+ * 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.camel.k.health;
+
+import java.util.Objects;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpServerCodec;
+import io.netty.handler.codec.http.HttpServerExpectContinueHandler;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.logging.LogLevel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.util.AsciiString;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.support.ServiceSupport;
+
+public class HealthEndpoint extends ServiceSupport {
+ private static final AsciiString CONTENT_TYPE =
AsciiString.cached("Content-Type");
+ private static final AsciiString CONTENT_LENGTH =
AsciiString.cached("Content-Length");
+ private static final byte[] OK = {'O', 'K'};
+ private static final byte[] KO = {'K', 'O'};
+
+ private final CamelContext context;
+ private final String bindHost;
+ private final int bindPort;
+ private final String path;
+
+ private EventLoopGroup bossGroup;
+ private EventLoopGroup workerGroup;
+ private Channel channel;
+
+ public HealthEndpoint(CamelContext context, String bindHost, int bindPort,
String path) {
+ this.context = context;
+ this.bindHost = bindHost;
+ this.bindPort = bindPort;
+ this.path = path;
+ }
+
+ @Override
+ protected void doStart() throws Exception {
+ bossGroup = new NioEventLoopGroup(1);
+ workerGroup = new NioEventLoopGroup();
+
+ ServerBootstrap b = new ServerBootstrap();
+ b.group(bossGroup, workerGroup)
+ .channel(NioServerSocketChannel.class)
+ .handler(new LoggingHandler(LogLevel.DEBUG))
+ .childHandler(new ChannelInitializer<SocketChannel>() {
+ @Override
+ protected void initChannel(SocketChannel ch) throws Exception {
+ ch.pipeline()
+ .addLast(new HttpServerCodec())
+ .addLast(new HttpServerExpectContinueHandler())
+ .addLast(new Handler());
+ }
+ });
+
+ channel = b.bind(bindHost, bindPort).channel();
+ }
+
+ @Override
+ protected void doStop() throws Exception {
+ if (bossGroup != null) {
+ bossGroup.shutdownGracefully();
+ }
+ if (workerGroup != null) {
+ workerGroup.shutdownGracefully();
+ }
+ }
+
+ private class Handler extends SimpleChannelInboundHandler<HttpRequest> {
+ @Override
+ public void channelReadComplete(ChannelHandlerContext ctx) {
+ ctx.flush();
+ }
+
+ @Override
+ protected void channelRead0(ChannelHandlerContext ctx, HttpRequest
msg) throws Exception {
+ HttpResponseStatus status;
+ ByteBuf content;
+
+ if (!Objects.equals(path, msg.uri())) {
+ status = HttpResponseStatus.NOT_FOUND;
+ content = Unpooled.wrappedBuffer(KO);
+ } else if (context.getStatus() == ServiceStatus.Started) {
+ status = HttpResponseStatus.OK;
+ content = Unpooled.wrappedBuffer(OK);
+ } else {
+ status = HttpResponseStatus.SERVICE_UNAVAILABLE;
+ content = Unpooled.wrappedBuffer(KO);
+ }
+
+ FullHttpResponse response = new
DefaultFullHttpResponse(HttpVersion.HTTP_1_1, status, content);
+ response.headers().set(CONTENT_TYPE, "text/plain");
+ response.headers().setInt(CONTENT_LENGTH,
response.content().readableBytes());
+
+ ctx.write(response).addListener(ChannelFutureListener.CLOSE);
+ }
+ }
+}
diff --git a/camel-k-runtime-health/src/main/resources/META-INF/LICENSE.txt
b/camel-k-runtime-health/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/camel-k-runtime-health/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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
+
+ 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.
+
diff --git a/camel-k-runtime-health/src/main/resources/META-INF/NOTICE.txt
b/camel-k-runtime-health/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/camel-k-runtime-health/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
diff --git
a/camel-k-runtime-health/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
b/camel-k-runtime-health/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
new file mode 100644
index 0000000..10ba5ec
--- /dev/null
+++
b/camel-k-runtime-health/src/main/resources/META-INF/services/org.apache.camel.k.Runtime$Listener
@@ -0,0 +1,19 @@
+#
+# 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.camel.k.health.HealthConfigurer
+
diff --git
a/camel-k-runtime-health/src/test/java/org/apache/camel/k/health/HealthMain.java
b/camel-k-runtime-health/src/test/java/org/apache/camel/k/health/HealthMain.java
new file mode 100644
index 0000000..3f0062c
--- /dev/null
+++
b/camel-k-runtime-health/src/test/java/org/apache/camel/k/health/HealthMain.java
@@ -0,0 +1,37 @@
+/**
+ * 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.camel.k.health;
+
+import java.util.Properties;
+import java.util.ServiceLoader;
+
+import org.apache.camel.k.Runtime;
+import org.apache.camel.k.jvm.ApplicationRuntime;
+
+public class HealthMain {
+ public static void main(String[] args) throws Exception {
+ Properties p = new Properties();
+ p.setProperty("endpoint.health.bindHost", "localhost");
+ p.setProperty("endpoint.health.bindPort", "9988");
+ p.setProperty("endpoint.health.path", "/ht");
+
+ ApplicationRuntime runtime = new ApplicationRuntime();
+ runtime.setProperties(p);
+ runtime.addListeners(ServiceLoader.load(Runtime.Listener.class));
+ runtime.run();
+ }
+}
diff --git a/camel-k-runtime-health/src/test/resources/log4j2-test.xml
b/camel-k-runtime-health/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..fb3238e
--- /dev/null
+++ b/camel-k-runtime-health/src/test/resources/log4j2-test.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS}|%-5level|%t|%c{1} -
%msg%n"/>
+ </Console>
+ <Null name="NONE"/>
+ </Appenders>
+
+ <Loggers>
+ <Logger name="io.netty" level="DEBUG"/>
+ <Root level="INFO">
+ <!--<AppenderRef ref="STDOUT"/>-->
+ <AppenderRef ref="NONE"/>
+ </Root>
+ </Loggers>
+
+</Configuration>
\ No newline at end of file
diff --git
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
index eefed2d..c28d5f9 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
+++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/Application.java
@@ -16,10 +16,9 @@
*/
package org.apache.camel.k.jvm;
-import org.apache.camel.k.listener.ContextConfigurer;
-import org.apache.camel.k.listener.ContextLifecycleConfigurer;
-import org.apache.camel.k.listener.RoutesConfigurer;
-import org.apache.camel.k.listener.RoutesDumper;
+import java.util.ServiceLoader;
+
+import org.apache.camel.k.Runtime;
import org.apache.camel.k.support.PlatformStreamHandler;
import org.apache.camel.k.support.RuntimeSupport;
@@ -49,10 +48,7 @@ public class Application {
public static void main(String[] args) throws Exception {
ApplicationRuntime runtime = new ApplicationRuntime();
runtime.setProperties(RuntimeSupport.loadProperties());
- runtime.addListener(new ContextConfigurer());
- runtime.addListener(new ContextLifecycleConfigurer());
- runtime.addListener(new RoutesConfigurer());
- runtime.addListener(new RoutesDumper());
+ runtime.addListeners(ServiceLoader.load(Runtime.Listener.class));
runtime.run();
}
}
diff --git
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
index 97cb805..2bbb542 100644
---
a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
+++
b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
@@ -27,11 +27,17 @@ import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.k.InMemoryRegistry;
import org.apache.camel.k.Runtime;
+import org.apache.camel.k.support.RuntimeSupport;
import org.apache.camel.main.MainSupport;
+import org.apache.camel.spi.HasId;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.function.ThrowingConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class ApplicationRuntime implements Runtime {
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ApplicationRuntime.class);
+
private final Main main;
private final ConcurrentMap<String, CamelContext> contextMap;
private final Runtime.Registry registry;
@@ -70,7 +76,22 @@ public final class ApplicationRuntime implements Runtime {
this.main.stop();
}
+ public void addListeners(Iterable<Runtime.Listener> listeners) {
+ listeners.forEach(this::addListener);
+ }
+
public void addListener(Runtime.Listener listener) {
+ if (listener instanceof HasId) {
+ String id = ((HasId) listener).getId();
+ if (!id.endsWith(".")) {
+ id = id + ".";
+ }
+
+ RuntimeSupport.bindProperties(getContext(), listener, id);
+ }
+
+ LOGGER.info("Add listener: {}", listener);
+
this.listeners.add(listener);
}
@@ -124,7 +145,6 @@ public final class ApplicationRuntime implements Runtime {
}
private class MainListenerAdapter implements
org.apache.camel.main.MainListener {
-
@Override
public void beforeStart(MainSupport main) {
listeners.forEach(l -> l.accept(Phase.Starting,
ApplicationRuntime.this));
@@ -143,12 +163,12 @@ public final class ApplicationRuntime implements Runtime {
@Override
public void beforeStop(MainSupport main) {
-
+ listeners.forEach(l -> l.accept(Phase.Stopping,
ApplicationRuntime.this));
}
@Override
public void afterStop(MainSupport main) {
-
+ listeners.forEach(l -> l.accept(Phase.Stopped,
ApplicationRuntime.this));
}
}
}
diff --git a/pom.xml b/pom.xml
index 9c5222e..6443637 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
<module>camel-k-runtime-yaml</module>
<module>camel-k-runtime-spring-boot-layout</module>
<module>camel-k-runtime-spring-boot</module>
+ <module>camel-k-runtime-health</module>
<module>camel-knative-http</module>
<module>camel-knative</module>
<module>camel-k-runtime-bom</module>
@@ -214,6 +215,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.k</groupId>
+ <artifactId>camel-k-runtime-health</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.k</groupId>
<artifactId>camel-knative</artifactId>
<version>${project.version}</version>
</dependency>
