Compare commits

...

5 Commits

Author SHA1 Message Date
Hanelore.Ianoseck
d114548626 Changed OTEL tracing endpoint 2023-10-31 16:47:06 +02:00
Hanelore.Ianoseck
9598b375ab Explicitly enabled tracing in app classpath application.yaml 2023-10-30 20:27:10 +02:00
Hanelore.Ianoseck
64a6af780b Removed SQL dialect config to account for the postgres removal notice 2023-10-30 15:18:23 +02:00
Hanelore.Ianoseck
9f0dcc7861 Disabled tracing for development runtime profiles 2023-10-26 18:44:32 +03:00
Hanelore.Ianoseck
39bb61feb2 Changed dependencies so that tracing can occur in the service 2023-10-25 17:05:44 +03:00
4 changed files with 19 additions and 14 deletions

View File

@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
plugins {
java
id("org.springframework.boot") version "3.0.6"
id("org.springframework.boot") version "3.1.4"
id("io.spring.dependency-management") version "1.1.0"
id("org.sonarqube") version "4.0.0.2929"
pmd
@ -82,8 +82,11 @@ tasks.named<BootBuildImage>("bootBuildImage") {
dependencies {
implementation("com.knecon.fforesight:keycloak-commons:0.21.0")
// Own dependencies
implementation("com.knecon.fforesight:keycloak-commons:0.22.0")
implementation("com.iqser.red.commons:storage-commons:2.43.0")
implementation("com.knecon.fforesight:swagger-commons:0.5.0")
implementation("org.postgresql:postgresql:42.5.4")
implementation("com.google.guava:guava:31.1-jre")
implementation("org.liquibase:liquibase-core:4.17.2")
@ -99,24 +102,23 @@ dependencies {
implementation("org.apache.commons:commons-lang3:3.12.0")
implementation("commons-validator:commons-validator:1.7")
implementation("org.springframework.boot:spring-boot-configuration-processor")
implementation("com.iqser.red.commons:storage-commons:2.43.0")
implementation("jakarta.mail:jakarta.mail-api:2.1.2")
implementation("org.eclipse.angus:angus-mail:2.0.2")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.cloud:spring-cloud-starter-openfeign")
testImplementation("org.projectlombok:lombok")
compileOnly("org.projectlombok:lombok")
developmentOnly("org.springframework.boot:spring-boot-devtools")
annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
annotationProcessor("org.projectlombok:lombok")
// Test dependencies
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.cloud:spring-cloud-starter-openfeign")
testImplementation("org.springframework.amqp:spring-rabbit-test")
testImplementation("org.testcontainers:postgresql:1.18.3")
testImplementation("com.github.dasniko:testcontainers-keycloak:2.5.0")
testImplementation("org.testcontainers:testcontainers:1.19.0")
testImplementation("org.testcontainers:junit-jupiter:1.19.0")
testImplementation("org.projectlombok:lombok")
testAnnotationProcessor("org.projectlombok:lombok")
}
extra["springCloudVersion"] = "2022.0.2"

View File

@ -30,6 +30,6 @@ fforesight:
springdoc:
auth-server-url: http://localhost:8080
management.tracing.enabled: false
cors.enabled: true

View File

@ -1,3 +1,4 @@
logging.pattern.level: "%5p [${spring.application.name},%X{traceId:-},%X{spanId:-}]"
management:
endpoint:
@ -6,6 +7,12 @@ management:
health.enabled: true
endpoints.web.exposure.include: prometheus, health, metrics
metrics.export.prometheus.enabled: ${monitoring.enabled:false}
tracing:
sampling:
probability: 1.0
otlp:
tracing:
endpoint: http://opentelemetry-collector:4318/v1/traces
info:
description: Tenant User Management Service
@ -14,12 +21,13 @@ server:
port: 8080
spring:
application:
name: tenant-user-management
datasource:
url: jdbc:postgresql://${PSQL_HOST:localhost}:${PSQL_PORT:5432}/${PSQL_DATABASE:master}?ApplicationName=${spring.application.name:}&cachePrepStmts=true&useServerPrepStmts=true&rewriteBatchedStatements=true
driverClassName: org.postgresql.Driver
username: ${PSQL_USERNAME:fforesight}
password: ${PSQL_PASSWORD:fforesight}
platform: org.hibernate.dialect.PostgreSQL95Dialect
hikari:
maximumPoolSize: 2
data-source-properties:
@ -36,7 +44,6 @@ spring:
allow-circular-references: true
jpa:
open-in-view: true
database-platform: org.hibernate.dialect.PostgreSQL95Dialect
hibernate:
ddl-auto: none
naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
@ -75,8 +82,6 @@ spring:
liquibase:
change-log: classpath:/db/changelog/db.changelog-master.yaml
enabled: true
application:
name: tenant-user-management
data:
redis:
host: ${REDIS_HOST:localhost}

View File

@ -19,7 +19,6 @@ spring:
driverClassName: org.postgresql.Driver
username: ${PSQL_USERNAME:fforesight}
password: ${PSQL_PASSWORD:fforesight}
platform: org.hibernate.dialect.PostgreSQL95Dialect
hikari:
maximumPoolSize: 2
minimum-idle: 2
@ -37,7 +36,6 @@ spring:
allow-circular-references: true
jpa:
open-in-view: true
database-platform: org.hibernate.dialect.PostgreSQL95Dialect
hibernate:
ddl-auto: none
naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy