[#3] WIP on Eureka first

acceptance-tests/scripts/runDockerAcceptanceTests.sh

@@ -132,10 +132,11 @@ if [[ "${TESTS_PASSED}" == "yes" ]] ; then
     exit 0
 else
     echo -e "\n\nTests failed..."
+    NUMBER_OF_LINES_TO_LOG=500
     docker ps | sed -n '1!p' > /tmp/containers.txt
     while read field1 field2 field3; do
       echo -e "\n\nContainer name [$field2] with id [$field1] logs: \n\n"
-      docker logs -t $field1
+      docker logs --tail=$NUMBER_OF_LINES_TO_LOG -t $field1
     done < /tmp/containers.txt
     exit 1
 fi

acceptance-tests/src/test/groovy/io/spring/cloud/samples/brewery/acceptance/SleuthBreweryAcceptanceSpec.groovy

@@ -36,8 +36,7 @@ class SleuthBreweryAcceptanceSpec extends AbstractBreweryAcceptanceSpec {
 		and: 'entry will be present in Zipkin'
 			entry_for_trace_id_is_present_in_Zipkin(referenceProcessId)
 		where:
-		    // will add FEIGN once REST_TEMPLATE tests stabilize
-			communicationType << [CommunicationType.REST_TEMPLATE]
+			communicationType << [CommunicationType.REST_TEMPLATE, CommunicationType.FEIGN]
 			referenceProcessId = new JdkIdGenerator().generateId().toString()
 	}
 

aggregating/src/main/resources/bootstrap-eureka.yaml

@@ -0,0 +1,12 @@
+#spring.cloud.config.failFast: true
+spring:
+  cloud:
+    config:
+      discovery:
+        enabled: true
+        serviceId: configserverrr
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+  client:
+    registryFetchIntervalSeconds: 5

bottling/src/main/resources/bootstrap-eureka.yaml

@@ -0,0 +1,6 @@
+#spring.cloud.config.failFast: true
+spring:
+  cloud:
+    config:
+      discovery:
+        enabled: true

build.gradle

@@ -149,6 +149,8 @@ configure(subprojects - techProjects) {
 
         compile "org.springframework.boot:spring-boot-starter-web"
         compile "org.springframework.boot:spring-boot-starter-actuator"
+        compile "org.springframework.boot:spring-boot-starter-aop"
+        compile 'org.springframework.retry:spring-retry'
         compile "org.springframework:spring-context-support"
         compile 'com.fasterxml.jackson.core:jackson-databind'
         if (!whatToTest('CONSUL') && !whatToTest('EUREKA')) {
@@ -171,7 +173,7 @@ configure(subprojects - techProjects) {
     }
 
     wrapper {
-        gradleVersion '2.9'
+        gradleVersion '2.10'
     }
 
     bootRun {

config-server/build.gradle

@@ -1,5 +1,6 @@
 dependencies {
     compile "org.springframework.cloud:spring-cloud-config-server"
+    if (whatToTest('EUREKA')) { compile "org.springframework.cloud:spring-cloud-starter-eureka" }
 }
 
 createDockerTaskWithPort(8888)

config-server/src/main/java/io/spring/cloud/samples/brewery/configserver/EurekaConfiguration.java

@@ -0,0 +1,11 @@
+package io.spring.cloud.samples.brewery.configserver;
+
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("eureka")
+@EnableDiscoveryClient
+public class EurekaConfiguration {
+}

config-server/src/main/resources/application-eureka.yaml

@@ -0,0 +1,12 @@
+eureka:
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:8761/eureka/
+  instance:
+    preferIpAddress: true
+
+ribbon:
+  eureka:
+    enabled: true

config-server/src/main/resources/application.yml

@@ -13,5 +13,7 @@ spring:
         git:
           uri: https://github.com/spring-cloud-samples/brewery.git
           searchPaths: git-props
+  application:
+    name: configserverrr
 
 spring.zipkin.enabled: false

docker-compose-EUREKA.sh

@@ -24,13 +24,21 @@ PORT_TO_CHECK=8888
 
 docker-compose -f $dockerComposeFile up -d configserver
 
-echo "Waiting for the Config Server app to boot for [$(( WAIT_TIME * RETRIES ))] seconds"
+echo -e "\n\nWaiting for the Config Server app to boot for [$(( WAIT_TIME * RETRIES ))] seconds"
 for i in $( seq 1 "${RETRIES}" ); do
     sleep "${WAIT_TIME}"
     curl -m 5 "${HEALTH_HOST}:${PORT_TO_CHECK}/health" && READY_FOR_TESTS="yes" && break
     echo "Fail #$i/${RETRIES}... will try again in [${WAIT_TIME}] seconds"
 done
 
+echo -e "\n\nChecking for the presence of config server in Service Discovery for [$(( WAIT_TIME * RETRIES ))] seconds"
+for i in $( seq 1 "${RETRIES}" ); do
+    sleep "${WAIT_TIME}"
+    curl -m 5 http://localhost:8888/health | grep "\"services\":\[\"configserverrr\"\]" && READY_FOR_TESTS="yes" && break
+    echo "Fail #$i/${RETRIES}... will try again in [${WAIT_TIME}] seconds"
+done
+
+
 if [[ "${READY_FOR_TESTS}" == "no" ]] ; then
     echo "Config server failed to start..."
     exit 1

docker-compose-EUREKA.yml

@@ -2,70 +2,62 @@ aggregating:
   build: aggregating/build/docker
   environment:
     spring.profiles.active: eureka
-    spring.cloud.config.uri: http://configserver:8888
   links:
     - discovery
-    - configserver
   ports:
     - 9992:9992
 
 maturing:
   build: maturing/build/docker
   environment:
     spring.profiles.active: eureka
-    spring.cloud.config.uri: http://configserver:8888
   links:
     - discovery
-    - configserver
   ports:
     - 9993:9993
 
 bottling:
   build: bottling/build/docker
   environment:
     spring.profiles.active: eureka
-    spring.cloud.config.uri: http://configserver:8888
   links:
     - discovery
-    - configserver
   ports:
     - 9994:9994
 
 presenting:
   build: presenting/build/docker
   environment:
     spring.profiles.active: eureka
-    spring.cloud.config.uri: http://configserver:8888
   links:
     - discovery
-    - configserver
   ports:
     - 9991:9991
 
 zuul:
   build: zuul/build/docker
   environment:
     spring.profiles.active: eureka
-    spring.cloud.config.uri: http://configserver:8888
   links:
     - discovery
-    - configserver
   ports:
     - 9995:9995
 
 ingredients:
   build: ingredients/build/docker
   environment:
     spring.profiles.active: eureka
-    spring.cloud.config.uri: http://configserver:8888
   links:
     - discovery
-    - configserver
   ports:
     - 9996:9996
 
 configserver:
   build: config-server/build/docker
+  environment:
+    spring.profiles.active: eureka
+  links:
+    - discovery
   ports:
     - 8888:8888
 

eureka/src/main/resources/bootstrap.yml

@@ -1,3 +1,9 @@
 spring:
   application:
-    name: discovery
+    name: discovery
+
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+  client:
+    registryFetchIntervalSeconds: 5

ingredients/src/main/resources/bootstrap-eureka.yaml

@@ -0,0 +1,6 @@
+#spring.cloud.config.failFast: true
+spring:
+  cloud:
+    config:
+      discovery:
+        enabled: true

maturing/src/main/resources/bootstrap-eureka.yaml

@@ -0,0 +1,6 @@
+#spring.cloud.config.failFast: true
+spring:
+  cloud:
+    config:
+      discovery:
+        enabled: true

presenting/src/main/resources/bootstrap-eureka.yaml

@@ -0,0 +1,6 @@
+#spring.cloud.config.failFast: true
+spring:
+  cloud:
+    config:
+      discovery:
+        enabled: true

zuul/src/main/resources/bootstrap-eureka.yaml

@@ -0,0 +1,6 @@
+#spring.cloud.config.failFast: true
+spring:
+  cloud:
+    config:
+      discovery:
+        enabled: true