diff --git a/besu/build.gradle b/besu/build.gradle index a76d7c2518..acd6e19b1d 100644 --- a/besu/build.gradle +++ b/besu/build.gradle @@ -65,6 +65,7 @@ dependencies { implementation 'org.springframework.security:spring-security-crypto' runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl' + runtimeOnly 'com.splunk.logging:splunk-library-javalogging' testImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts') testImplementation project(path: ':crypto', configuration: 'testSupportArtifacts') diff --git a/besu/src/main/resources/log4j2.xml b/besu/src/main/resources/log4j2.xml index af05117015..8838ce7ecf 100644 --- a/besu/src/main/resources/log4j2.xml +++ b/besu/src/main/resources/log4j2.xml @@ -1,16 +1,50 @@ - INFO + ${env:LOG_LEVEL:-INFO} + ${env:LOGGER:-Console} + ${env:HOST:-${docker:containerId:-localhost}} + ${env:SPLUNK_URL} + ${env:SPLUNK_TOKEN} + ${env:SPLUNK_INDEX} + ${env:SPLUNK_SOURCE:-besu} + ${env:SPLUNK_SOURCETYPE:-besu} + ${env:SPLUNK_BATCH_SIZE_BYTES:-65536} + ${env:SPLUNK_BATCH_SIZE_COUNT:-1000} + ${env:SPLUNK_BATCH_INTERVAL:-500} + ${env:SPLUNK_SKIPTLSVERIFY:-false} - + + + + + + + + + + + + + - + diff --git a/build.gradle b/build.gradle index a511b3b11d..026baace37 100644 --- a/build.gradle +++ b/build.gradle @@ -124,7 +124,7 @@ allprojects { mavenCentral() mavenLocal() maven { url "https://consensys.bintray.com/pegasys-repo" } - maven { url "https://repository.apache.org/content/repositories/snapshots/" } + maven { url "https://repo.spring.io/libs-release" } } dependencies { errorprone "com.google.errorprone:error_prone_core" } diff --git a/gradle/check-licenses.gradle b/gradle/check-licenses.gradle index d2743fb835..e2d7cd93f4 100644 --- a/gradle/check-licenses.gradle +++ b/gradle/check-licenses.gradle @@ -58,6 +58,7 @@ downloadLicenses { reportByLicenseType = true dependencyConfiguration = 'testCompile' + ext.epl1 = license('Eclipse Public License 1.0', 'https://www.eclipse.org/legal/epl-v10.html') ext.apache = license('Apache License, Version 2.0', 'http://opensource.org/licenses/Apache-2.0') ext.mit = license('MIT License', 'http://www.opensource.org/licenses/mit-license.php') ext.bsd = license('BSD License', 'http://www.opensource.org/licenses/bsd-license.php') @@ -65,6 +66,10 @@ downloadLicenses { ext.cddl = license('Common Development and Distribution License 1.0', 'http://opensource.org/licenses/CDDL-1.0') ext.cc0 = license('Public Domain (CC0) License 1.0', 'https://creativecommons.org/publicdomain/zero/1.0') aliases = [ + (epl1) : [ + 'Eclipse Public License - v 1.0', + 'Eclipse Public License 1.0', + ], (apache) : [ 'The Apache Software License, Version 2.0', 'The Apache Software License, version 2.0', @@ -108,6 +113,10 @@ downloadLicenses { // RocksDB is dual licensed under Apache v2.0 and GPL 2 licenses // Explicitly declare that we are using the Apache v2.0 license (group('org.rocksdb')) : apache, + + // Logback is dual licensed under EPL v1.0 and LGPL v2.1 + // Explicitly declare that we are using the EPL v1.0 license + (group('ch.qos.logback')) : epl1, ] } diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 2e06303463..f39a7e6c12 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -30,6 +30,8 @@ dependencyManagement { dependency 'com.graphql-java:graphql-java:13.0' + dependency 'com.splunk.logging:splunk-library-javalogging:1.8.0' + dependency 'com.squareup.okhttp3:okhttp:4.2.2' dependency 'commons-cli:commons-cli:1.4'