oracle-devrel · Anand-GitH · Mar 2, 2024 · Mar 3, 2024 · Mar 3, 2024 · Mar 3, 2024
diff --git a/sb-hol/enableapm.sh b/sb-hol/enableapm.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Apply Cert-Manager
+kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.14.3/cert-manager.yaml
+
+# Apply K8 OpenTelemetry Operator
+kubectl apply -f https://github.com/open-telemetry/opentelemetry-operator/releases/latest/download/opentelemetry-operator.yaml
+
+# Configure APM agent using K8 operator
+kubectl apply -f ~/oci-devlive-2024/sb-hol/customapmresource.yaml
+
+# Appyly APM java agent through the K8 namespace
+kubectl apply -f ~/oci-devlive-2024/sb-hol/apmnamespace.yaml
+
+# Redeploy application
+kubectl apply -f ~/oci-devlive-2024/sb-hol/wstore.yaml
diff --git a/sb-hol/wstore.yaml b/sb-hol/wstore.yaml
@@ -51,10 +51,6 @@ spec:
             value: file:/spring/wstore.properties
           - name: spring.web.resources.static-locations
             value: file:/spring/static/
-          - name: apm.dataupload.endpoint
-            value: <apm-endpoint>
-          - name: apm.public.datakey
-            value: <apm-private-data-key>
           - name: winStore.services.adservice
             value: http://${WSTORE_BACKEND_SERVICE_HOST}:${WSTORE_BACKEND_SERVICE_PORT}/adService/prodId
 ---

diff --git a/src/AdMessage/.gitignore → src/admessage/.gitignore b/src/AdMessage/.gitignore → src/admessage/.gitignore
diff --git a/src/AdMessage/.mvn/wrapper/maven-wrapper.jar → src/admessage/.mvn/wrapper/maven-wrapper.jar b/src/AdMessage/.mvn/wrapper/maven-wrapper.jar → src/admessage/.mvn/wrapper/maven-wrapper.jar
diff --git a/...age/.mvn/wrapper/maven-wrapper.properties → ...age/.mvn/wrapper/maven-wrapper.properties b/...age/.mvn/wrapper/maven-wrapper.properties → ...age/.mvn/wrapper/maven-wrapper.properties
diff --git a/src/admessage/Dockerfile b/src/admessage/Dockerfile
@@ -1,5 +1,5 @@
 FROM openjdk:17-oracle
 WORKDIR /spring
-COPY target/AdMessage-1.0.1.jar ./AdMessage.jar
+COPY target/AdMessage-1.0.0.jar ./AdMessage.jar
 COPY application.properties application.properties
 ENTRYPOINT ["java","-jar","./AdMessage.jar","--spring.config.location=file:/spring/application.properties"]
diff --git a/src/AdMessage/lib/HikariCP-5.0.1.jar → src/admessage/lib/HikariCP-5.0.1.jar b/src/AdMessage/lib/HikariCP-5.0.1.jar → src/admessage/lib/HikariCP-5.0.1.jar
diff --git a/src/AdMessage/lib/angus-activation-2.0.0.jar → src/admessage/lib/angus-activation-2.0.0.jar b/src/AdMessage/lib/angus-activation-2.0.0.jar → src/admessage/lib/angus-activation-2.0.0.jar
diff --git a/src/AdMessage/lib/antlr4-runtime-4.13.0.jar → src/admessage/lib/antlr4-runtime-4.13.0.jar b/src/AdMessage/lib/antlr4-runtime-4.13.0.jar → src/admessage/lib/antlr4-runtime-4.13.0.jar
diff --git a/src/AdMessage/lib/aspectjweaver-1.9.21.jar → src/admessage/lib/aspectjweaver-1.9.21.jar b/src/AdMessage/lib/aspectjweaver-1.9.21.jar → src/admessage/lib/aspectjweaver-1.9.21.jar
diff --git a/src/AdMessage/lib/byte-buddy-1.14.7.jar → src/admessage/lib/byte-buddy-1.14.7.jar b/src/AdMessage/lib/byte-buddy-1.14.7.jar → src/admessage/lib/byte-buddy-1.14.7.jar
diff --git a/src/AdMessage/lib/classmate-1.5.1.jar → src/admessage/lib/classmate-1.5.1.jar b/src/AdMessage/lib/classmate-1.5.1.jar → src/admessage/lib/classmate-1.5.1.jar
diff --git a/...rnate-commons-annotations-6.0.6.Final.jar → ...rnate-commons-annotations-6.0.6.Final.jar b/...rnate-commons-annotations-6.0.6.Final.jar → ...rnate-commons-annotations-6.0.6.Final.jar
diff --git a/...essage/lib/hibernate-core-6.4.1.Final.jar → ...essage/lib/hibernate-core-6.4.1.Final.jar b/...essage/lib/hibernate-core-6.4.1.Final.jar → ...essage/lib/hibernate-core-6.4.1.Final.jar
diff --git a/...sage/lib/istack-commons-runtime-4.1.1.jar → ...sage/lib/istack-commons-runtime-4.1.1.jar b/...sage/lib/istack-commons-runtime-4.1.1.jar → ...sage/lib/istack-commons-runtime-4.1.1.jar
diff --git a/...sage/lib/jakarta.activation-api-2.1.0.jar → ...sage/lib/jakarta.activation-api-2.1.0.jar b/...sage/lib/jakarta.activation-api-2.1.0.jar → ...sage/lib/jakarta.activation-api-2.1.0.jar
diff --git a/...sage/lib/jakarta.annotation-api-2.0.0.jar → ...sage/lib/jakarta.annotation-api-2.0.0.jar b/...sage/lib/jakarta.annotation-api-2.0.0.jar → ...sage/lib/jakarta.annotation-api-2.0.0.jar
diff --git a/...dMessage/lib/jakarta.inject-api-2.0.1.jar → ...dmessage/lib/jakarta.inject-api-2.0.1.jar b/...dMessage/lib/jakarta.inject-api-2.0.1.jar → ...dmessage/lib/jakarta.inject-api-2.0.1.jar
diff --git a/...age/lib/jakarta.persistence-api-3.1.0.jar → ...age/lib/jakarta.persistence-api-3.1.0.jar b/...age/lib/jakarta.persistence-api-3.1.0.jar → ...age/lib/jakarta.persistence-api-3.1.0.jar
diff --git a/...age/lib/jakarta.transaction-api-2.0.1.jar → ...age/lib/jakarta.transaction-api-2.0.1.jar b/...age/lib/jakarta.transaction-api-2.0.1.jar → ...age/lib/jakarta.transaction-api-2.0.1.jar
diff --git a/...essage/lib/jakarta.xml.bind-api-4.0.0.jar → ...essage/lib/jakarta.xml.bind-api-4.0.0.jar b/...essage/lib/jakarta.xml.bind-api-4.0.0.jar → ...essage/lib/jakarta.xml.bind-api-4.0.0.jar
diff --git a/src/AdMessage/lib/jandex-3.1.2.jar → src/admessage/lib/jandex-3.1.2.jar b/src/AdMessage/lib/jandex-3.1.2.jar → src/admessage/lib/jandex-3.1.2.jar
diff --git a/src/AdMessage/lib/javax.json-api-1.1.4.jar → src/admessage/lib/javax.json-api-1.1.4.jar b/src/AdMessage/lib/javax.json-api-1.1.4.jar → src/admessage/lib/javax.json-api-1.1.4.jar
diff --git a/...Message/lib/javax.persistence-api-2.2.jar → ...message/lib/javax.persistence-api-2.2.jar b/...Message/lib/javax.persistence-api-2.2.jar → ...message/lib/javax.persistence-api-2.2.jar
diff --git a/src/AdMessage/lib/jaxb-core-4.0.2.jar → src/admessage/lib/jaxb-core-4.0.2.jar b/src/AdMessage/lib/jaxb-core-4.0.2.jar → src/admessage/lib/jaxb-core-4.0.2.jar
diff --git a/src/AdMessage/lib/jaxb-runtime-4.0.2.jar → src/admessage/lib/jaxb-runtime-4.0.2.jar b/src/AdMessage/lib/jaxb-runtime-4.0.2.jar → src/admessage/lib/jaxb-runtime-4.0.2.jar
diff --git a/...Message/lib/jboss-logging-3.5.0.Final.jar → ...message/lib/jboss-logging-3.5.0.Final.jar b/...Message/lib/jboss-logging-3.5.0.Final.jar → ...message/lib/jboss-logging-3.5.0.Final.jar
diff --git a/src/AdMessage/lib/jul-to-slf4j-2.0.11.jar → src/admessage/lib/jul-to-slf4j-2.0.11.jar b/src/AdMessage/lib/jul-to-slf4j-2.0.11.jar → src/admessage/lib/jul-to-slf4j-2.0.11.jar
diff --git a/src/AdMessage/lib/log4j-api-2.21.1.jar → src/admessage/lib/log4j-api-2.21.1.jar b/src/AdMessage/lib/log4j-api-2.21.1.jar → src/admessage/lib/log4j-api-2.21.1.jar
diff --git a/src/AdMessage/lib/log4j-to-slf4j-2.21.1.jar → src/admessage/lib/log4j-to-slf4j-2.21.1.jar b/src/AdMessage/lib/log4j-to-slf4j-2.21.1.jar → src/admessage/lib/log4j-to-slf4j-2.21.1.jar
diff --git a/src/AdMessage/lib/logback-classic-1.4.14.jar → src/admessage/lib/logback-classic-1.4.14.jar b/src/AdMessage/lib/logback-classic-1.4.14.jar → src/admessage/lib/logback-classic-1.4.14.jar
diff --git a/src/AdMessage/lib/logback-core-1.4.14.jar → src/admessage/lib/logback-core-1.4.14.jar b/src/AdMessage/lib/logback-core-1.4.14.jar → src/admessage/lib/logback-core-1.4.14.jar
diff --git a/...Message/lib/micrometer-commons-1.12.2.jar → ...message/lib/micrometer-commons-1.12.2.jar b/...Message/lib/micrometer-commons-1.12.2.jar → ...message/lib/micrometer-commons-1.12.2.jar
diff --git a/...age/lib/micrometer-observation-1.12.2.jar → ...age/lib/micrometer-observation-1.12.2.jar b/...age/lib/micrometer-observation-1.12.2.jar → ...age/lib/micrometer-observation-1.12.2.jar
diff --git a/...ssage/lib/mysql-connector-java-8.0.30.jar → ...ssage/lib/mysql-connector-java-8.0.30.jar b/...ssage/lib/mysql-connector-java-8.0.30.jar → ...ssage/lib/mysql-connector-java-8.0.30.jar
diff --git a/src/AdMessage/lib/protobuf-java-3.19.4.jar → src/admessage/lib/protobuf-java-3.19.4.jar b/src/AdMessage/lib/protobuf-java-3.19.4.jar → src/admessage/lib/protobuf-java-3.19.4.jar
diff --git a/src/AdMessage/lib/slf4j-api-2.0.2.jar → src/admessage/lib/slf4j-api-2.0.2.jar b/src/AdMessage/lib/slf4j-api-2.0.2.jar → src/admessage/lib/slf4j-api-2.0.2.jar
diff --git a/src/AdMessage/lib/snakeyaml-2.2.jar → src/admessage/lib/snakeyaml-2.2.jar b/src/AdMessage/lib/snakeyaml-2.2.jar → src/admessage/lib/snakeyaml-2.2.jar
diff --git a/src/AdMessage/lib/spring-aop-6.1.3.jar → src/admessage/lib/spring-aop-6.1.3.jar b/src/AdMessage/lib/spring-aop-6.1.3.jar → src/admessage/lib/spring-aop-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-aspects-6.1.3.jar → src/admessage/lib/spring-aspects-6.1.3.jar b/src/AdMessage/lib/spring-aspects-6.1.3.jar → src/admessage/lib/spring-aspects-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-beans-5.3.20.jar → src/admessage/lib/spring-beans-5.3.20.jar b/src/AdMessage/lib/spring-beans-5.3.20.jar → src/admessage/lib/spring-beans-5.3.20.jar
diff --git a/src/AdMessage/lib/spring-beans-6.1.3.jar → src/admessage/lib/spring-beans-6.1.3.jar b/src/AdMessage/lib/spring-beans-6.1.3.jar → src/admessage/lib/spring-beans-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-boot-3.2.2.jar → src/admessage/lib/spring-boot-3.2.2.jar b/src/AdMessage/lib/spring-boot-3.2.2.jar → src/admessage/lib/spring-boot-3.2.2.jar
diff --git a/...e/lib/spring-boot-autoconfigure-3.2.2.jar → ...e/lib/spring-boot-autoconfigure-3.2.2.jar b/...e/lib/spring-boot-autoconfigure-3.2.2.jar → ...e/lib/spring-boot-autoconfigure-3.2.2.jar
diff --git a/...Message/lib/spring-boot-starter-3.2.2.jar → ...message/lib/spring-boot-starter-3.2.2.jar b/...Message/lib/spring-boot-starter-3.2.2.jar → ...message/lib/spring-boot-starter-3.2.2.jar
diff --git a/...age/lib/spring-boot-starter-aop-3.2.2.jar → ...age/lib/spring-boot-starter-aop-3.2.2.jar b/...age/lib/spring-boot-starter-aop-3.2.2.jar → ...age/lib/spring-boot-starter-aop-3.2.2.jar
diff --git a/...ib/spring-boot-starter-data-jpa-3.2.2.jar → ...ib/spring-boot-starter-data-jpa-3.2.2.jar b/...ib/spring-boot-starter-data-jpa-3.2.2.jar → ...ib/spring-boot-starter-data-jpa-3.2.2.jar
diff --git a/...ge/lib/spring-boot-starter-jdbc-3.2.2.jar → ...ge/lib/spring-boot-starter-jdbc-3.2.2.jar b/...ge/lib/spring-boot-starter-jdbc-3.2.2.jar → ...ge/lib/spring-boot-starter-jdbc-3.2.2.jar
diff --git a/...lib/spring-boot-starter-logging-3.2.2.jar → ...lib/spring-boot-starter-logging-3.2.2.jar b/...lib/spring-boot-starter-logging-3.2.2.jar → ...lib/spring-boot-starter-logging-3.2.2.jar
diff --git a/src/AdMessage/lib/spring-context-6.1.3.jar → src/admessage/lib/spring-context-6.1.3.jar b/src/AdMessage/lib/spring-context-6.1.3.jar → src/admessage/lib/spring-context-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-core-5.3.20.jar → src/admessage/lib/spring-core-5.3.20.jar b/src/AdMessage/lib/spring-core-5.3.20.jar → src/admessage/lib/spring-core-5.3.20.jar
diff --git a/src/AdMessage/lib/spring-core-6.1.3.jar → src/admessage/lib/spring-core-6.1.3.jar b/src/AdMessage/lib/spring-core-6.1.3.jar → src/admessage/lib/spring-core-6.1.3.jar
diff --git a/...Message/lib/spring-data-commons-3.2.2.jar → ...message/lib/spring-data-commons-3.2.2.jar b/...Message/lib/spring-data-commons-3.2.2.jar → ...message/lib/spring-data-commons-3.2.2.jar
diff --git a/src/AdMessage/lib/spring-data-jpa-3.2.2.jar → src/admessage/lib/spring-data-jpa-3.2.2.jar b/src/AdMessage/lib/spring-data-jpa-3.2.2.jar → src/admessage/lib/spring-data-jpa-3.2.2.jar
diff --git a/...AdMessage/lib/spring-expression-6.1.3.jar → ...admessage/lib/spring-expression-6.1.3.jar b/...AdMessage/lib/spring-expression-6.1.3.jar → ...admessage/lib/spring-expression-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-jcl-5.3.20.jar → src/admessage/lib/spring-jcl-5.3.20.jar b/src/AdMessage/lib/spring-jcl-5.3.20.jar → src/admessage/lib/spring-jcl-5.3.20.jar
diff --git a/src/AdMessage/lib/spring-jcl-6.1.3.jar → src/admessage/lib/spring-jcl-6.1.3.jar b/src/AdMessage/lib/spring-jcl-6.1.3.jar → src/admessage/lib/spring-jcl-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-jdbc-6.1.3.jar → src/admessage/lib/spring-jdbc-6.1.3.jar b/src/AdMessage/lib/spring-jdbc-6.1.3.jar → src/admessage/lib/spring-jdbc-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-orm-6.1.3.jar → src/admessage/lib/spring-orm-6.1.3.jar b/src/AdMessage/lib/spring-orm-6.1.3.jar → src/admessage/lib/spring-orm-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-tx-6.1.3.jar → src/admessage/lib/spring-tx-6.1.3.jar b/src/AdMessage/lib/spring-tx-6.1.3.jar → src/admessage/lib/spring-tx-6.1.3.jar
diff --git a/src/AdMessage/lib/spring-web-5.3.20.jar → src/admessage/lib/spring-web-5.3.20.jar b/src/AdMessage/lib/spring-web-5.3.20.jar → src/admessage/lib/spring-web-5.3.20.jar
diff --git a/src/AdMessage/lib/txw2-4.0.2.jar → src/admessage/lib/txw2-4.0.2.jar b/src/AdMessage/lib/txw2-4.0.2.jar → src/admessage/lib/txw2-4.0.2.jar
diff --git a/src/AdMessage/lib/ucp-23.2.0.0.jar → src/admessage/lib/ucp-23.2.0.0.jar b/src/AdMessage/lib/ucp-23.2.0.0.jar → src/admessage/lib/ucp-23.2.0.0.jar
diff --git a/src/AdMessage/mvnw → src/admessage/mvnw b/src/AdMessage/mvnw → src/admessage/mvnw
diff --git a/src/AdMessage/mvnw.cmd → src/admessage/mvnw.cmd b/src/AdMessage/mvnw.cmd → src/admessage/mvnw.cmd
diff --git a/src/AdMessage/pom.xml → src/admessage/pom.xml b/src/AdMessage/pom.xml → src/admessage/pom.xml
diff --git a/...java/com/example/admessage/AdMessage.java → ...java/com/example/admessage/AdMessage.java b/...java/com/example/admessage/AdMessage.java → ...java/com/example/admessage/AdMessage.java
diff --git a/...ample/admessage/AdMessageApplication.java → ...ample/admessage/AdMessageApplication.java b/...ample/admessage/AdMessageApplication.java → ...ample/admessage/AdMessageApplication.java
diff --git a/...xample/admessage/AdMessageController.java → ...xample/admessage/AdMessageController.java b/...xample/admessage/AdMessageController.java → ...xample/admessage/AdMessageController.java
diff --git a/...xample/admessage/AdMessageRepository.java → ...xample/admessage/AdMessageRepository.java b/...xample/admessage/AdMessageRepository.java → ...xample/admessage/AdMessageRepository.java
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties