Fixes and updates

Author: andytael

.gitignore

@@ -42,3 +42,4 @@ build/
 .run
 target/
 Thumbs.db
+run-app.sh

spring-cli/README .md

@@ -22,15 +22,49 @@ To run the application locally you need access to an Oracle Database (remotly or
 
 ```shell
 #!/bin/bash
-export
-export
-export
+export spring_datasource_url=<URL to database>
+export liquibase_datasource_username=<Liquibase database user>
+export liquibase_datasource_password=<Liquibase database user password>
+export spring_datasource_username=<Application database user>
+export spring_datasource_password=<Application database user password>
+export otel_exporter_otlp_endpoint=http://localhost:8080 # Fake URL
+mvn spring-boot:run -DskipTests
+```
+
+You need to turn off registering to Eureka (unless you have an instance you can connect to). Set `eureka.client.enabled` to `false` and turn off exporting of tracing. Set `management.otlp.tracing.export.enabled` to `false`. The values are set in the `application.yaml` file. For example:
+
+```yaml
+eureka:
+  instance:
+    hostname: ${spring.application.name}
+    preferIpAddress: true
+  client:
+    service-url:
+      defaultZone: ${eureka.service-url}
+    fetch-registry: true
+    register-with-eureka: true
+    enabled: false
+```
 
-mvn spring-boot:run
+```yaml
+management:
+  otlp:
+    tracing:
+      endpoint: ${otel.exporter.otlp.endpoint
+      export:
+        enabled: false
 ```
 
 Execute the shell script running the following command:
 
 ```shell
 source run-app.sh
+```
+
+You can see a few `WARNINGS` with this message which can be ignored:
+
+```log
+WARNING:
+
+Liquibase detected the following invalid LIQUIBASE_* environment variables:
 ```

spring-cli/projects/obaas/pom.xml

@@ -18,6 +18,7 @@
 
     <properties>
         <java.version>17</java.version>
+        <spring-cloud.version>2024.0.0</spring-cloud.version>
         <oracle-springboot-starter.version>24.4.0</oracle-springboot-starter.version>
         <liquibase.version>4.31.0</liquibase.version>
         <datasource-micrometer-spring-boot.version>1.0.6</datasource-micrometer-spring-boot.version>
@@ -67,13 +68,51 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
+
         <!-- This adds metrics for data sources.                                    -->
         <dependency>
             <groupId>net.ttddyy.observation</groupId>
             <artifactId>datasource-micrometer-spring-boot</artifactId>
             <version>${datasource-micrometer-spring-boot.version}</version>
         </dependency>
 
+        <!-- Eureka client-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+        </dependency>
+
+        <!-- Core module of Micrometer -->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-core</artifactId>
+<!--            <version>${micrometer-core.version}</version>-->
+        </dependency>
+
+        <!-- Prometheues-->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+
+        <!-- Adds the Tracer Implementation -->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+
+        <!-- Adds an exporter to store the traces -->
+        <dependency>
+            <groupId>io.opentelemetry</groupId>
+            <artifactId>opentelemetry-exporter-otlp</artifactId>
+        </dependency>
+
+        <!-- Adds the Tracing API -->
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing</artifactId>
+        </dependency>
+
         <!-- Spring test support.                                                   -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -82,6 +121,18 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>

spring-cli/projects/obaas/src/main/resources/application.yaml

@@ -62,9 +62,9 @@ eureka:
       defaultZone: ${eureka.service-url}
     fetch-registry: true
     register-with-eureka: true
-    enabled: true
+    enabled: false
 
-# This section confiugres 
+# This section configures tracing and metrics 
 management:
   endpoint:
     health:
@@ -89,6 +89,10 @@ management:
   otlp:
     tracing:
       endpoint: ${otel.exporter.otlp.endpoint}
+      export:
+        enabled: false
+
+
 
 logging:
   level:

spring-cli/projects/obaas/src/main/resources/db/changelog/data.sql

@@ -1,6 +1,6 @@
 -- liquibase formatted sql
 
--- changeset restservice:1 runAlways:true
+-- changeset springcliapp:1 runAlways:true
 truncate table mytable;
 
 insert into mytable (a,b,c,d) 

spring-cli/projects/obaas/src/main/resources/db/changelog/table.sql

@@ -1,11 +1,11 @@
 -- liquibase formatted sql
 
---changeset restservice:1
---preconditions onfail:restservice_ran onerror:restservice_ran
+--changeset springcliapp:1
+--preconditions onfail:MARK_RAN onerror:MARK_RAN
 --precondition-sql-check expectedresult:0 select count(*) from mytable where 1=2
 drop table mytable;
 
---changeset customer:2
+--changeset springcliapp:2
 create table mytable (
     a varchar2 (20),
     b varchar2 (40),