From: Kevin Smokowski Date: Mon, 2 Mar 2020 21:13:03 +0000 (+0000) Subject: Merge "Migrate logging-analytics docs" X-Git-Tag: 1.6.6~3 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=434447d617d37126aa6dfd5c3b2d8f3c8fb24d3e;hp=df548e043991fcefbbf772ed432e5abd2a34b5ad;p=logging-analytics.git Merge "Migrate logging-analytics docs" --- diff --git a/.gitignore b/.gitignore index 8a809f2..568d66a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,27 @@ -.idea +# Maven +target/ +build/ + +# Vagrant +.vagrant + +# IntelliJ +.idea/ +*.iml + +# Eclipse .project .classpath .settings -*.iml + +# Python +.tox/ +__pycache__/ +*.pyc + npm-debug.log node_modules/ node_install/ test_output/ test-output/ -target/ -dist/ - +dist/ \ No newline at end of file diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..9587901 --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=logging-analytics.git +defaultbranch=master diff --git a/pom.xml b/pom.xml index 06db3b3..357f439 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.logging-analytics logging-analytics - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT pom logging-analytics diff --git a/pylog/.gitignore b/pylog/.gitignore new file mode 100644 index 0000000..9d5ff4e --- /dev/null +++ b/pylog/.gitignore @@ -0,0 +1,4 @@ +.coverage +.tox/ +__pycache__/ +tests/__pycache__/ diff --git a/pylog/pom.xml b/pylog/pom.xml index f886bfa..5b460f2 100644 --- a/pylog/pom.xml +++ b/pylog/pom.xml @@ -15,17 +15,15 @@ 4.0.0 - org.onap.oparent - oparent - 2.0.0 + org.onap.logging-analytics + logging-analytics + 1.6.6-SNAPSHOT - org.onap.logging-analytics logging-pylog - 1.6.1 pom - logging-pylog + logging-analytics :: ${project.artifactId} onap python logging library diff --git a/pylog/setup.py b/pylog/setup.py index 99669fd..1246284 100644 --- a/pylog/setup.py +++ b/pylog/setup.py @@ -21,7 +21,7 @@ setup( long_description="python-package onappylog could be used in any python" "project to record MDC information and reload logging" "at runtime", - version="1.0.7", + version="1.6.6", license="Apache 2.0", author='ke liang', author_email="lokyse@163.com", diff --git a/pylog/tox.ini b/pylog/tox.ini index 14ebfd0..87209a1 100644 --- a/pylog/tox.ini +++ b/pylog/tox.ini @@ -1,29 +1,37 @@ [tox] -envlist =py,py3,pep8 +envlist = + testenv, + jenkins, + pep8 + flake8 + cover skipsdist = true skip_missing_interpreters = true [tox:jenkins] +basepython = python3 downloadcache = ~/cache/pip [testenv] +basepython = python3 deps = -r{toxinidir}/requirements.txt pytest coverage pytest-cov setenv = PYTHONPATH={toxinidir}/ -commands = - /usr/bin/find . -type f -name "*.py[c|o]" -not -path "./.tox" -delete - py.test +commands = pytest [testenv:pep8] +basepython = python3 deps=flake8 commands=flake8 [flake8] +basepython = python3 show-source = true exclude = env,venv,.venv,.git,.tox,dist,doc,*egg,build [testenv:cover] +basepython = python3 commands = py.test --cov onaplogging diff --git a/pylog/version.properties b/pylog/version.properties index 176b32a..a9d88b5 100644 --- a/pylog/version.properties +++ b/pylog/version.properties @@ -18,8 +18,8 @@ # because they are used in Jenkins, whose plug-in doesn't support # 1.2.6-SNAPSHOT is off 1.2.2 major=1 -minor=4 -patch=0 +minor=6 +patch=6 base_version=${major}.${minor}.${patch} diff --git a/reference/.classpath b/reference/.classpath deleted file mode 100644 index 1767a9d..0000000 --- a/reference/.classpath +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/reference/.gitignore b/reference/.gitignore deleted file mode 100644 index 99d2bb1..0000000 --- a/reference/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/build/ diff --git a/reference/.project b/reference/.project deleted file mode 100644 index 15686ec..0000000 --- a/reference/.project +++ /dev/null @@ -1,44 +0,0 @@ - - - logging-reference - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.springframework.ide.eclipse.core.springnature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - net.sf.eclipsecs.core.CheckstyleNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/reference/logging-demo/.classpath b/reference/logging-demo/.classpath deleted file mode 100644 index 407b61f..0000000 --- a/reference/logging-demo/.classpath +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/reference/logging-demo/.gitignore b/reference/logging-demo/.gitignore deleted file mode 100644 index eeca7fe..0000000 --- a/reference/logging-demo/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/target/ -/build/ -/bin/ diff --git a/reference/logging-demo/.project b/reference/logging-demo/.project deleted file mode 100644 index ee4ad0b..0000000 --- a/reference/logging-demo/.project +++ /dev/null @@ -1,44 +0,0 @@ - - - logging-demo - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.springframework.ide.eclipse.core.springnature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - net.sf.eclipsecs.core.CheckstyleNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/reference/logging-demo/pom.xml b/reference/logging-demo/pom.xml index 4016c3a..ee5470d 100644 --- a/reference/logging-demo/pom.xml +++ b/reference/logging-demo/pom.xml @@ -5,13 +5,13 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-demo war - logging-demo + logging-analytics :: ${project.artifactId} 2.8.6 @@ -223,12 +223,6 @@ 1.6.4 test - - junit - junit - 4.12 - test - diff --git a/reference/logging-docker-root/.project b/reference/logging-docker-root/.project deleted file mode 100644 index f1679d2..0000000 --- a/reference/logging-docker-root/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - logging-docker-root - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/reference/logging-docker-root/pom.xml b/reference/logging-docker-root/pom.xml index 1c2d482..5c0c535 100644 --- a/reference/logging-docker-root/pom.xml +++ b/reference/logging-docker-root/pom.xml @@ -5,11 +5,11 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-docker-root pom - logging-docker-root + logging-analytics :: ${project.artifactId} diff --git a/reference/logging-filter/logging-filter-base/pom.xml b/reference/logging-filter/logging-filter-base/pom.xml index e01ea0c..7bd9340 100644 --- a/reference/logging-filter/logging-filter-base/pom.xml +++ b/reference/logging-filter/logging-filter-base/pom.xml @@ -5,11 +5,13 @@ org.onap.logging-analytics logging-filter-parent - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-filter-base + logging-analytics :: ${project.artifactId} + javax.annotation @@ -36,11 +38,6 @@ log4j-slf4j-impl test - - junit - junit - test - org.glassfish.jersey.core jersey-client @@ -53,10 +50,5 @@ 2.10.0 test - - org.mockito - mockito-core - test - diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java index 0c0f5c4..e8d2813 100644 --- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java +++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/PayloadLoggingServletFilter.java @@ -22,18 +22,51 @@ package org.onap.logging.filter.base; -import javax.servlet.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintWriter; +import java.util.zip.GZIPInputStream; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ReadListener; +import javax.servlet.ServletException; +import javax.servlet.ServletInputStream; +import javax.servlet.ServletOutputStream; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.WriteListener; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import java.io.*; -import java.util.zip.GZIPInputStream; public class PayloadLoggingServletFilter extends AbstractServletFilter implements Filter { private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(PayloadLoggingServletFilter.class); + private static final int defaultMaxSize = 100000; + private static Integer maxResponseSize; + private static Integer maxRequestSize; + + public PayloadLoggingServletFilter() { + String maxRequestSizeOverride = System.getProperty("FILTER_MAX_REQUEST_SIZE"); + if (maxRequestSizeOverride != null) { + maxRequestSize = Integer.valueOf(maxRequestSizeOverride); + } else { + maxRequestSize = defaultMaxSize; + } + String maxResponseSizeOverride = System.getProperty("FILTER_MAX_RESPONSE_SIZE"); + if (maxResponseSizeOverride != null) { + maxResponseSize = Integer.valueOf(maxResponseSizeOverride); + } else { + maxResponseSize = defaultMaxSize; + } + } private static class ByteArrayServletStream extends ServletOutputStream { ByteArrayOutputStream baos; @@ -194,7 +227,13 @@ public class PayloadLoggingServletFilter extends AbstractServletFilter implement requestHeaders.append(getSecureRequestHeaders(httpRequest)); log.info(requestHeaders.toString()); - log.info("REQUEST BODY|{}", new String(bufferedRequest.getBuffer())); + + byte[] buffer = bufferedRequest.getBuffer(); + if (buffer.length < maxRequestSize) { + log.info("REQUEST BODY|{}", new String(buffer)); + } else { + log.info("REQUEST BODY|{}", new String(buffer, 0, maxRequestSize)); + } final HttpServletResponse response = (HttpServletResponse) servletResponse; final ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -242,7 +281,11 @@ public class PayloadLoggingServletFilter extends AbstractServletFilter implement if ("gzip".equals(response.getHeader("Content-Encoding"))) { log.info("UNGZIPED RESPONSE BODY|{}", decompressGZIPByteArray(bytes)); } else { - log.info("RESPONSE BODY|{}", new String(bytes)); + if (bytes.length < maxResponseSize) { + log.info("RESPONSE BODY|{}", new String(bytes)); + } else { + log.info("RESPONSE BODY|{}", new String(bytes, 0, maxResponseSize)); + } } if (pw.hasErrored()) { diff --git a/reference/logging-filter/logging-filter-spring/pom.xml b/reference/logging-filter/logging-filter-spring/pom.xml index 3f7c659..8d971d1 100644 --- a/reference/logging-filter/logging-filter-spring/pom.xml +++ b/reference/logging-filter/logging-filter-spring/pom.xml @@ -5,11 +5,13 @@ org.onap.logging-analytics logging-filter-parent - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-filter-spring + logging-analytics :: ${project.artifactId} + @@ -52,20 +54,10 @@ log4j-slf4j-impl test - - junit - junit - test - org.glassfish.jersey.core jersey-client test - - org.mockito - mockito-core - test - diff --git a/reference/logging-filter/pom.xml b/reference/logging-filter/pom.xml index a25c9a5..e518620 100644 --- a/reference/logging-filter/pom.xml +++ b/reference/logging-filter/pom.xml @@ -5,12 +5,14 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-filter-parent pom + logging-analytics :: ${project.artifactId} + logging-filter-base logging-filter-spring @@ -59,18 +61,6 @@ 2.11.2 test - - junit - junit - 4.11 - test - - - org.mockito - mockito-core - 2.15.0 - test - @@ -100,13 +90,13 @@ - diff --git a/reference/logging-kubernetes/.project b/reference/logging-kubernetes/.project deleted file mode 100644 index a7ec855..0000000 --- a/reference/logging-kubernetes/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - logging-kubernetes - - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.m2e.core.maven2Nature - - diff --git a/reference/logging-kubernetes/pom.xml b/reference/logging-kubernetes/pom.xml index 764502e..d1b8f2d 100644 --- a/reference/logging-kubernetes/pom.xml +++ b/reference/logging-kubernetes/pom.xml @@ -5,11 +5,11 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-kubernetes pom - logging-kubernetes + logging-analytics :: ${project.artifactId} diff --git a/reference/logging-library/.classpath b/reference/logging-library/.classpath deleted file mode 100644 index 7a80cdf..0000000 --- a/reference/logging-library/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/reference/logging-library/.gitignore b/reference/logging-library/.gitignore deleted file mode 100644 index 99d2bb1..0000000 --- a/reference/logging-library/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/build/ diff --git a/reference/logging-library/.project b/reference/logging-library/.project deleted file mode 100644 index 5ffa62b..0000000 --- a/reference/logging-library/.project +++ /dev/null @@ -1,53 +0,0 @@ - - - logging-library - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.springframework.ide.eclipse.core.springnature - net.sf.eclipsecs.core.CheckstyleNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/reference/logging-library/pom.xml b/reference/logging-library/pom.xml index 306a934..5e848ec 100644 --- a/reference/logging-library/pom.xml +++ b/reference/logging-library/pom.xml @@ -5,13 +5,13 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-library jar - logging-library + logging-analytics :: ${project.artifactId} 5.1.2.RELEASE diff --git a/reference/logging-mock-service/.classpath b/reference/logging-mock-service/.classpath deleted file mode 100644 index f941705..0000000 --- a/reference/logging-mock-service/.classpath +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/reference/logging-mock-service/.gitignore b/reference/logging-mock-service/.gitignore deleted file mode 100644 index 99d2bb1..0000000 --- a/reference/logging-mock-service/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/target/ -/build/ diff --git a/reference/logging-mock-service/.project b/reference/logging-mock-service/.project deleted file mode 100644 index 8e8b873..0000000 --- a/reference/logging-mock-service/.project +++ /dev/null @@ -1,53 +0,0 @@ - - - logging-mock-service - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - net.sf.eclipsecs.core.CheckstyleBuilder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - org.springframework.ide.eclipse.core.springbuilder - - - - - org.springframework.ide.eclipse.boot.validation.springbootbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.springframework.ide.eclipse.core.springnature - net.sf.eclipsecs.core.CheckstyleNature - org.eclipse.m2e.core.maven2Nature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/reference/logging-mock-service/pom.xml b/reference/logging-mock-service/pom.xml index e31ff85..b5914fb 100644 --- a/reference/logging-mock-service/pom.xml +++ b/reference/logging-mock-service/pom.xml @@ -5,13 +5,13 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-mock-service jar - logging-mock-service + logging-analytics :: ${project.artifactId} diff --git a/reference/logging-slf4j-demo/pom.xml b/reference/logging-slf4j-demo/pom.xml index 1f73277..310efce 100644 --- a/reference/logging-slf4j-demo/pom.xml +++ b/reference/logging-slf4j-demo/pom.xml @@ -5,17 +5,17 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT .. logging-slf4j-demo war - logging-slf4j-demo + logging-analytics :: ${project.artifactId} - 1.5.22.RELEASE 5.1.2.RELEASE @@ -139,7 +139,9 @@ + org.apache.maven.plugins maven-war-plugin + 3.2.3 diff --git a/reference/logging-slf4j/pom.xml b/reference/logging-slf4j/pom.xml index 85cbd54..3b1e2ae 100644 --- a/reference/logging-slf4j/pom.xml +++ b/reference/logging-slf4j/pom.xml @@ -5,13 +5,13 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-slf4j jar - logging-slf4j + logging-analytics :: ${project.artifactId} 5.0.9.RELEASE diff --git a/reference/pom.xml b/reference/pom.xml index 50c572b..4dfdf0a 100644 --- a/reference/pom.xml +++ b/reference/pom.xml @@ -5,13 +5,13 @@ org.onap.logging-analytics logging-analytics - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-reference pom - logging-reference + logging-analytics :: ${project.artifactId} logging-demo @@ -42,6 +42,12 @@ 4.12 test + + org.mockito + mockito-core + 2.23.4 + test + diff --git a/reference/provider/pom.xml b/reference/provider/pom.xml index 487d5c1..28cf743 100644 --- a/reference/provider/pom.xml +++ b/reference/provider/pom.xml @@ -5,11 +5,11 @@ org.onap.logging-analytics logging-reference - 1.6.3-SNAPSHOT + 1.6.6-SNAPSHOT logging-provider pom - logging-provider + logging-analytics :: ${project.artifactId} diff --git a/releases/1.6.3.yaml b/releases/1.6.3.yaml new file mode 100644 index 0000000..de2a11a --- /dev/null +++ b/releases/1.6.3.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '1.6.3' +project: 'logging-analytics' +log_dir: 'logging-analytics-maven-stage-master/295/' diff --git a/releases/1.6.4.yaml b/releases/1.6.4.yaml new file mode 100644 index 0000000..11bf54b --- /dev/null +++ b/releases/1.6.4.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '1.6.4' +project: 'logging-analytics' +log_dir: 'logging-analytics-maven-stage-master/302/' diff --git a/releases/1.6.5.yaml b/releases/1.6.5.yaml new file mode 100644 index 0000000..3e78da6 --- /dev/null +++ b/releases/1.6.5.yaml @@ -0,0 +1,5 @@ +--- +distribution_type: 'maven' +version: '1.6.5' +project: 'logging-analytics' +log_dir: 'logging-analytics-maven-stage-master/317/' diff --git a/version.properties b/version.properties index 2ad0f36..3ef036d 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ # 1.2.6-SNAPSHOT is off 1.2.5 major=1 minor=6 -patch=3 +patch=6 base_version=${major}.${minor}.${patch}