added logging

Author: saturnism

examples-bootiful-gcp/helloworld-service/pom.xml

@@ -46,6 +46,12 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

examples-bootiful-gcp/helloworld-service/src/main/java/com/example/guestbook/HelloworldApplication.java

@@ -15,6 +15,7 @@
  */
 package com.example.guestbook;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -37,11 +38,13 @@ public static void main(String[] args) {
 }
 
 @RestController
+@Slf4j
 class HelloworldController {
   private final String version = "1.0";
 
   @GetMapping("/hello/{name}")
   public Map<String, String> hello(@Value("${greeting}") String greetingTemplate, @PathVariable String name) throws UnknownHostException {
+  	log.info("received hello from {}", name);
     Map<String, String> response = new HashMap<>();
 
     String hostname = InetAddress.getLocalHost().getHostName();
@@ -54,6 +57,7 @@ public Map<String, String> hello(@Value("${greeting}") String greetingTemplate,
     response.put("version", version);
     response.put("hostname", hostname);
 
+    log.info("responding to {}", name);
     return response;
   }
 }

examples-bootiful-gcp/helloworld-ui/pom.xml

@@ -58,6 +58,12 @@
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-prometheus</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.18.4</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

examples-bootiful-gcp/helloworld-ui/src/main/java/com/example/guestbook/HelloworldUiController.java

@@ -15,18 +15,21 @@
  */
 package com.example.guestbook;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.annotation.SessionScope;
 
+import javax.servlet.http.HttpSession;
 import java.util.Map;
 
 /**
  * Created by rayt on 5/1/17.
  */
 @Controller
 @SessionAttributes("name")
+@Slf4j
 public class HelloworldUiController {
   private final HelloworldService helloworldService;
   private final GuestbookService guestbookService;
@@ -37,7 +40,8 @@ public HelloworldUiController(HelloworldService helloworldService, GuestbookServ
   }
 
   @GetMapping("/")
-  public String index(Model model) {
+  public String index(HttpSession session, Model model) {
+  	log.info("starting index");
     if (model.containsAttribute("name")) {
       String name = (String) model.asMap().get("name");
       Map<String, String> greeting = helloworldService.greeting(name);
@@ -51,6 +55,7 @@ public String index(Model model) {
 
   @PostMapping("/greet")
   public String greet(@RequestParam String name, @RequestParam String message, Model model) {
+  	log.info("greeting from {}", name);
     model.addAttribute("name", name);
     if (message != null && !message.trim().isEmpty()) {
       guestbookService.add(name, message);

examples-bootiful-gcp/kubernetes/guestbook-deployment.yaml

@@ -37,7 +37,7 @@ spec:
         visualizer/uses: mysql
         prometheus.io/scrape: "true"
         prometheus.io/port: "8080"
-        promteheus.io/path: /actuator/prometheus
+        prometheus.io/path: /actuator/prometheus
     spec:
       containers:
       - name: guestbook-service
@@ -46,6 +46,13 @@ spec:
           httpGet:
             path: /actuator/health
             port: 8080
+        resources:
+          requests:
+            cpu: 0.5
+            memory: 512Mi
+          limits:
+            cpu: 2.0
+            memory: 1Gi
         ports:
         - name: http
           containerPort: 8080

examples-bootiful-gcp/kubernetes/helloworld-deployment.yaml

@@ -36,7 +36,7 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "8080"
-        promteheus.io/path: /actuator/prometheus
+        prometheus.io/path: /actuator/prometheus
     spec:
       containers:
       - name: helloworld-service
@@ -45,6 +45,13 @@ spec:
           httpGet:
             path: /actuator/health
             port: 8080
+        resources:
+          requests:
+            cpu: 0.5
+            memory: 512Mi
+          limits:
+            cpu: 2.0
+            memory: 1Gi
         ports:
         - name: http
           containerPort: 8080

examples-bootiful-gcp/kubernetes/ui-deployment.yaml

@@ -37,7 +37,7 @@ spec:
         visualizer/uses: helloworld-service,guestbook-service,redis
         prometheus.io/scrape: "true"
         prometheus.io/port: "8080"
-        promteheus.io/path: /actuator/prometheus
+        prometheus.io/path: /actuator/prometheus
     spec:
       containers:
       - name: helloworld-ui
@@ -53,6 +53,13 @@ spec:
           httpGet:
             path: /actuator/health
             port: 8080
+        resources:
+          requests:
+            cpu: 0.5
+            memory: 512Mi
+          limits:
+            cpu: 2.0
+            memory: 1Gi
         ports:
         - name: http
           containerPort: 8080

examples-bootiful-gcp/pom.xml

@@ -44,16 +44,14 @@
 					<artifactId>jib-maven-plugin</artifactId>
 					<version>0.10.1</version>
 					<configuration>
-						<from>
-							<image>adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u192-b12_openj9-0.11.0-slim</image>
-						</from>
 						<to>
 							<image>${docker.image.prefix}/bootiful-${project.artifactId}</image>
 						</to>
                         <extraDirectory>${jib.agent.directory}</extraDirectory>
 						<container>
 							<jvmFlags>
-								<jvmFlag>-XX:+ContainerSupport</jvmFlag>
+								<jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
+								<jvmFlag>-XX:+UseCGroupMemoryLimitForHeap</jvmFlag>
                                 <jvmFlag>-agentpath:/opt/profiler/profiler_java_agent.so=-cprof_service=${project.artifactId},-cprof_service_version=${project.version}</jvmFlag>
 								<jvmFlag>-agentpath:${stackdriver.debugger.directory}/cdbg_java_agent.so=--logtostderr=1</jvmFlag>
 								<jvmFlag>-Dcom.google.cdbg.module=${project.artifactId}</jvmFlag>