Commit e5e1da14 authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'patch_to_enableBean_conditionally' into 'master'

patch to conditionally enable this bean. [no rc]

See merge request !128
parents f4e9958c 981deb63
Pipeline #53783 failed with stages
in 10 minutes and 2 seconds
......@@ -23,8 +23,8 @@ The following software have components provided under the terms of this license:
- Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Asynchronous Http Client (from )
- Asynchronous Http Client Netty Utils (from )
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)
- Bean Validation API (from http://beanvalidation.org)
- Brave Instrumentation: Http Adapters (from )
- Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty)
......@@ -55,7 +55,7 @@ The following software have components provided under the terms of this license:
- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base)
- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations)
- Jackson-annotations (from http://wiki.fasterxml.com/JacksonHome)
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-core (from http://wiki.fasterxml.com/JacksonHome)
- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding)
- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
......@@ -78,8 +78,8 @@ The following software have components provided under the terms of this license:
- Lucene Grouping (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-grouping)
- Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter)
- Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs)
- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory)
- Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
- Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries)
- Lucene QueryParsers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queryparser)
......@@ -122,6 +122,7 @@ The following software have components provided under the terms of this license:
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database)
- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
- SnakeYAML (from http://code.google.com/p/snakeyaml/)
......@@ -171,7 +172,6 @@ The following software have components provided under the terms of this license:
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
- org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
- parent-join (from https://github.com/elastic/elasticsearch)
- proton-j (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
- rank-eval (from https://github.com/elastic/elasticsearch)
- rest (from https://github.com/elastic/elasticsearch)
- rest-high-level (from https://github.com/elastic/elasticsearch)
......@@ -184,7 +184,7 @@ The following software have components provided under the terms of this license:
- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
- swagger-jaxrs (from )
- tomcat-embed-core (from http://tomcat.apache.org/)
- tomcat-embed-websocket (from http://tomcat.apache.org/)
- tomcat-embed-websocket (from https://tomcat.apache.org/)
========================================================================
BSD-2-Clause
......@@ -482,7 +482,7 @@ public-domain
========================================================================
The following software have components provided under the terms of this license:
- Asynchronous Http Client (from )
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Joda-Time (from https://www.joda.org/joda-time/)
......
# Enable Logging For Health Check Failures
<ol>
<li> Ensure instructions from doc <a ref="docs/01_Using_Common_Properties.md">01_Using_Common_Properties.md </a>of core-lib-azure is implemented.<br/>
<li>Ensure your service is running with SpringBoot version 2.4 or higher</li>
<li>Follow instructions from doc <a ref="docs/01_Using_Common_Properties.md">01_Using_Common_Properties.md </a>of core-lib-azure is implemented.<br/>
This is to enable actuator to run on a different port.
</li>
<li> Define Liveness and Readiness probes:
......
......@@ -23,6 +23,7 @@ import org.springframework.boot.actuate.health.HealthContributorRegistry;
import org.springframework.boot.actuate.health.HealthEndpointGroups;
import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
import org.springframework.boot.actuate.health.Status;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Configuration;
import java.util.Map;
......@@ -32,6 +33,7 @@ import java.util.Map;
* All services can pick up this class from core-lib-azure from the usual dependency that’s added.
*/
@Configuration
@ConditionalOnProperty(value = "azure.health.endpoint.enabled", havingValue = "true", matchIfMissing = false)
public class AzureHealthEndpointWebExtension extends HealthEndpointWebExtension {
private static final String LOGGER_NAME = AzureHealthEndpointWebExtension.class.getName();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment