Merge pull request #18999 from panos-kakos/JAVA-49505

[JAVA-49505]

Author: ulisseslima

spring-boot-modules/spring-boot-3-observation/pom.xml

@@ -71,6 +71,11 @@
             <artifactId>p6spy-spring-boot-starter</artifactId>
             <version>${p6spy-spring-boot-starter.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.gavlyukovskiy</groupId>
+            <artifactId>datasource-proxy-spring-boot-starter</artifactId>
+            <version>${datasource-proxy-spring-boot-starter.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -133,8 +138,12 @@
 
     <properties>
         <start-class>com.baeldung.samples.SimpleObservationApplication</start-class>
-        <p6spy-spring-boot-starter.version>1.9.0</p6spy-spring-boot-starter.version>
+        <p6spy-spring-boot-starter.version>1.12.1</p6spy-spring-boot-starter.version>
+        <datasource-proxy-spring-boot-starter.version>1.12.1</datasource-proxy-spring-boot-starter.version>
         <micrometer.version>1.15.3</micrometer.version>
+        <spring-boot.version>3.5.8</spring-boot.version>
+        <logback.version>1.5.20</logback.version>
+        <slf4j.version>2.0.17</slf4j.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/logging/LoggingApplication.java

@@ -0,0 +1,43 @@
+package com.baeldung.logging;
+
+import com.baeldung.logging.repository.CampaignRepository;
+import com.baeldung.logging.service.CampaignService;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.PropertySource;
+
+import java.time.LocalDate;
+
+@SpringBootApplication
+@PropertySource({ "classpath:logging/logging.properties" })
+class LoggingApplication {
+
+    private static final Logger logger = LoggerFactory.getLogger(LoggingApplication.class);
+
+    public static void main(String[] args) {
+        SpringApplication.run(LoggingApplication.class, args);
+    }
+
+    @Bean
+    CommandLineRunner demo(CampaignRepository campaignRepository, CampaignService campaignService) {
+        return args -> {
+            LocalDate startDate = LocalDate.of(2024, 1, 1);
+            LocalDate endDate = LocalDate.of(2024, 12, 31);
+
+            logger.info("Executing query to find campaigns between {} and {}", startDate, endDate);
+            var campaigns = campaignRepository.findCampaignsByStartDateBetween(startDate, endDate);
+            logger.info("Found {} campaigns", campaigns.size());
+            campaigns.forEach(campaign -> logger.info("Campaign: {}", campaign));
+
+            logger.info("Executing JdbcTemplate query to find campaign by name");
+            Long campaignId = campaignService.findCampaignIdByName("Spring Campaign");
+            logger.info("Found campaign with ID: {}", campaignId);
+        };
+    }
+
+}

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/logging/model/Campaign.java

@@ -0,0 +1,82 @@
+package com.baeldung.logging.model;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+import jakarta.persistence.*;
+
+@Entity
+@Table(name = "campaign")
+public class Campaign {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(name = "name")
+    private String name;
+
+    @Column(name = "budget")
+    private BigDecimal budget;
+
+    @Column(name = "start_date")
+    private LocalDate startDate;
+
+    @Column(name = "end_date")
+    private LocalDate endDate;
+
+    public Campaign() {
+    }
+
+    public Campaign(String name, BigDecimal budget, LocalDate startDate, LocalDate endDate) {
+        this.name = name;
+        this.budget = budget;
+        this.startDate = startDate;
+        this.endDate = endDate;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public BigDecimal getBudget() {
+        return budget;
+    }
+
+    public void setBudget(BigDecimal budget) {
+        this.budget = budget;
+    }
+
+    public LocalDate getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(LocalDate startDate) {
+        this.startDate = startDate;
+    }
+
+    public LocalDate getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(LocalDate endDate) {
+        this.endDate = endDate;
+    }
+
+    @Override
+    public String toString() {
+        return "Campaign{" + "id=" + id + ", name='" + name + '\'' + ", budget=" + budget + ", startDate=" + startDate + ", endDate=" + endDate + '}';
+    }
+}

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/logging/repository/CampaignRepository.java

@@ -0,0 +1,18 @@
+package com.baeldung.logging.repository;
+
+import com.baeldung.logging.model.Campaign;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Repository
+public interface CampaignRepository extends JpaRepository<Campaign, Long> {
+
+    @Query("SELECT c FROM Campaign c WHERE c.startDate BETWEEN :startDate AND :endDate")
+    List<Campaign> findCampaignsByStartDateBetween(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
+}

spring-boot-modules/spring-boot-3-observation/src/main/java/com/baeldung/logging/service/CampaignService.java

@@ -0,0 +1,18 @@
+package com.baeldung.logging.service;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CampaignService {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    public CampaignService(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public Long findCampaignIdByName(String name) {
+        return jdbcTemplate.queryForObject("SELECT id FROM campaign WHERE name = ?", Long.class, name);
+    }
+}

spring-boot-modules/spring-boot-3-observation/src/main/resources/data.sql

@@ -0,0 +1,4 @@
+INSERT INTO campaign (name, budget, start_date, end_date) VALUES ('Spring Campaign', 10000.00, '2024-01-15', '2024-03-31');
+INSERT INTO campaign (name, budget, start_date, end_date) VALUES ('Summer Sale', 25000.00, '2024-06-01', '2024-08-31');
+INSERT INTO campaign (name, budget, start_date, end_date) VALUES ('Holiday Special', 50000.00, '2024-11-01', '2024-12-31');
+INSERT INTO campaign (name, budget, start_date, end_date) VALUES ('New Year Promo', 15000.00, '2024-01-01', '2024-01-31');

spring-boot-modules/spring-boot-3-observation/src/main/resources/logback.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.hibernate.SQL" level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="org.hibernate.orm.jdbc.bind" level="TRACE">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="org.hibernate.type.descriptor.sql.BasicBinder" level="TRACE">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="org.springframework.jdbc.core.JdbcTemplate" level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="org.springframework.jdbc.core.StatementCreatorUtils" level="TRACE">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="net.ttddyy.dsproxy.listener" level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>

spring-boot-modules/spring-boot-3-observation/src/main/resources/logging/logging.properties

@@ -0,0 +1,11 @@
+spring.jpa.show-sql=true
+spring.jpa.properties.hibernate.format_sql=true
+
+logging.level.org.hibernate.SQL=DEBUG
+logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+logging.level.org.hibernate.orm.jdbc.bind=TRACE
+
+logging.level.org.springframework.jdbc.core.JdbcTemplate=DEBUG
+logging.level.org.springframework.jdbc.core.StatementCreatorUtils=TRACE
+
+logging.level.net.ttddyy.dsproxy.listener=debug

spring-boot-modules/spring-boot-3-observation/src/main/resources/schema.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS campaign (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    name VARCHAR(255),
+    budget DECIMAL(19, 2),
+    start_date DATE,
+    end_date DATE
+);