Create new ads service in Java (#27)

* split py and java for ads

* add gradle app

* remove build files

* cleanup

* comments

* attempt to serve static resource

* attempt to serve static image

* add mvp java ad service

* add dd-trace for java

* update so frontend can request ad

* change service name

* update workflows

Author: stanleegoodspeed

.github/workflows/ads-java.yml

@@ -0,0 +1,50 @@
+name: Ads
+
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - services/ads/java/**
+  workflow_dispatch:
+    branches: [ main ]
+
+defaults:
+  run:
+    working-directory: ads
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+
+    - name: Login to ECR
+      id: login-ecr
+      uses: docker/login-action@v1
+      with:
+        registry: public.ecr.aws
+        username: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        context: ./services/ads/java
+        platforms: linux/amd64
+        push: true
+        tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/ads-java:latest
+

.github/workflows/ads.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ main ]
     paths:
-      - services/ads/**
+      - services/ads/python/**
   workflow_dispatch:
     branches: [ main ]
 
@@ -43,7 +43,7 @@ jobs:
     - name: Build and push
       uses: docker/build-push-action@v2
       with:
-        context: ./services/ads
+        context: ./services/ads/python
         platforms: linux/amd64
         push: true
         tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/ads:latest

.github/workflows/release.yml

@@ -39,6 +39,7 @@ jobs:
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/backend
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/discounts
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/ads
+            ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/ads-java
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/attackbox
             ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/auth
           )

docker-compose.yml

@@ -78,10 +78,10 @@ services:
       - DD_PROFILING_ENABLED=true
       - DD_APPSEC_ENABLED=true
     build:
-      context: ./services/ads
+      context: ./services/ads/python
     command: flask run --port=${ADS_PORT} --host=0.0.0.0 # If using any other port besides the default 9292, overriding the CMD is required
     volumes:
-      - "./services/ads:/app"
+      - ./services/ads/python:/app
     ports:
       - "${ADS_PORT}:${ADS_PORT}"
     networks:
@@ -104,7 +104,7 @@ services:
     build:
       context: ./services/discounts
     volumes:
-      - "./services/discounts:/app"
+      - ./services/discounts:/app
     ports:
       - "${DISCOUNTS_PORT}:${DISCOUNTS_PORT}"
       - "22:22"
@@ -153,6 +153,19 @@ services:
       - /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
     networks:
       - storedog-net
+  ads-java:
+    build:
+      context: ./services/ads/java
+    environment:
+      - DD_SERVICE=ads-java
+      - DD_AGENT_HOST=dd-agent
+      - DD_LOGS_INJECTION=true
+      - DD_TRACE_ANALYTICS_ENABLED=true
+      - DD_PROFILING_ENABLED=true
+    ports:
+      - "3030:8080"
+    networks:
+      - storedog-net
   attackbox:
     build:
       context: ./services/attackbox

services/ads/java/Dockerfile

@@ -0,0 +1,26 @@
+# compile via gradle
+FROM gradle:jdk11 AS TEMP_BUILD_IMAGE
+ENV APP_HOME=/usr/app/
+WORKDIR $APP_HOME
+COPY build.gradle settings.gradle $APP_HOME
+  
+COPY gradle $APP_HOME/gradle
+COPY --chown=gradle:gradle . /home/gradle/src
+USER root
+RUN chown -R gradle /home/gradle/src
+
+COPY . .
+RUN gradle clean build
+    
+# app container
+FROM alpine:latest
+RUN apk --update add openjdk11-jre
+ENV ARTIFACT_NAME=ads-java-0.0.1-SNAPSHOT.jar
+ENV APP_HOME=/usr/app/
+    
+WORKDIR $APP_HOME
+COPY --from=TEMP_BUILD_IMAGE $APP_HOME/build/libs/$ARTIFACT_NAME .
+
+RUN wget -O dd-java-agent.jar 'https://dtdg.co/latest-java-tracer'
+
+ENTRYPOINT exec java -javaagent:/usr/app/dd-java-agent.jar -Ddd.logs.injection=true -Ddd.service=ads-java -Ddd.env=dev -jar ${ARTIFACT_NAME} 

services/ads/java/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+	id 'org.springframework.boot' version '2.7.5'
+	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
+	id 'java'
+}
+
+group = 'com.example'
+version = '0.0.1-SNAPSHOT'
+sourceCompatibility = '11'
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	implementation ( 
+    'commons-io:commons-io:2.4',
+    'org.springframework.boot:spring-boot-starter-web'
+  )
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}

services/ads/java/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

services/ads/java/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1 @@
+rootProject.name = 'ads-java'

services/ads/java/settings.gradle

@@ -0,0 +1,65 @@
+package adsjava;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.http.MediaType;
+import org.springframework.util.StreamUtils;
+import java.io.*;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.apache.commons.io.IOUtils;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.HashMap;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@SpringBootApplication
+@RestController
+public class AdsJavaApplication {
+
+  @CrossOrigin(origins = "http://localhost:3000")
+  @RequestMapping(
+    value = "/banners/{id}",
+    produces = MediaType.IMAGE_JPEG_VALUE
+  )
+  public @ResponseBody byte[] getImageWithMediaType() throws IOException {
+    int randomNum = ThreadLocalRandom.current().nextInt(1, 3 + 1);
+    String imagePath = "/static/ads/ad" + randomNum + ".jpg";
+    InputStream in = getClass()
+        .getResourceAsStream(imagePath);
+    return IOUtils.toByteArray(in);
+  }
+
+	@RequestMapping("/")
+	public String home() {
+		return "Hello from Advertisements (Java)";
+	}
+
+  @CrossOrigin(origins = "http://localhost:3000")
+  @RequestMapping(
+    value = "/ads",
+    produces = MediaType.APPLICATION_JSON_VALUE
+  )
+	public HashMap[] ads() {
+    HashMap<String, String> map1 = new HashMap<>();
+    map1.put("id", "1");
+    map1.put("path", "ad1.jpg");
+
+    HashMap<String, String> map2 = new HashMap<>();
+    map2.put("id", "2");
+    map2.put("path", "ad2.jpg");
+
+    HashMap<String, String> map3 = new HashMap<>();
+    map3.put("id", "3");
+    map3.put("path", "ad3.jpg");
+
+    HashMap[] myArr = { map1, map2, map3 };
+    return myArr;
+	}
+
+	public static void main(String[] args) {
+		SpringApplication.run(AdsJavaApplication.class, args);
+	}
+
+}