diff --git a/settings.gradle b/settings.gradle index b434685..8d20f20 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,4 +5,6 @@ include 'spring-data-rest-springfox' // pact-feign-consumer must run before pact-spring-data-rest-provider because it creates a shared pact file include 'pact-feign-consumer' include 'pact-spring-data-rest-provider' +include 'sleuth-primary-service' +include 'sleuth-secondary-service' diff --git a/sleuth-primary-service/.gitignore b/sleuth-primary-service/.gitignore new file mode 100644 index 0000000..c9f7010 --- /dev/null +++ b/sleuth-primary-service/.gitignore @@ -0,0 +1,25 @@ +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/sleuth-primary-service/README.md b/sleuth-primary-service/README.md new file mode 100644 index 0000000..384a40c --- /dev/null +++ b/sleuth-primary-service/README.md @@ -0,0 +1,3 @@ +# Log Tracing with Spring Cloud Sleuth + +TBD \ No newline at end of file diff --git a/sleuth-primary-service/build.gradle b/sleuth-primary-service/build.gradle new file mode 100644 index 0000000..e7b020e --- /dev/null +++ b/sleuth-primary-service/build.gradle @@ -0,0 +1,44 @@ +buildscript { + ext { + springBootVersion = '1.5.4.RELEASE' + } + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + } +} + +apply plugin: 'java' +apply plugin: 'eclipse' +apply plugin: 'org.springframework.boot' + +version = '0.0.1-SNAPSHOT' +sourceCompatibility = 1.8 + +repositories { + mavenLocal() + mavenCentral() +} + +ext { + springCloudVersion = 'Dalston.SR2' +} + +dependencies { + compile('org.springframework.cloud:spring-cloud-starter-feign') + compile('org.springframework.cloud:spring-cloud-starter-sleuth') + compile('org.springframework.boot:spring-boot-starter-web') + testCompile('org.springframework.boot:spring-boot-starter-test') +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } +} + +bootRun{ + jvmArgs = ["-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006"] +} diff --git a/sleuth-primary-service/gradle/wrapper/gradle-wrapper.jar b/sleuth-primary-service/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1a958be Binary files /dev/null and b/sleuth-primary-service/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sleuth-primary-service/gradle/wrapper/gradle-wrapper.properties b/sleuth-primary-service/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..90a06ce --- /dev/null +++ b/sleuth-primary-service/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip diff --git a/sleuth-primary-service/gradlew b/sleuth-primary-service/gradlew new file mode 100644 index 0000000..4453cce --- /dev/null +++ b/sleuth-primary-service/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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="" + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/sleuth-primary-service/gradlew.bat b/sleuth-primary-service/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/sleuth-primary-service/gradlew.bat @@ -0,0 +1,84 @@ +@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 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= + +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/sleuth-primary-service/src/main/java/com/example/demo/Address.java b/sleuth-primary-service/src/main/java/com/example/demo/Address.java new file mode 100644 index 0000000..523f539 --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/Address.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Address { + + private long id; + + private String street; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/AddressClient.java b/sleuth-primary-service/src/main/java/com/example/demo/AddressClient.java new file mode 100644 index 0000000..6443500 --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/AddressClient.java @@ -0,0 +1,14 @@ +package com.example.demo; + +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@FeignClient(value = "addresses", path = "/addresses") +public interface AddressClient { + + @RequestMapping(method = RequestMethod.GET, path = "/{id}") + Address getAddressForCustomerId(@PathVariable("id") long id); + +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/Controller.java b/sleuth-primary-service/src/main/java/com/example/demo/Controller.java new file mode 100644 index 0000000..982f933 --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/Controller.java @@ -0,0 +1,33 @@ +package com.example.demo; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class Controller { + + private CustomerClient customerClient; + + private AddressClient addressClient; + + private Logger logger = LoggerFactory.getLogger(Controller.class); + + @Autowired + public Controller(CustomerClient customerClient, AddressClient addressClient) { + this.customerClient = customerClient; + this.addressClient = addressClient; + } + + @GetMapping(path = "customers-with-address/{id}") + public CustomerAndAddress getCustomerWithAddress(@PathVariable("id") long customerId){ + logger.info("COLLECTING CUSTOMER AND ADDRESS WITH ID {} FROM SECONDARY SERVICE", customerId); + Customer customer = customerClient.getCustomer(customerId); + Address address = addressClient.getAddressForCustomerId(customerId); + return new CustomerAndAddress(customer, address); + } + +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/Customer.java b/sleuth-primary-service/src/main/java/com/example/demo/Customer.java new file mode 100644 index 0000000..7142577 --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/Customer.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Customer { + + private long id; + + private String name; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/CustomerAndAddress.java b/sleuth-primary-service/src/main/java/com/example/demo/CustomerAndAddress.java new file mode 100644 index 0000000..a385882 --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/CustomerAndAddress.java @@ -0,0 +1,29 @@ +package com.example.demo; + +public class CustomerAndAddress { + + private Customer customer; + + private Address address; + + public CustomerAndAddress(Customer customer, Address address) { + this.customer = customer; + this.address = address; + } + + public Customer getCustomer() { + return customer; + } + + public void setCustomer(Customer customer) { + this.customer = customer; + } + + public Address getAddress() { + return address; + } + + public void setAddress(Address address) { + this.address = address; + } +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/CustomerClient.java b/sleuth-primary-service/src/main/java/com/example/demo/CustomerClient.java new file mode 100644 index 0000000..91788dd --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/CustomerClient.java @@ -0,0 +1,14 @@ +package com.example.demo; + +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +@FeignClient(value = "customers", path = "/customers") +public interface CustomerClient { + + @RequestMapping(method = RequestMethod.GET, value = "/{id}") + Customer getCustomer(@PathVariable("id") long id); + +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/DemoApplication.java b/sleuth-primary-service/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..dae869f --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,14 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.feign.EnableFeignClients; + +@SpringBootApplication +@EnableFeignClients +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } +} diff --git a/sleuth-primary-service/src/main/java/com/example/demo/FeignConfiguration.java b/sleuth-primary-service/src/main/java/com/example/demo/FeignConfiguration.java new file mode 100644 index 0000000..07e62bd --- /dev/null +++ b/sleuth-primary-service/src/main/java/com/example/demo/FeignConfiguration.java @@ -0,0 +1,15 @@ +package com.example.demo; + +import feign.Logger; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignConfiguration { + + @Bean + public Logger.Level logLevel(){ + return Logger.Level.FULL; + } + +} diff --git a/sleuth-primary-service/src/main/resources/application.yml b/sleuth-primary-service/src/main/resources/application.yml new file mode 100644 index 0000000..6ef1938 --- /dev/null +++ b/sleuth-primary-service/src/main/resources/application.yml @@ -0,0 +1,22 @@ +server.port: 8080 + +logging.level.com.example.demo.CustomerClient: DEBUG +logging.level.com.example.demo.AddressClient: DEBUG +logging.level.org.hibernate.SQL: DEBUG + +customers: + ribbon: + eureka: + enabled: false + listOfServers: localhost:8081 + +addresses: + ribbon: + eureka: + enabled: false + listOfServers: localhost:8081 + +spring: + output: + ansi: + enabled: always diff --git a/sleuth-primary-service/src/main/resources/bootstrap.properties b/sleuth-primary-service/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..20aaeee --- /dev/null +++ b/sleuth-primary-service/src/main/resources/bootstrap.properties @@ -0,0 +1,2 @@ +# this file is loaded by Spring Cloud before application.properties +spring.application.name=sleuth-primary-service \ No newline at end of file diff --git a/sleuth-primary-service/src/main/resources/logback-spring.xml b/sleuth-primary-service/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..9335758 --- /dev/null +++ b/sleuth-primary-service/src/main/resources/logback-spring.xml @@ -0,0 +1,76 @@ + + + + ​ + + + ​ + + + + + + + + + DEBUG + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + + ​ + + ${LOG_FILE} + + ${LOG_FILE}.%d{yyyy-MM-dd}.gz + 7 + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + ​ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ​ + + + + + + + \ No newline at end of file diff --git a/sleuth-secondary-service/.gitignore b/sleuth-secondary-service/.gitignore new file mode 100644 index 0000000..c9f7010 --- /dev/null +++ b/sleuth-secondary-service/.gitignore @@ -0,0 +1,25 @@ +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ \ No newline at end of file diff --git a/sleuth-secondary-service/README.md b/sleuth-secondary-service/README.md new file mode 100644 index 0000000..384a40c --- /dev/null +++ b/sleuth-secondary-service/README.md @@ -0,0 +1,3 @@ +# Log Tracing with Spring Cloud Sleuth + +TBD \ No newline at end of file diff --git a/sleuth-secondary-service/build.gradle b/sleuth-secondary-service/build.gradle new file mode 100644 index 0000000..5f4d097 --- /dev/null +++ b/sleuth-secondary-service/build.gradle @@ -0,0 +1,43 @@ +buildscript { + ext { + springBootVersion = '1.5.4.RELEASE' + } + repositories { + mavenCentral() + } + dependencies { + classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") + } +} + +apply plugin: 'java' +apply plugin: 'eclipse' +apply plugin: 'org.springframework.boot' + +version = '0.0.1-SNAPSHOT' +sourceCompatibility = 1.8 + +repositories { + mavenLocal() + mavenCentral() +} + +ext { + springCloudVersion = 'Dalston.SR2' +} + +dependencies { + compile('org.springframework.cloud:spring-cloud-starter-sleuth') + compile('org.springframework.boot:spring-boot-starter-web') + testCompile('org.springframework.boot:spring-boot-starter-test') +} + +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}" + } +} + +bootRun{ + jvmArgs = ["-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5007"] +} diff --git a/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.jar b/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1a958be Binary files /dev/null and b/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.jar differ diff --git a/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.properties b/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..90a06ce --- /dev/null +++ b/sleuth-secondary-service/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip diff --git a/sleuth-secondary-service/gradlew b/sleuth-secondary-service/gradlew new file mode 100644 index 0000000..4453cce --- /dev/null +++ b/sleuth-secondary-service/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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="" + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/sleuth-secondary-service/gradlew.bat b/sleuth-secondary-service/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/sleuth-secondary-service/gradlew.bat @@ -0,0 +1,84 @@ +@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 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= + +@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 init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +: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/sleuth-secondary-service/src/main/java/com/example/demo/Address.java b/sleuth-secondary-service/src/main/java/com/example/demo/Address.java new file mode 100644 index 0000000..523f539 --- /dev/null +++ b/sleuth-secondary-service/src/main/java/com/example/demo/Address.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Address { + + private long id; + + private String street; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getStreet() { + return street; + } + + public void setStreet(String street) { + this.street = street; + } +} diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/Controller.java b/sleuth-secondary-service/src/main/java/com/example/demo/Controller.java new file mode 100644 index 0000000..f9e350f --- /dev/null +++ b/sleuth-secondary-service/src/main/java/com/example/demo/Controller.java @@ -0,0 +1,148 @@ +package com.example.demo; + +import java.util.Arrays; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class Controller { + + private Logger logger = LoggerFactory.getLogger(Controller.class); + + @GetMapping(path = "customers/{id}") + public ResponseEntity getCustomer(@PathVariable("id") long customerId) { + logger.info("GETTING CUSTOMER WITH ID {}", customerId); + if (customerId < 0 || customerId > NAMES.size() - 1) { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + Customer customer = new Customer(); + customer.setId(customerId); + customer.setName(NAMES.get((int) customerId)); + return new ResponseEntity<>(customer, HttpStatus.OK); + } + + @GetMapping(path = "addresses/{id}") + public ResponseEntity
getAddress(@PathVariable("id") long customerId) { + logger.info("GETTING ADDRESS FOR CUSTOMER WITH ID {}", customerId); + if (customerId < 0 || customerId > NAMES.size() - 1) { + return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } + Address address = new Address(); + address.setId(customerId); + address.setStreet(STREETS.get((int) customerId)); + return new ResponseEntity<>(address, HttpStatus.OK); + } + + private static final List STREETS = Arrays.asList( + "Jefferson Street", + "Cambridge Road", + "Olive Street", + "Old York Road", + "Aspen Drive", + "Cherry Lane", + "10th Street", + "Pennsylvania Avenue", + "Central Avenue", + "8th Street West", + "Route 11", + "Street Road", + "Prospect Street", + "Devon Road", + "Forest Avenue", + "Elm Avenue", + "Heather Court", + "Route 202", + "Willow Drive", + "Evergreen Lane", + "Windsor Drive", + "Mulberry Street", + "2nd Street North", + "Sheffield Drive", + "Ashley Court", + "Valley Road", + "Spruce Street", + "Wood Street", + "Bridge Street", + "Monroe Drive", + "Church Road", + "Main Street South", + "Adams Avenue", + "Delaware Avenue", + "Somerset Drive", + "9th Street", + "3rd Street East", + "Augusta Drive", + "Wall Street", + "Broad Street", + "Route 2", + "Fairview Avenue", + "5th Avenue", + "Spruce Avenue", + "Cemetery Road", + "River Street", + "Tanglewood Drive", + "Cedar Street", + "Canal Street", + "Market Street"); + + private static final List NAMES = Arrays.asList( + "Daria Domino", + "Yukiko Yawn", + "Diane Dalessio", + "Elijah Elmore", + "Tyron Thaler", + "Stefani Stayton", + "Shara Stam", + "Earlean Eblin", + "Jonell Janecek", + "Thaddeus Tupper", + "Dorthy Delany", + "Shanel Saffell", + "Ricki Rost", + "Kandy Knecht", + "Mirella Ma", + "Rocky Ros", + "Theo Tosi", + "Marnie Manzer", + "Talisha Trottier", + "Thanh Tamez", + "Hyacinth Hotard", + "Dianne Dearman", + "Marc Medlin", + "Roxane Rossin", + "Mellie Marino", + "Eugene Eng", + "Charis Curnutt", + "Lillia Leming", + "Gretta Gately", + "Jessica Johnsen", + "Raven Riera", + "Roni Rost", + "Garth Gipson", + "Demetrice Dell", + "Eugenie Ead", + "Jared Julio", + "Alaina Aguinald ", + "Hortense Haun", + "Willia Woodland", + "Jessenia Jefferis", + "Jinny June", + "William Whang", + "Dessie Down", + "Katelyn Koren", + "Barbara Bazaldua", + "France Frese", + "Eufemia Evangelista", + "Neva Nock", + "Rickey Redd", + "Norma Nagler"); + + +} diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/Customer.java b/sleuth-secondary-service/src/main/java/com/example/demo/Customer.java new file mode 100644 index 0000000..7142577 --- /dev/null +++ b/sleuth-secondary-service/src/main/java/com/example/demo/Customer.java @@ -0,0 +1,24 @@ +package com.example.demo; + +public class Customer { + + private long id; + + private String name; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/sleuth-secondary-service/src/main/java/com/example/demo/DemoApplication.java b/sleuth-secondary-service/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 0000000..5d799be --- /dev/null +++ b/sleuth-secondary-service/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,12 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } +} diff --git a/sleuth-secondary-service/src/main/resources/application.yml b/sleuth-secondary-service/src/main/resources/application.yml new file mode 100644 index 0000000..ea01bdf --- /dev/null +++ b/sleuth-secondary-service/src/main/resources/application.yml @@ -0,0 +1,5 @@ +server.port: 8081 +spring: + output: + ansi: + enabled: always \ No newline at end of file diff --git a/sleuth-secondary-service/src/main/resources/bootstrap.properties b/sleuth-secondary-service/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..d305ead --- /dev/null +++ b/sleuth-secondary-service/src/main/resources/bootstrap.properties @@ -0,0 +1,2 @@ +# this file is loaded by Spring Cloud before application.properties +spring.application.name=sleuth-secondary-service \ No newline at end of file diff --git a/sleuth-secondary-service/src/main/resources/logback-spring.xml b/sleuth-secondary-service/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..9335758 --- /dev/null +++ b/sleuth-secondary-service/src/main/resources/logback-spring.xml @@ -0,0 +1,76 @@ + + + + ​ + + + ​ + + + + + + + + + DEBUG + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + + ​ + + ${LOG_FILE} + + ${LOG_FILE}.%d{yyyy-MM-dd}.gz + 7 + + + ${CONSOLE_LOG_PATTERN} + utf8 + + + ​ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ​ + + + + + + + \ No newline at end of file