diff --git a/.gitignore b/.gitignore index b83d222..60eae99 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,36 @@ /target/ + +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/Dockerfile b/Dockerfile index eaf0d46..b682dee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM opsmx11/java:14.04-openjdk-8-jdk ## restapp port #### ENV server_port=8088 RUN apt-get update && apt-get install stress-ng -y -COPY /target/issuegen-0.1.jar /opt/issuegen-0.1.jar +COPY /build/libs/issuegen-0.1.jar /opt/issuegen-0.1.jar COPY dockerrun.sh /usr/local/bin/dockerrun.sh RUN chmod +x /usr/local/bin/dockerrun.sh ###### for newrelic-agent only diff --git a/GradleDockerfile b/GradleDockerfile deleted file mode 100644 index 429d60c..0000000 --- a/GradleDockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM opsmx11/java:14.04-openjdk-8-jdk -## restapp port #### -ENV server_port=8088 -RUN apt-get update && apt-get install stress-ng -y -COPY /build/libs/issuegen-0.1.jar /opt/issuegen-0.1.jar -COPY dockerrun.sh /usr/local/bin/dockerrun.sh -RUN chmod +x /usr/local/bin/dockerrun.sh -###### for newrelic-agent only -##COPY newrelic/* /opt/newrelic/ -##for promothues-agent -#COPY prometheus/jmx_prometheus_javaagent-0.1.0.jar /opt/jmx_prometheus_javaagent-0.1.0.jar -#COPY prometheus/tomcat.yml /opt/tomcat.yml -#for DD-agent -#COPY tomcat.yaml /etc/dd-agent/conf.d/tomcat.yaml -#COPY install-dd.sh install-dd.sh -#RUN DD_API_KEY= bash install-dd.sh -CMD ["dockerrun.sh"] diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..baa134c --- /dev/null +++ b/build.gradle @@ -0,0 +1,41 @@ +plugins { + id 'org.springframework.boot' version '2.3.4.RELEASE' + id 'io.spring.dependency-management' version '1.0.10.RELEASE' + id 'java' +} + +group = 'com.opsmx' +version = '0.1' +sourceCompatibility = '1.8' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +ext['log4j2.version'] = '2.16.0' + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + annotationProcessor 'org.projectlombok:lombok' + testImplementation('org.springframework.boot:spring-boot-starter-test') { + exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' + } + compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator' + compile group: 'com.netflix.spectator', name: 'spectator-api', version: '0.119.0' + testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.3.4.RELEASE' + compile group: 'org.projectlombok', name: 'lombok-maven-plugin', version: '1.18.12.0' + compile group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: '1.5.5' + compile group: 'io.prometheus', name: 'simpleclient_pushgateway', version: '0.9.0' +} + +test { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..12d38de --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# 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 +# +# https://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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 2ee4c00..0000000 --- a/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 2.1.9.RELEASE - - - com.opsmx - issuegen - 0.1 - issuegen - Demo project for Spring Boot Stack Driver Integration - - - - 1.8 - Greenwich.SR3 - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.springframework.boot - spring-boot-starter-log4j2 - - - org.springframework.metrics - spring-metrics - 0.5.1.RELEASE - - - com.netflix.spectator - spectator-api - 0.98.0 - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.projectlombok - lombok-maven-plugin - 1.18.10.0 - - - - - org.springframework.boot - spring-boot-devtools - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ae413d2 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'issuegen' diff --git a/src/README.md b/src/README.md deleted file mode 100644 index fec6081..0000000 --- a/src/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# source of spring-boot app - -This folder contains source code of a simple spingboot rest application - -To build by maven -./mvn clean install -e - -After building -in the target folder, boostApp.jar will create after finishing a build process - -Run jar by command -java -jar restapp.jar - -access by this URL http://localhost:8090/greeting - - diff --git a/src/main/java/hello/Application.java b/src/main/java/com/opsmx/issuegen/Application.java similarity index 90% rename from src/main/java/hello/Application.java rename to src/main/java/com/opsmx/issuegen/Application.java index 60385a4..9560e5a 100644 --- a/src/main/java/hello/Application.java +++ b/src/main/java/com/opsmx/issuegen/Application.java @@ -1,4 +1,4 @@ -package hello; +package com.opsmx.issuegen; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/hello/Greeting.java b/src/main/java/com/opsmx/issuegen/Greeting.java similarity index 91% rename from src/main/java/hello/Greeting.java rename to src/main/java/com/opsmx/issuegen/Greeting.java index 5d10b59..d3ebcae 100644 --- a/src/main/java/hello/Greeting.java +++ b/src/main/java/com/opsmx/issuegen/Greeting.java @@ -1,4 +1,4 @@ -package hello; +package com.opsmx.issuegen; public class Greeting { diff --git a/src/main/java/hello/GreetingController.java b/src/main/java/com/opsmx/issuegen/GreetingController.java similarity index 92% rename from src/main/java/hello/GreetingController.java rename to src/main/java/com/opsmx/issuegen/GreetingController.java index c4e00c5..5bf38be 100644 --- a/src/main/java/hello/GreetingController.java +++ b/src/main/java/com/opsmx/issuegen/GreetingController.java @@ -1,4 +1,4 @@ -package hello; +package com.opsmx.issuegen; import java.io.BufferedReader; @@ -43,8 +43,8 @@ public String greeting(@RequestParam(value = "delay", defaultValue = "0") Intege if(delay > 0) { Random r = new Random(); delay = r.nextInt((delay - delay/2) + 1) + delay/2; - - Thread.sleep(delay); + + Thread.sleep(delay); } log.info("issuegen.agent.util.method.MPayBusiness - categoryOneServices start"); @@ -84,13 +84,13 @@ public ResponseEntity generateIssues(HttpServletRequest httpServletRequest, @Req } private void generateIssues(String issue){ - if("CRITICAL".equals(issue)){ + if(IssueMessageUtils.CRITICAL.equalsIgnoreCase(issue)){ log.error("issuegen.agent.util.method.MPayBusiness - FATAL rest call response is empty!"); - } else if ("ERROR".equals(issue)){ + } else if (IssueMessageUtils.ERROR.equalsIgnoreCase(issue)){ log.error("issuegen.agent.util.method.MPayBusiness - Assert : userName is missing."); - } else if ("WARN".equals(issue)){ + } else if (IssueMessageUtils.WARN.equalsIgnoreCase(issue)){ log.warn("issuegen.agent.util.method.MPayBusiness - Response is empty string. No data returned. SessionInfoCode value might be expired."); - } else if ("DEBUG".equals(issue)){ + } else if (IssueMessageUtils.DEBUG.equalsIgnoreCase(issue)){ log.debug(IssueMessageUtils.getDebugMsg()); }else { log.info(IssueMessageUtils.getInfoMsg()); diff --git a/src/main/java/hello/GreetingIssueRestController.java b/src/main/java/com/opsmx/issuegen/GreetingIssueRestController.java similarity index 73% rename from src/main/java/hello/GreetingIssueRestController.java rename to src/main/java/com/opsmx/issuegen/GreetingIssueRestController.java index 18e246c..a7e2249 100644 --- a/src/main/java/hello/GreetingIssueRestController.java +++ b/src/main/java/com/opsmx/issuegen/GreetingIssueRestController.java @@ -1,4 +1,4 @@ -package hello; +package com.opsmx.issuegen; import java.io.FileNotFoundException; @@ -11,42 +11,74 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import lombok.extern.log4j.Log4j2; +import lombok.extern.slf4j.Slf4j; -@Log4j2 +@Slf4j @CrossOrigin @RestController public class GreetingIssueRestController { - + + private static final String OPERATION_DONE_SUCCESSFULLY = "Operation done successfully"; + @GetMapping("/logs") public ResponseEntity logs(HttpServletRequest httpServletRequest, @RequestParam("type") String type) { generateLogs(type); - return new ResponseEntity<>("Operation done successfully",HttpStatus.OK); + return new ResponseEntity<>(OPERATION_DONE_SUCCESSFULLY,HttpStatus.OK); } @GetMapping("/issue") public ResponseEntity issueLogs(HttpServletRequest httpServletRequest, @RequestParam("type") String type){ generateIssues(type); - return new ResponseEntity<>("Operation done successfully",HttpStatus.OK); + return new ResponseEntity<>(OPERATION_DONE_SUCCESSFULLY,HttpStatus.OK); + } + + @GetMapping("/customlog") + public ResponseEntity customLogs(HttpServletRequest httpServletRequest, @RequestParam("type") String type, @RequestParam("msg") String msg) { + customLogs(type, msg); + return new ResponseEntity<>(OPERATION_DONE_SUCCESSFULLY,HttpStatus.OK); } + private void customLogs(String type, String msg) { + if(IssueMessageUtils.CRITICAL.equalsIgnoreCase(type)){ + log.error("issuegen.bus.managed.beans.LogUtils - FATAL {}", msg); + return; + } + + if (IssueMessageUtils.DEBUG.equalsIgnoreCase(type)){ + log.debug("issuegen.bus.managed.beans.LogUtils - {}", msg); + return; + } + + if (IssueMessageUtils.ERROR.equalsIgnoreCase(type)){ + log.error("issuegen.bus.managed.beans.LogUtils - {}", msg); + return; + } + + if (IssueMessageUtils.WARN.equalsIgnoreCase(type)){ + log.warn("issuegen.bus.managed.beans.LogUtils - {}", msg); + return; + } + + log.info("issuegen.bus.managed.beans.LogUtils - {}", msg); + } + private void generateLogs(String type) { - if("CRITICAL".equalsIgnoreCase(type)){ + if(IssueMessageUtils.CRITICAL.equalsIgnoreCase(type)){ log.error("issuegen.bus.managed.beans.MPayBusiness - FATAL rest call response is empty!"); return; } - if ("DEBUG".equalsIgnoreCase(type)){ + if (IssueMessageUtils.DEBUG.equalsIgnoreCase(type)){ log.debug(IssueMessageUtils.getDebugMsg()); return; } - if ("ERROR".equalsIgnoreCase(type)){ - log.error("issuegen.bus.managed.beans.MPayBusiness - Assert : userName is missing."); + if (IssueMessageUtils.ERROR.equalsIgnoreCase(type)){ + log.error("issuegen.agent.util.method.MPayBusiness - Assert : userName is missing."); return; } - if ("WARN".equalsIgnoreCase(type)){ + if (IssueMessageUtils.WARN.equalsIgnoreCase(type)){ log.warn("issuegen.bus.managed.beans.MPayBusiness - Response is empty string. No data returned. SessionInfoCode value might be expired."); return; } @@ -119,7 +151,7 @@ private void generateIssues(String type){ @GetMapping("/warn") public ResponseEntity warningLogs(HttpServletRequest httpServletRequest, @RequestParam("type") String issue){ generateWarning(issue); - return new ResponseEntity<>("Operation done successfully",HttpStatus.OK); + return new ResponseEntity<>(OPERATION_DONE_SUCCESSFULLY,HttpStatus.OK); } private void generateWarning(String type) { @@ -143,16 +175,4 @@ private void generateWarning(String type) { log.warn(IssueMessageUtils.getDbWarning()); } } - -// OutOfMemoryError -// StackOverflowError -// ClassNotFoundException -// FileNotFoundException -// ArrayIndexOutOfBounds -// NullPointerException -// StringIndexOutOfBoundsException -// NoClassDefFoundError -// NoSuchMethodFoundError -// NumberFormatException -// IllegalArgumentException } diff --git a/src/main/java/hello/IssueMessageUtils.java b/src/main/java/com/opsmx/issuegen/IssueMessageUtils.java similarity index 78% rename from src/main/java/hello/IssueMessageUtils.java rename to src/main/java/com/opsmx/issuegen/IssueMessageUtils.java index 1f6a291..2ad45dc 100644 --- a/src/main/java/hello/IssueMessageUtils.java +++ b/src/main/java/com/opsmx/issuegen/IssueMessageUtils.java @@ -1,6 +1,7 @@ -package hello; +package com.opsmx.issuegen; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Random; @@ -17,6 +18,34 @@ private IssueMessageUtils() { private static List dbErrors; private static List dbWarns; + + private static List commonWords; + + public static final String CRITICAL = "CRITICAL"; + public static final String ERROR = "ERROR"; + public static final String DEBUG = "DEBUG"; + public static final String WARN = "WARN"; + + static { + commonWords = new ArrayList<>(); + commonWords.add("Internal Server Error occured"); + commonWords.add("while"); + commonWords.add("trying to"); + commonWords.add("load"); + commonWords.add("app config from path"); + commonWords.add("initialized"); + commonWords.add("application"); + commonWords.add("creation of"); + commonWords.add("securerandom instance"); + commonWords.add("session id"); + commonWords.add("generation"); + commonWords.add("schema validating"); + commonWords.add("authorization"); + commonWords.add("APPConfig"); + commonWords.add("context"); + commonWords.add("project"); + + } public static String getInfoMsg() { @@ -51,7 +80,6 @@ public static String getInfoMsg() { } - public static String getDebugMsg() { if (debugMessages == null) { @@ -67,6 +95,7 @@ public static String getDebugMsg() { return getRandomMsg(debugMessages); } + public static String getDbError() { @@ -97,4 +126,26 @@ public static String getDbWarning() { private static String getRandomMsg(List list) { return list.get(new Random().nextInt(list.size())); } + + public static String getErrorMsg() { + + return getSuffle("IOExeception"); + } + + private static String getSuffle(String value) { + + commonWords.add(value); + Collections.shuffle(commonWords); + + + StringBuilder sb = new StringBuilder(commonWords.size()); + for (String s : commonWords) { + sb.append(s); + sb.append(" "); + } + + commonWords.remove(value); + + return sb.toString(); + } } diff --git a/src/main/java/hello/ProductionIssueGenerator.java b/src/main/java/com/opsmx/issuegen/ProductionIssueGenerator.java similarity index 94% rename from src/main/java/hello/ProductionIssueGenerator.java rename to src/main/java/com/opsmx/issuegen/ProductionIssueGenerator.java index 9269c56..3c16e87 100644 --- a/src/main/java/hello/ProductionIssueGenerator.java +++ b/src/main/java/com/opsmx/issuegen/ProductionIssueGenerator.java @@ -1,4 +1,4 @@ -package hello; +package com.opsmx.issuegen; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/hello/PropertiesUtil.java b/src/main/java/com/opsmx/issuegen/PropertiesUtil.java similarity index 95% rename from src/main/java/hello/PropertiesUtil.java rename to src/main/java/com/opsmx/issuegen/PropertiesUtil.java index 0c09c0f..7473a2d 100644 --- a/src/main/java/hello/PropertiesUtil.java +++ b/src/main/java/com/opsmx/issuegen/PropertiesUtil.java @@ -1,4 +1,4 @@ -package hello; +package com.opsmx.issuegen; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 307066a..9418b92 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -12,8 +12,14 @@ spring.application.name=trace-service server.tomcat.max-threads=10 -logging.level.org.springframework.web=WARN +logging.level.org.springframework.web=warn + +logging.level.com.opsmx.issuegen=debug + +logging.pattern.console= %d{HH:mm:ss.SSS} [%thread] %-5level %msg%n #application input -app.dog.image=dog2 \ No newline at end of file +app.dog.image=dog2 + +management.endpoints.web.exposure.include=prometheus,info,health diff --git a/src/main/resources/static/css/issuegenerator.css b/src/main/resources/static/css/issuegenerator.css index 0fc9b06..16b8023 100644 --- a/src/main/resources/static/css/issuegenerator.css +++ b/src/main/resources/static/css/issuegenerator.css @@ -1,13 +1,13 @@ .button { width:200px; - height:115px; + height:80px; border: none; color: black; padding: 15px 40px; text-align: center; text-decoration: none; display: inline-block; - font-size: 20px; + font-size: 18px; border-radius: 5px; position: relative; margin: 5px; @@ -19,7 +19,7 @@ } h4 { - padding-left: 10px; + padding-left: 6px; } .cnfh { diff --git a/src/main/resources/static/issuegenerator.html b/src/main/resources/static/issuegenerator.html index f076e7d..7194ea7 100644 --- a/src/main/resources/static/issuegenerator.html +++ b/src/main/resources/static/issuegenerator.html @@ -33,6 +33,24 @@ request.open('GET', url, true); request.send(); } + + function customLog(value) { + + var txtarea = document.getElementById("customtxt"); + + if (txtarea.value.length == 0) + { + alert("Provide custom message"); + return false; + } + + msg = txtarea.value + var base_url = window.location.origin; + var request = new XMLHttpRequest(); + var url = base_url+"/customlog?type="+value+"&msg="+escape(msg); + request.open('GET', url, true); + request.send(); + }