From 1ac3d7183b2d1cad345117972805db3de4c705af Mon Sep 17 00:00:00 2001 From: shilpa Date: Wed, 14 May 2025 11:34:42 +0530 Subject: [PATCH 01/70] Updated idgen service --- core-services/egov-idgen/pom.xml | 20 ++++++++++++++++++- .../src/main/resources/application.properties | 12 ++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/core-services/egov-idgen/pom.xml b/core-services/egov-idgen/pom.xml index d4a2e1e8f9e..0a874a4555c 100644 --- a/core-services/egov-idgen/pom.xml +++ b/core-services/egov-idgen/pom.xml @@ -20,6 +20,24 @@ UTF-8 1.18.22 + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + org.springframework @@ -67,7 +85,7 @@ org.egov.services tracer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT org.egov diff --git a/core-services/egov-idgen/src/main/resources/application.properties b/core-services/egov-idgen/src/main/resources/application.properties index 7cb8e6a37b6..b400ddb805c 100644 --- a/core-services/egov-idgen/src/main/resources/application.properties +++ b/core-services/egov-idgen/src/main/resources/application.properties @@ -1,6 +1,7 @@ logging.pattern.console=%clr(%X{CORRELATION_ID:-}) %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} invalid.input=Invalid input +spring.datasource.driver-class-name=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver spring.datasource.url= jdbc:postgresql://localhost:5432/rainmaker_new spring.datasource.username=postgres spring.datasource.password=postgres @@ -25,4 +26,13 @@ management.endpoints.web.base-path=/ mdms.service.host=https://dev.digit.org/ mdms.service.search.uri=egov-mdms-service/v1/_search -id.timezone=IST \ No newline at end of file +id.timezone=IST +otel.traces.exporter=otlp +otel.service.name=egov-idgen +otel.logs.exporter=none +otel.metrics.exporter=none +otel.exporter.otlp.endpoint=http://jaeger-collector.tracing:4318 +otel.exporter.otlp.protocol=http/protobuf +otel.instrumentation.kafka.enabled=true +otel.instrumentation.kafka.experimental-span-attributes=true +otel.instrumentation.http.server.ignore-urls=/egov-idgen/health,/egov-idgen/promethus \ No newline at end of file From c32b9c2e0a12b8a8b01824ef2b93098d95ee5625 Mon Sep 17 00:00:00 2001 From: shilpa Date: Wed, 14 May 2025 11:52:48 +0530 Subject: [PATCH 02/70] Updated mdms-v2 service --- core-services/mdms-v2/pom.xml | 20 ++++++++++++++++++- .../src/main/resources/application.properties | 13 ++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/core-services/mdms-v2/pom.xml b/core-services/mdms-v2/pom.xml index f5cefd7754f..7d9605b0866 100644 --- a/core-services/mdms-v2/pom.xml +++ b/core-services/mdms-v2/pom.xml @@ -22,6 +22,24 @@ ${java.version} ${java.version} + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + org.projectlombok @@ -40,7 +58,7 @@ org.egov.services tracer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT diff --git a/core-services/mdms-v2/src/main/resources/application.properties b/core-services/mdms-v2/src/main/resources/application.properties index acdf13b0d6c..1f4b6172f32 100644 --- a/core-services/mdms-v2/src/main/resources/application.properties +++ b/core-services/mdms-v2/src/main/resources/application.properties @@ -6,7 +6,7 @@ management.endpoints.web.base-path=/ app.timezone=UTC #DATABASE CONFIGURATION -spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.driver-class-name=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver spring.datasource.url=jdbc:postgresql://localhost:5432/postgres spring.datasource.username=postgres spring.datasource.password=postgres @@ -38,4 +38,13 @@ egov.mdms.data.update.topic=update-mdms-data mdms.default.offset=0 mdms.default.limit=10 -logging.level.org.springframework.aop=DEBUG \ No newline at end of file +logging.level.org.springframework.aop=DEBUG +otel.traces.exporter=otlp +otel.service.name=mdms-v2 +otel.logs.exporter=none +otel.metrics.exporter=none +otel.exporter.otlp.endpoint=http://jaeger-collector.tracing:4318 +otel.exporter.otlp.protocol=http/protobuf +otel.instrumentation.kafka.enabled=true +otel.instrumentation.kafka.experimental-span-attributes=true +otel.instrumentation.http.server.ignore-urls=/mdms-v2/health,/mdms-v2/promethus \ No newline at end of file From fa27f939857a859b899cce5fb7de00ec5564c383 Mon Sep 17 00:00:00 2001 From: shilpa Date: Wed, 14 May 2025 13:33:40 +0530 Subject: [PATCH 03/70] Updated workflow service --- core-services/egov-workflow-v2/pom.xml | 20 ++++++++++++++++++- .../src/main/resources/application.properties | 15 +++++++++++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/core-services/egov-workflow-v2/pom.xml b/core-services/egov-workflow-v2/pom.xml index 4b56843b41e..c0415b84f2b 100644 --- a/core-services/egov-workflow-v2/pom.xml +++ b/core-services/egov-workflow-v2/pom.xml @@ -25,6 +25,24 @@ + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + diff --git a/core-services/egov-url-shortening/src/main/resources/application.properties b/core-services/egov-url-shortening/src/main/resources/application.properties index 3772b0425a0..a4f8d0be751 100644 --- a/core-services/egov-url-shortening/src/main/resources/application.properties +++ b/core-services/egov-url-shortening/src/main/resources/application.properties @@ -8,7 +8,7 @@ spring.redis.port=6379 app.timezone=UTC -spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.driver-class-name=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver spring.datasource.url=jdbc:postgresql://localhost:5432/devdb spring.datasource.username=postgres spring.datasource.password=postgres @@ -64,4 +64,13 @@ state.level.tenantid.length=2 is.environment.multi.instance=false hashids.salt=randomsalt -hsahids.min.length=3 \ No newline at end of file +hsahids.min.length=3 +otel.traces.exporter=otlp +otel.service.name=egov-url-shortening +otel.logs.exporter=none +otel.metrics.exporter=none +otel.exporter.otlp.endpoint=http://jaeger-collector.tracing:4318 +otel.exporter.otlp.protocol=http/protobuf +otel.instrumentation.kafka.enabled=true +otel.instrumentation.kafka.experimental-span-attributes=true +otel.instrumentation.http.server.ignore-urls=/egov-url-shortening/health,/egov-url-shortening/promethus \ No newline at end of file From 637fac6d27a53e4ba11fb55ad6f8e2b052da8337 Mon Sep 17 00:00:00 2001 From: shilpa Date: Thu, 22 May 2025 13:06:05 +0530 Subject: [PATCH 22/70] Updated egov-user-event --- core-services/egov-user-event/pom.xml | 21 +++++++++++++++++-- .../src/main/resources/application.properties | 13 ++++++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/core-services/egov-user-event/pom.xml b/core-services/egov-user-event/pom.xml index 40e8b2c5d3e..7df440990b7 100644 --- a/core-services/egov-user-event/pom.xml +++ b/core-services/egov-user-event/pom.xml @@ -28,7 +28,24 @@ ${java.version} 3.3.9 - + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + org.springframework.boot @@ -59,7 +76,7 @@ org.egov.services tracer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT diff --git a/core-services/egov-user-event/src/main/resources/application.properties b/core-services/egov-user-event/src/main/resources/application.properties index 4c4e4cd64bc..95aa6658f75 100644 --- a/core-services/egov-user-event/src/main/resources/application.properties +++ b/core-services/egov-user-event/src/main/resources/application.properties @@ -1,5 +1,5 @@ #---------------------------- DATABASE CONFIGURATIONS -----------------------------# -spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.driver-class-name=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver spring.datasource.url=jdbc:postgresql://localhost:5432/mseva spring.datasource.username=postgres spring.datasource.password=postgres @@ -70,4 +70,13 @@ mseva.notif.search.limit=200 #------------------------------ LOGGER CONFIGURATIONS -----------------------------# logging.pattern.console=%clr(%X{CORRELATION_ID:-}) %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} -log4j.logger.org.springframework.jdbc.core = TRACE \ No newline at end of file +log4j.logger.org.springframework.jdbc.core = TRACE +otel.traces.exporter=otlp +otel.service.name=egov-user-event +otel.logs.exporter=none +otel.metrics.exporter=none +otel.exporter.otlp.endpoint=http://jaeger-collector.tracing:4318 +otel.exporter.otlp.protocol=http/protobuf +otel.instrumentation.kafka.enabled=true +otel.instrumentation.kafka.experimental-span-attributes=true +otel.instrumentation.http.server.ignore-urls=/egov-user-event/health,/egov-user-event/promethus From f0cf05a5c9e394c7ba501a47d61e946f3b5ce52f Mon Sep 17 00:00:00 2001 From: shilpa Date: Thu, 22 May 2025 13:43:51 +0530 Subject: [PATCH 23/70] Updated gateway service --- core-services/gateway/pom.xml | 20 ++++++++++++++++++- .../src/main/resources/application.properties | 13 ++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/core-services/gateway/pom.xml b/core-services/gateway/pom.xml index 4f27aa17ca1..1fe3885a663 100644 --- a/core-services/gateway/pom.xml +++ b/core-services/gateway/pom.xml @@ -20,6 +20,24 @@ ${java.version} ${java.version} + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + org.springframework.boot @@ -53,7 +71,7 @@ org.egov.services tracer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT org.egov.services diff --git a/core-services/gateway/src/main/resources/application.properties b/core-services/gateway/src/main/resources/application.properties index 0e4acc0f53f..1d49c947c13 100644 --- a/core-services/gateway/src/main/resources/application.properties +++ b/core-services/gateway/src/main/resources/application.properties @@ -3,7 +3,7 @@ spring.main.web-application-type=reactive # spring.cloud.gateway.routes.location=file:routes.yaml - +spring.datasource.driver-class-name=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver eventlog.enabled = false eventlog.topic = springGateway.eventlog eventlog.urls.whitelist= @@ -52,4 +52,13 @@ spring.data.redis.default.replenishRate = 5 spring.data.redis.default.burstCapacity = 5 egov.custom.async.uris=/user/_logout -spring.routes.filepath=classpath:routes.properties \ No newline at end of file +spring.routes.filepath=classpath:routes.properties +otel.traces.exporter=otlp +otel.service.name=gateway +otel.logs.exporter=none +otel.metrics.exporter=none +otel.exporter.otlp.endpoint=http://jaeger-collector.tracing:4318 +otel.exporter.otlp.protocol=http/protobuf +otel.instrumentation.kafka.enabled=true +otel.instrumentation.kafka.experimental-span-attributes=true +otel.instrumentation.http.server.ignore-urls=/gateway/health,/gateway/promethus \ No newline at end of file From c16614d693e216630a722e1c6c2558699bb77cae Mon Sep 17 00:00:00 2001 From: shilpa Date: Thu, 22 May 2025 13:53:59 +0530 Subject: [PATCH 24/70] Updated service request --- core-services/service-request/pom.xml | 20 ++++++++++++++++++- .../src/main/resources/application.properties | 13 ++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/core-services/service-request/pom.xml b/core-services/service-request/pom.xml index fdbe1e2b826..55abb916069 100644 --- a/core-services/service-request/pom.xml +++ b/core-services/service-request/pom.xml @@ -23,6 +23,24 @@ + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + org.springframework.boot @@ -68,7 +86,7 @@ org.egov.services tracer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT org.egov diff --git a/core-services/service-request/src/main/resources/application.properties b/core-services/service-request/src/main/resources/application.properties index b08e73fc128..af7425c2100 100644 --- a/core-services/service-request/src/main/resources/application.properties +++ b/core-services/service-request/src/main/resources/application.properties @@ -4,7 +4,7 @@ server.port=8280 app.timezone=UTC #DATABASE CONFIGURATION -spring.datasource.driver-class-name=org.postgresql.Driver +spring.datasource.driver-class-name=io.opentelemetry.instrumentation.jdbc.OpenTelemetryDriver spring.datasource.url=jdbc:postgresql://localhost:5432/testdb spring.datasource.username=postgres spring.datasource.password=postgres @@ -50,4 +50,13 @@ egov.service.definition.create.topic=save-service-definition egov.service.create.topic=save-service # String input size configuration -egov.max.string.input.size=8192 \ No newline at end of file +egov.max.string.input.size=8192 +otel.traces.exporter=otlp +otel.service.name=service-request +otel.logs.exporter=none +otel.metrics.exporter=none +otel.exporter.otlp.endpoint=http://jaeger-collector.tracing:4318 +otel.exporter.otlp.protocol=http/protobuf +otel.instrumentation.kafka.enabled=true +otel.instrumentation.kafka.experimental-span-attributes=true +otel.instrumentation.http.server.ignore-urls=/service-request/health,/service-request/promethus \ No newline at end of file From 12ae1fa9d01e7abefdb5347844a7dbd54a847134 Mon Sep 17 00:00:00 2001 From: Varun Reddy <155146627+varunreddy-egov@users.noreply.github.com> Date: Thu, 22 May 2025 14:27:42 +0530 Subject: [PATCH 25/70] Updated Dockerfile --- .../egov-accesscontrol/src/main/resources/db/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core-services/egov-accesscontrol/src/main/resources/db/Dockerfile b/core-services/egov-accesscontrol/src/main/resources/db/Dockerfile index 317ab48a139..2a0ff3bc53b 100644 --- a/core-services/egov-accesscontrol/src/main/resources/db/Dockerfile +++ b/core-services/egov-accesscontrol/src/main/resources/db/Dockerfile @@ -2,12 +2,8 @@ FROM egovio/flyway:10.7.1 COPY ./migration/ddl /flyway/sql -COPY ./migration/seed /flyway/seed - COPY ./migration/dev /flyway/dev -COPY ./migration/qa /flyway/qa - COPY migrate.sh /usr/bin/migrate.sh RUN chmod +x /usr/bin/migrate.sh From bf90938da78fdfaab54070eef698fdcf95c83c1f Mon Sep 17 00:00:00 2001 From: nikhilmulinti <127198713+nikhilmulinti@users.noreply.github.com> Date: Thu, 22 May 2025 16:18:14 +0530 Subject: [PATCH 26/70] Update Dockerfile-java 8 --- build/maven-java8/Dockerfile | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/build/maven-java8/Dockerfile b/build/maven-java8/Dockerfile index 65ca7d58513..1847aa78864 100644 --- a/build/maven-java8/Dockerfile +++ b/build/maven-java8/Dockerfile @@ -1,31 +1,27 @@ -FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build -# FROM egovio/amazoncorretto:17-alpine3.19 AS build +FROM maven:3.9.6-amazoncorretto-17 AS build ARG WORK_DIR WORKDIR /app -# Install Maven -RUN apk add --no-cache maven - -# copy the project files +# Copy project files COPY ${WORK_DIR}/pom.xml ./pom.xml -COPY build/maven-java8/start.sh ./start.sh - -# not useful for stateless builds -# RUN mvn -B dependency:go-offline - +COPY build/maven/start.sh ./start.sh COPY ${WORK_DIR}/src ./src -RUN mvn -B -f /app/pom.xml package +# Build the project +RUN mvn -B -f /app/pom.xml package -# Create runtime image -FROM egovio/8-openjdk-alpine -# FROM egovio/amazoncorretto:17-alpine3.19 - +# Runtime image – using a multi-arch base image +FROM amazoncorretto:17-alpine WORKDIR /opt/egov +# Copy artifacts from the build stage COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/ -RUN chmod +x /opt/egov/start.sh +# Ensure the start script has correct line endings and is executable +RUN dos2unix /opt/egov/start.sh && chmod +x /opt/egov/start.sh + +# Verify architecture inside the container +RUN uname -m -CMD ["/opt/egov/start.sh"] \ No newline at end of file +CMD ["/opt/egov/start.sh"] From f9af742c17b44bddfe3e793d81a1fe0631e749d2 Mon Sep 17 00:00:00 2001 From: nikhilmulinti <127198713+nikhilmulinti@users.noreply.github.com> Date: Thu, 22 May 2025 16:37:21 +0530 Subject: [PATCH 27/70] Update Dockerfile- reverting back --- build/maven-java8/Dockerfile | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/build/maven-java8/Dockerfile b/build/maven-java8/Dockerfile index 1847aa78864..2982d0017b1 100644 --- a/build/maven-java8/Dockerfile +++ b/build/maven-java8/Dockerfile @@ -1,27 +1,31 @@ -FROM maven:3.9.6-amazoncorretto-17 AS build +FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build +# FROM egovio/amazoncorretto:17-alpine3.19 AS build ARG WORK_DIR WORKDIR /app -# Copy project files +# Install Maven +RUN apk add --no-cache maven + +# copy the project files COPY ${WORK_DIR}/pom.xml ./pom.xml -COPY build/maven/start.sh ./start.sh -COPY ${WORK_DIR}/src ./src +COPY build/maven-java8/start.sh ./start.sh -# Build the project +# not useful for stateless builds +# RUN mvn -B dependency:go-offline + +COPY ${WORK_DIR}/src ./src RUN mvn -B -f /app/pom.xml package -# Runtime image – using a multi-arch base image -FROM amazoncorretto:17-alpine + +# Create runtime image +FROM egovio/8-openjdk-alpine +# FROM egovio/amazoncorretto:17-alpine3.19 + WORKDIR /opt/egov -# Copy artifacts from the build stage COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/ -# Ensure the start script has correct line endings and is executable -RUN dos2unix /opt/egov/start.sh && chmod +x /opt/egov/start.sh - -# Verify architecture inside the container -RUN uname -m +RUN chmod +x /opt/egov/start.sh CMD ["/opt/egov/start.sh"] From 9cdeaf6fd60ee50c692b477631d34137659976fc Mon Sep 17 00:00:00 2001 From: varunreddy-egov Date: Fri, 23 May 2025 10:18:26 +0530 Subject: [PATCH 28/70] Modified gateway POM according to new tracer. --- core-services/gateway/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core-services/gateway/pom.xml b/core-services/gateway/pom.xml index 1fe3885a663..edbbd1575f6 100644 --- a/core-services/gateway/pom.xml +++ b/core-services/gateway/pom.xml @@ -82,16 +82,17 @@ org.springframework.kafka spring-kafka + + org.apache.httpcomponents + httpclient + 4.5.14 + com.google.code.gson gson 2.10.1 - - org.springframework.kafka - spring-kafka - org.springframework.boot spring-boot-starter-web From b913b234c3aeb0d23b2b8eeb759901fd410419a1 Mon Sep 17 00:00:00 2001 From: varunreddy-egov Date: Fri, 23 May 2025 11:31:46 +0530 Subject: [PATCH 29/70] Added opentelemetry tracing & @CustomSafeHtml in tracer. --- core-services/libraries/tracer/pom.xml | 85 ++++++++++++++----- .../tracer/annotations/CustomSafeHtml.java | 19 +++++ .../tracer/config/TracerConfiguration.java | 47 +++++----- .../egov/tracer/validators/HTMLValidator.java | 23 +++++ 4 files changed, 130 insertions(+), 44 deletions(-) create mode 100644 core-services/libraries/tracer/src/main/java/org/egov/tracer/annotations/CustomSafeHtml.java create mode 100644 core-services/libraries/tracer/src/main/java/org/egov/tracer/validators/HTMLValidator.java diff --git a/core-services/libraries/tracer/pom.xml b/core-services/libraries/tracer/pom.xml index 3b541e905e8..538441b48ec 100644 --- a/core-services/libraries/tracer/pom.xml +++ b/core-services/libraries/tracer/pom.xml @@ -10,7 +10,7 @@ org.egov.services tracer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT tracer Assist in tracing http and message queue flows @@ -26,6 +26,24 @@ 17 UTF-8 + + + + io.opentelemetry + opentelemetry-bom + 1.35.0 + pom + import + + + io.opentelemetry.instrumentation + opentelemetry-instrumentation-bom-alpha + 2.1.0-alpha + pom + import + + + org.springframework.boot @@ -56,26 +74,6 @@ org.springframework.boot spring-boot-starter-actuator - - - io.jaegertracing - jaeger-client - 0.31.0 - net.logstash.logback logstash-logback-encoder @@ -95,11 +93,56 @@ jakarta.servlet-api 5.0.0 + + org.jsoup + jsoup + 1.17.2 + org.egov.services services-common 2.9.0-SNAPSHOT + + + + + io.opentelemetry.instrumentation + opentelemetry-spring-boot-starter + 2.1.0-alpha + + + + io.opentelemetry.instrumentation + opentelemetry-spring-kafka-2.7 + 2.1.0-alpha + + + + io.opentelemetry + opentelemetry-exporter-otlp + 1.35.0 + + + io.opentelemetry + opentelemetry-sdk-extension-autoconfigure + 1.35.0 + + + io.opentelemetry.instrumentation + opentelemetry-jdbc + 2.0.0-alpha + + + + io.micrometer + micrometer-registry-prometheus + + + io.micrometer + micrometer-tracing-bridge-otel + + diff --git a/core-services/libraries/tracer/src/main/java/org/egov/tracer/annotations/CustomSafeHtml.java b/core-services/libraries/tracer/src/main/java/org/egov/tracer/annotations/CustomSafeHtml.java new file mode 100644 index 00000000000..4757bed6faf --- /dev/null +++ b/core-services/libraries/tracer/src/main/java/org/egov/tracer/annotations/CustomSafeHtml.java @@ -0,0 +1,19 @@ +package org.egov.tracer.annotations; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import org.egov.tracer.validators.HTMLValidator; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = HTMLValidator.class) +public @interface CustomSafeHtml { + String message() default "Unsafe HTML tags included"; + Class[] groups() default {}; + public abstract Class[] payload() default {}; +} \ No newline at end of file diff --git a/core-services/libraries/tracer/src/main/java/org/egov/tracer/config/TracerConfiguration.java b/core-services/libraries/tracer/src/main/java/org/egov/tracer/config/TracerConfiguration.java index d547354d6dc..889f8a652bf 100644 --- a/core-services/libraries/tracer/src/main/java/org/egov/tracer/config/TracerConfiguration.java +++ b/core-services/libraries/tracer/src/main/java/org/egov/tracer/config/TracerConfiguration.java @@ -1,10 +1,10 @@ package org.egov.tracer.config; -import io.opentracing.noop.NoopTracerFactory; import org.egov.tracer.http.RestTemplateLoggingInterceptor; import org.egov.tracer.http.filters.TracerFilter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.*; import org.springframework.core.env.Environment; @@ -19,7 +19,6 @@ @ComponentScan(basePackages = {"org.egov.tracer"}) @PropertySource("classpath:tracer.properties") @EnableConfigurationProperties({TracerProperties.class}) -//@Import(OpenTracingConfiguration.class) public class TracerConfiguration { @Bean @@ -28,13 +27,15 @@ public ObjectMapperFactory objectMapperFactory(TracerProperties tracerProperties } @Bean(name = "logAwareRestTemplate") - public RestTemplate logAwareRestTemplate(TracerProperties tracerProperties) { - SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); - requestFactory.setOutputStreaming(false); - RestTemplate restTemplate = - new RestTemplate(new BufferingClientHttpRequestFactory(requestFactory)); - restTemplate.setInterceptors(Collections.singletonList(new RestTemplateLoggingInterceptor(tracerProperties))); - return restTemplate; + public RestTemplate logAwareRestTemplate(RestTemplateBuilder builder, TracerProperties tracerProperties) { + return builder + .requestFactory(() -> { + SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); + factory.setOutputStreaming(false); + return new BufferingClientHttpRequestFactory(factory); + }) + .interceptors(new RestTemplateLoggingInterceptor(tracerProperties)) + .build(); } /** @@ -57,20 +58,20 @@ public FilterRegistrationBean tracerFilter(ObjectMapperFactory objectMapperFacto return registration; } - /** - * Disable open tracing by injecting a Noop - * - * @return Noop tracer - */ - @Bean - @ConditionalOnProperty( - name = {"tracer.opentracing.enabled"}, - havingValue = "false", - matchIfMissing = true - ) - public io.opentracing.Tracer tracer() { - return NoopTracerFactory.create(); - } +// /** +// * Disable open tracing by injecting a Noop +// * +// * @return Noop tracer +// */ +// @Bean +// @ConditionalOnProperty( +// name = {"tracer.opentracing.enabled"}, +// havingValue = "false", +// matchIfMissing = true +// ) +// public io.opentracing.Tracer tracer() { +// return NoopTracerFactory.create(); +// } } diff --git a/core-services/libraries/tracer/src/main/java/org/egov/tracer/validators/HTMLValidator.java b/core-services/libraries/tracer/src/main/java/org/egov/tracer/validators/HTMLValidator.java new file mode 100644 index 00000000000..4f8e571a986 --- /dev/null +++ b/core-services/libraries/tracer/src/main/java/org/egov/tracer/validators/HTMLValidator.java @@ -0,0 +1,23 @@ +package org.egov.tracer.validators; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.egov.tracer.annotations.CustomSafeHtml; +import org.jsoup.Jsoup; +import org.jsoup.safety.Safelist; +import org.springframework.stereotype.Component; + +@Component +public class HTMLValidator implements ConstraintValidator +{ + @Override + public void initialize(CustomSafeHtml constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) { + if (s == null) return true; // handle null case based on your requirements + return Jsoup.isValid(s, Safelist.basic()); + } +} \ No newline at end of file From 1ba57b29c628396ec0ec4a12d942fc9b6872f69b Mon Sep 17 00:00:00 2001 From: nikhilmulinti <127198713+nikhilmulinti@users.noreply.github.com> Date: Fri, 23 May 2025 14:31:15 +0530 Subject: [PATCH 30/70] Update Dockerfile --- build/maven-java8/Dockerfile | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/build/maven-java8/Dockerfile b/build/maven-java8/Dockerfile index 2982d0017b1..163db9e9114 100644 --- a/build/maven-java8/Dockerfile +++ b/build/maven-java8/Dockerfile @@ -1,31 +1,27 @@ -FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build -# FROM egovio/amazoncorretto:17-alpine3.19 AS build +# ──────────────── BUILD STAGE ──────────────── +FROM maven:3.9.6-amazoncorretto-8-debian AS build ARG WORK_DIR WORKDIR /app -# Install Maven -RUN apk add --no-cache maven - -# copy the project files -COPY ${WORK_DIR}/pom.xml ./pom.xml +# Copy POM, entrypoint script, and source +COPY ${WORK_DIR}/pom.xml ./pom.xml COPY build/maven-java8/start.sh ./start.sh +COPY ${WORK_DIR}/src ./src -# not useful for stateless builds -# RUN mvn -B dependency:go-offline - -COPY ${WORK_DIR}/src ./src -RUN mvn -B -f /app/pom.xml package - - -# Create runtime image -FROM egovio/8-openjdk-alpine -# FROM egovio/amazoncorretto:17-alpine3.19 +# Build the app (skip tests for speed) +RUN mvn -B -f pom.xml package -DskipTests +# ─────────────── RUNTIME STAGE ─────────────── +FROM openjdk:8-jdk-alpine AS runtime WORKDIR /opt/egov -COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/ +# Pull in the fat JAR and our startup script +COPY --from=build /app/target/*.jar ./application.jar +COPY --from=build /app/start.sh ./start.sh + +RUN chmod +x ./start.sh -RUN chmod +x /opt/egov/start.sh +# Override any Alpine tini entrypoint and launch via shell +ENTRYPOINT ["sh", "./start.sh"] -CMD ["/opt/egov/start.sh"] From aa4125a8c292af859040400585309df7114e6e64 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 12:30:49 +0530 Subject: [PATCH 31/70] updated idgen --- core-services/egov-idgen/CHANGELOG.md | 4 ++++ core-services/egov-idgen/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-idgen/CHANGELOG.md b/core-services/egov-idgen/CHANGELOG.md index 84ecc880d40..ecbafedded1 100644 --- a/core-services/egov-idgen/CHANGELOG.md +++ b/core-services/egov-idgen/CHANGELOG.md @@ -8,6 +8,10 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.2.3 - 2022-01-13 - Updated to log4j2 version 2.17.1 diff --git a/core-services/egov-idgen/pom.xml b/core-services/egov-idgen/pom.xml index 0a874a4555c..2d1a94a9683 100644 --- a/core-services/egov-idgen/pom.xml +++ b/core-services/egov-idgen/pom.xml @@ -10,7 +10,7 @@ org.egov egov-idgen - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-idgen Id generation service From c013936a59b3903069b99fbaf22bcb7d7a478d2e Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 12:50:48 +0530 Subject: [PATCH 32/70] Updated localization --- core-services/egov-localization/CHANGELOG.md | 4 ++++ core-services/egov-localization/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-localization/CHANGELOG.md b/core-services/egov-localization/CHANGELOG.md index d260f722003..c928c1659ff 100644 --- a/core-services/egov-localization/CHANGELOG.md +++ b/core-services/egov-localization/CHANGELOG.md @@ -2,6 +2,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 diff --git a/core-services/egov-localization/pom.xml b/core-services/egov-localization/pom.xml index 33964e80f3c..69d3aad94ae 100644 --- a/core-services/egov-localization/pom.xml +++ b/core-services/egov-localization/pom.xml @@ -9,7 +9,7 @@ org.egov egov-localization - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-localization Localization for messages From 1b63aea56d8305568f14eb1236a04e6a047f0001 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 13:00:29 +0530 Subject: [PATCH 33/70] Updated mdms v2 --- core-services/mdms-v2/CHANGELOG.md | 3 +++ core-services/mdms-v2/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core-services/mdms-v2/CHANGELOG.md b/core-services/mdms-v2/CHANGELOG.md index 91d931292ae..5021b147552 100644 --- a/core-services/mdms-v2/CHANGELOG.md +++ b/core-services/mdms-v2/CHANGELOG.md @@ -10,6 +10,9 @@ All notable changes to this module will be documented in this file. - Added finally blocked wherever missing - Changes to error handling +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry ## 1.3.0 - 2020-05-29 diff --git a/core-services/mdms-v2/pom.xml b/core-services/mdms-v2/pom.xml index 7d9605b0866..538dc771147 100644 --- a/core-services/mdms-v2/pom.xml +++ b/core-services/mdms-v2/pom.xml @@ -11,7 +11,7 @@ org.egov.mdms egov-mdms-service-test - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT egov-infra-mdms-service http://maven.apache.org From 453d808f1c2ba530d876c677a8203c4b9fb90017 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 13:14:41 +0530 Subject: [PATCH 34/70] Updated workflow v2 --- core-services/egov-workflow-v2/CHANGELOG.md | 4 ++++ core-services/egov-workflow-v2/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-workflow-v2/CHANGELOG.md b/core-services/egov-workflow-v2/CHANGELOG.md index 181c4bbac0a..374c09b07ba 100644 --- a/core-services/egov-workflow-v2/CHANGELOG.md +++ b/core-services/egov-workflow-v2/CHANGELOG.md @@ -6,6 +6,10 @@ All notable changes to this module will be documented in this file. ## 2.9.1-HOTFIX - 2024-05-28 - Added missing underscore character in the table name in EscalationQueryBuilder.java & EscalationQueryBuilderTest.java +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.7.5 to 3.2.2 - Upgraded java version from 1.8 to 17 diff --git a/core-services/egov-workflow-v2/pom.xml b/core-services/egov-workflow-v2/pom.xml index c0415b84f2b..f103b6c9967 100644 --- a/core-services/egov-workflow-v2/pom.xml +++ b/core-services/egov-workflow-v2/pom.xml @@ -4,7 +4,7 @@ egov-workflow-v2 jar egov-workflow-v2 - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT 3.1.1 2.17.1 From 8cb0c64cc29b73e10788d4add70deb6ffe1928a1 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 13:17:49 +0530 Subject: [PATCH 35/70] Updated location --- core-services/egov-location/CHANGELOG.md | 4 ++++ core-services/egov-location/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-location/CHANGELOG.md b/core-services/egov-location/CHANGELOG.md index c126e1e3074..f40118f30c7 100644 --- a/core-services/egov-location/CHANGELOG.md +++ b/core-services/egov-location/CHANGELOG.md @@ -10,6 +10,10 @@ All notable changes to this module will be documented in this file. - Upgraded org.flywaydb:flyway-core version from 6.4.4 to 9.22.3 - Upgraded lombok version from 1.18.8 to 1.18.22 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.5 - 2023-03-16 - Fixed bug where search on root level boundary type yields empty search response. diff --git a/core-services/egov-location/pom.xml b/core-services/egov-location/pom.xml index a76bf9e4e33..6a6b97481da 100644 --- a/core-services/egov-location/pom.xml +++ b/core-services/egov-location/pom.xml @@ -9,7 +9,7 @@ org.egov egov-location - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-location boundary service for egov applications From aa486c5457811afc4a557fc9e2d86d4a9287174a Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 13:40:47 +0530 Subject: [PATCH 36/70] Updated audit service --- core-services/audit-service/CHANGELOG.md | 4 ++++ core-services/audit-service/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/audit-service/CHANGELOG.md b/core-services/audit-service/CHANGELOG.md index f10c76e7716..2eb16a25032 100644 --- a/core-services/audit-service/CHANGELOG.md +++ b/core-services/audit-service/CHANGELOG.md @@ -5,3 +5,7 @@ All notable changes to this module will be documented in this file. - Upgraded spring boot version from 2.2.6.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 - Upgraded postgresql version from 42.2.2.jre7 to 42.7.1 + +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry \ No newline at end of file diff --git a/core-services/audit-service/pom.xml b/core-services/audit-service/pom.xml index f3bba2758b3..7e745b18b60 100644 --- a/core-services/audit-service/pom.xml +++ b/core-services/audit-service/pom.xml @@ -9,7 +9,7 @@ org.egov audit-service - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT audit-service Service to handle audit logs From 907e30358b875d651f278f337f052253659de865 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 13:43:56 +0530 Subject: [PATCH 37/70] Updated boundary service --- core-services/boundary-service/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-services/boundary-service/pom.xml b/core-services/boundary-service/pom.xml index dafd3355f13..1827141c9d9 100644 --- a/core-services/boundary-service/pom.xml +++ b/core-services/boundary-service/pom.xml @@ -4,7 +4,7 @@ boundary-service jar boundary-service - 1.0.0 + 1.0.1 17 ${java.version} From 43ccc48f7341cf70b07dd4d2f72cb0e9301edfec Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 13:45:44 +0530 Subject: [PATCH 38/70] Updated access control --- core-services/egov-accesscontrol/CHANGELOG.md | 4 ++++ core-services/egov-accesscontrol/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-accesscontrol/CHANGELOG.md b/core-services/egov-accesscontrol/CHANGELOG.md index 653f2665cd8..649c34836bf 100644 --- a/core-services/egov-accesscontrol/CHANGELOG.md +++ b/core-services/egov-accesscontrol/CHANGELOG.md @@ -8,6 +8,10 @@ All notable changes to this module will be documented in this file. - Upgraded java version from 1.8 to 17 - Upgraded postgresql version from 9.4.1212 to 42.7.1 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.3 - 2022-01-13 - Updated to log4j2 version 2.17.1 diff --git a/core-services/egov-accesscontrol/pom.xml b/core-services/egov-accesscontrol/pom.xml index 2bf02cfb18e..8b030f380fc 100644 --- a/core-services/egov-accesscontrol/pom.xml +++ b/core-services/egov-accesscontrol/pom.xml @@ -5,7 +5,7 @@ org.egov egov-accesscontrol - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT jar egov-accesscontrol From c90dbcfa15fbbd6ae48a61baf8ab72945e2e425c Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 14:18:34 +0530 Subject: [PATCH 39/70] Updated enc service --- core-services/egov-enc-service/CHANGELOG.md | 4 ++++ core-services/egov-enc-service/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-enc-service/CHANGELOG.md b/core-services/egov-enc-service/CHANGELOG.md index a1baf4057a2..f5a8fd71201 100644 --- a/core-services/egov-enc-service/CHANGELOG.md +++ b/core-services/egov-enc-service/CHANGELOG.md @@ -9,6 +9,10 @@ All notable changes to this module will be documented in this file. - Upgraded postgresql version to 42.7.1 - Upgraded lombok version from 1.18.8 to 1.18.22 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.4 - 2023-08-11 - Central Instance Library Integration diff --git a/core-services/egov-enc-service/pom.xml b/core-services/egov-enc-service/pom.xml index a3aa16b9cfc..4f510703b03 100644 --- a/core-services/egov-enc-service/pom.xml +++ b/core-services/egov-enc-service/pom.xml @@ -9,7 +9,7 @@ org.egov egov-enc-service - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-enc-service 2.17.1 From 478af6a65adb62793908b7b81a7c7b750c09a110 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 14:28:53 +0530 Subject: [PATCH 40/70] Updated filestore --- core-services/egov-filestore/CHANGELOG.md | 4 ++++ core-services/egov-filestore/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-filestore/CHANGELOG.md b/core-services/egov-filestore/CHANGELOG.md index 5a8d2d15b1f..f0feabb00f8 100644 --- a/core-services/egov-filestore/CHANGELOG.md +++ b/core-services/egov-filestore/CHANGELOG.md @@ -8,6 +8,10 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded minio library version from 7.0.2 to 7.1.4 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.3.0 - 2023-03-15 - Fixes flow to store and retrieve files from `Azure blob storage`. diff --git a/core-services/egov-filestore/pom.xml b/core-services/egov-filestore/pom.xml index de57e376753..9d30e7ff177 100644 --- a/core-services/egov-filestore/pom.xml +++ b/core-services/egov-filestore/pom.xml @@ -12,7 +12,7 @@ org.egov egov-filestore - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-filestore eGov File store project for eGov services From db1a7d12be46eb8663f6ab8cb99b0cecc8695265 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 14:34:41 +0530 Subject: [PATCH 41/70] updated indexer --- core-services/egov-indexer/CHANGELOG.md | 4 ++++ core-services/egov-indexer/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-indexer/CHANGELOG.md b/core-services/egov-indexer/CHANGELOG.md index eb1b235312a..bcd99343713 100644 --- a/core-services/egov-indexer/CHANGELOG.md +++ b/core-services/egov-indexer/CHANGELOG.md @@ -13,6 +13,10 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.8 - 2023-08-11 - Central Instance Library Integration diff --git a/core-services/egov-indexer/pom.xml b/core-services/egov-indexer/pom.xml index a2e6aa2123c..386727b32d0 100644 --- a/core-services/egov-indexer/pom.xml +++ b/core-services/egov-indexer/pom.xml @@ -10,7 +10,7 @@ org.egov egov-indexer - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-indexer egov indexer framework http://maven.apache.org From c8492cad27977057533c0fefa3572e2a3e1d1eaa Mon Sep 17 00:00:00 2001 From: varunreddy-egov Date: Mon, 26 May 2025 14:41:29 +0530 Subject: [PATCH 42/70] Added logic to replace {schema} placeholder in EscalationRepository class. --- .../java/org/egov/wf/repository/EscalationRepository.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/core-services/egov-workflow-v2/src/main/java/org/egov/wf/repository/EscalationRepository.java b/core-services/egov-workflow-v2/src/main/java/org/egov/wf/repository/EscalationRepository.java index 6dc51081820..67f5b443841 100644 --- a/core-services/egov-workflow-v2/src/main/java/org/egov/wf/repository/EscalationRepository.java +++ b/core-services/egov-workflow-v2/src/main/java/org/egov/wf/repository/EscalationRepository.java @@ -2,6 +2,7 @@ import org.egov.wf.repository.querybuilder.EscalationQueryBuilder; +import org.egov.wf.util.WorkflowUtil; import org.egov.wf.web.models.EscalationSearchCriteria; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -21,10 +22,13 @@ public class EscalationRepository { private EscalationQueryBuilder queryBuilder; + private WorkflowUtil util; + @Autowired - public EscalationRepository(JdbcTemplate jdbcTemplate, EscalationQueryBuilder queryBuilder) { + public EscalationRepository(JdbcTemplate jdbcTemplate, EscalationQueryBuilder queryBuilder, WorkflowUtil util) { this.jdbcTemplate = jdbcTemplate; this.queryBuilder = queryBuilder; + this.util = util; } @@ -37,6 +41,7 @@ public List getBusinessIds(EscalationSearchCriteria criteria){ List preparedStmtList = new ArrayList<>(); String query = queryBuilder.getEscalationQuery(criteria, preparedStmtList); + query = util.replaceSchemaPlaceholder(query, criteria.getTenantId()); List businessIds = jdbcTemplate.query(query, preparedStmtList.toArray(), new SingleColumnRowMapper<>(String.class)); return businessIds; From 5d0445e738761f70f3f03c66ea3a444f9b3f8ee2 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 14:42:25 +0530 Subject: [PATCH 43/70] Updated mdms service --- core-services/egov-mdms-service/CHANGELOG.md | 4 ++++ core-services/egov-mdms-service/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-mdms-service/CHANGELOG.md b/core-services/egov-mdms-service/CHANGELOG.md index 932ae2f650c..887094dd940 100644 --- a/core-services/egov-mdms-service/CHANGELOG.md +++ b/core-services/egov-mdms-service/CHANGELOG.md @@ -10,6 +10,10 @@ All notable changes to this module will be documented in this file. - Upgraded org.egov.services:tracer version from 2.1.0-SNAPSHOT to 2.9.0-SNAPSHOT - Upgraded org.egov:mdms-client version from 0.0.2-SNAPSHOT to 2.9.0-SNAPSHOT +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.3.3 - 2023-08-11 - Central Instance Library Integration diff --git a/core-services/egov-mdms-service/pom.xml b/core-services/egov-mdms-service/pom.xml index a6eb328bd55..a11b9d7238b 100644 --- a/core-services/egov-mdms-service/pom.xml +++ b/core-services/egov-mdms-service/pom.xml @@ -9,7 +9,7 @@ org.egov.mdms egov-mdms-service-test - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-infra-mdms-service http://maven.apache.org From 096bbfcab7e72ddec80945af0e769b779e188985 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 14:50:44 +0530 Subject: [PATCH 44/70] Updated notification mail --- core-services/egov-notification-mail/CHANGELOG.md | 4 ++++ core-services/egov-notification-mail/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-notification-mail/CHANGELOG.md b/core-services/egov-notification-mail/CHANGELOG.md index 582573edac6..4373dc8f03c 100644 --- a/core-services/egov-notification-mail/CHANGELOG.md +++ b/core-services/egov-notification-mail/CHANGELOG.md @@ -6,6 +6,10 @@ All notable changes to this module will be documented in this file. - Upgraded java version from 1.8 to 17 - Upgraded lombok version from 1.18.8 to 1.18.22 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.2.0 - 2023-03-15 - Removed reading from sms topic to send every sms as email. - Added support for attachments in email. diff --git a/core-services/egov-notification-mail/pom.xml b/core-services/egov-notification-mail/pom.xml index 6362a5e00a3..61bada93d1b 100644 --- a/core-services/egov-notification-mail/pom.xml +++ b/core-services/egov-notification-mail/pom.xml @@ -9,7 +9,7 @@ org.egov egov-notification-mail - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-notification-mail egov notification mail project From e94edfa92d77ad2c1713724875dc806cc4ba450a Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:03:06 +0530 Subject: [PATCH 45/70] updated notification sms --- core-services/egov-notification-sms/CHANGELOG.md | 4 ++++ core-services/egov-notification-sms/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-notification-sms/CHANGELOG.md b/core-services/egov-notification-sms/CHANGELOG.md index 128ee5884f7..a0ab7e1963d 100644 --- a/core-services/egov-notification-sms/CHANGELOG.md +++ b/core-services/egov-notification-sms/CHANGELOG.md @@ -7,6 +7,10 @@ All notable changes to this module will be documented in this file. - Upgraded java version from 1.8 to 17 - Upgraded lombok version from 1.18.8 to 1.18.22 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.2.0 - 15-03-2023 - Added new API for sms bounce-back tracking diff --git a/core-services/egov-notification-sms/pom.xml b/core-services/egov-notification-sms/pom.xml index db6c3778f03..b0d613d6f74 100644 --- a/core-services/egov-notification-sms/pom.xml +++ b/core-services/egov-notification-sms/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.egov egov-notification-sms - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT jar egov-notification-sms From c046327e24fe1dd7287fa64f0c1b543c583fe065 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:04:49 +0530 Subject: [PATCH 46/70] Updated egov-otp --- core-services/egov-otp/CHANGELOG.md | 4 ++++ core-services/egov-otp/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-otp/CHANGELOG.md b/core-services/egov-otp/CHANGELOG.md index 004946a1749..b33a42a2427 100644 --- a/core-services/egov-otp/CHANGELOG.md +++ b/core-services/egov-otp/CHANGELOG.md @@ -9,6 +9,10 @@ All notable changes to this module will be documented in this file. - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 - Upgraded org.egov.services:tracer version from 2.0.0-SNAPSHOT to 2.9.0-SNAPSHOT +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.2.3 - 2023-03-15 - Removed Database timezone dependency diff --git a/core-services/egov-otp/pom.xml b/core-services/egov-otp/pom.xml index 3fc99f05220..351d1cc78eb 100644 --- a/core-services/egov-otp/pom.xml +++ b/core-services/egov-otp/pom.xml @@ -10,7 +10,7 @@ org.egov egov-otp - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT otp OTP generator and validation From f5e2d93c87cb7402edd3fc85d92dcd7cef92715a Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:06:03 +0530 Subject: [PATCH 47/70] Updated persister --- core-services/egov-persister/CHANGELOG.md | 4 ++++ core-services/egov-persister/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-persister/CHANGELOG.md b/core-services/egov-persister/CHANGELOG.md index e556ee0546f..c9ee5a9e093 100644 --- a/core-services/egov-persister/CHANGELOG.md +++ b/core-services/egov-persister/CHANGELOG.md @@ -9,6 +9,10 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.6 - 2023-08-11 - Central Instance Library Integration diff --git a/core-services/egov-persister/pom.xml b/core-services/egov-persister/pom.xml index 00eef5bf015..f58dd789074 100644 --- a/core-services/egov-persister/pom.xml +++ b/core-services/egov-persister/pom.xml @@ -9,7 +9,7 @@ org.egov egov-persister - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT egov-persister egov persister framework From 3b3449895986af4761256a912871af411e701c15 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:07:58 +0530 Subject: [PATCH 48/70] Updated pg service --- core-services/egov-pg-service/CHANGELOG.md | 4 ++++ core-services/egov-pg-service/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-pg-service/CHANGELOG.md b/core-services/egov-pg-service/CHANGELOG.md index 1158ee36b3e..ac514ca4928 100644 --- a/core-services/egov-pg-service/CHANGELOG.md +++ b/core-services/egov-pg-service/CHANGELOG.md @@ -15,6 +15,10 @@ All notable changes to this module will be documented in this file. - Upgraded javax.validation:validation-api version to 3.0.2 - Upgraded org.egov.services:tracer version from 2.1.1-SNAPSHOT to 2.9.0-SNAPSHOT +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.2.3 - 2022-01-13 - Updated to log4j2 version 2.17.1 diff --git a/core-services/egov-pg-service/pom.xml b/core-services/egov-pg-service/pom.xml index 1fcbd38c035..b803088d32d 100644 --- a/core-services/egov-pg-service/pom.xml +++ b/core-services/egov-pg-service/pom.xml @@ -9,7 +9,7 @@ org.egov egov-pg-service - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT 2.17.1 17 From f58f57714dd25700531b7db2d067f7828553e72c Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:11:55 +0530 Subject: [PATCH 49/70] Updated url shortening --- core-services/egov-url-shortening/CHANGELOG.md | 4 ++++ core-services/egov-url-shortening/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-url-shortening/CHANGELOG.md b/core-services/egov-url-shortening/CHANGELOG.md index 2482663652b..14b4a8f76ed 100644 --- a/core-services/egov-url-shortening/CHANGELOG.md +++ b/core-services/egov-url-shortening/CHANGELOG.md @@ -11,6 +11,10 @@ All notable changes to this module will be documented in this file. - Upgraded org.egov.services:tracer version from 2.1.2-SNAPSHOT to 2.9.0-SNAPSHOT - Upgraded redis.clients:jedis version to 5.0.0 +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.2 - 2022-03-03 -Added support for randomized short url generation diff --git a/core-services/egov-url-shortening/pom.xml b/core-services/egov-url-shortening/pom.xml index ae7dff55ced..6e3fc28e27b 100644 --- a/core-services/egov-url-shortening/pom.xml +++ b/core-services/egov-url-shortening/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.egov egov-url-shortening - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT org.springframework.boot spring-boot-starter-parent From eb31fc1e355b9b59dff9843880a30393c03e2c16 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:17:56 +0530 Subject: [PATCH 50/70] Updated user event --- core-services/egov-user-event/CHANGELOG.md | 4 ++++ core-services/egov-user-event/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/egov-user-event/CHANGELOG.md b/core-services/egov-user-event/CHANGELOG.md index 3de0592bd6f..bff94a03fc0 100644 --- a/core-services/egov-user-event/CHANGELOG.md +++ b/core-services/egov-user-event/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this module will be documented in this file. - Enhanced the search API to support date filter +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.1.4 - 2022-01-13 - Updated to log4j2 version 2.17.1 diff --git a/core-services/egov-user-event/pom.xml b/core-services/egov-user-event/pom.xml index 7df440990b7..b9804053d43 100644 --- a/core-services/egov-user-event/pom.xml +++ b/core-services/egov-user-event/pom.xml @@ -6,7 +6,7 @@ egov-user-event jar egov-user-event - 1.2.0_beta-SNAPSHOT + 1.2.1_beta-SNAPSHOT Service to send out notifications to user based on the events From a77f84b172d3790cae1b579f9295ec2bce9a1260 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:20:32 +0530 Subject: [PATCH 51/70] Updated gateway --- core-services/gateway/CHANGELOG.MD | 4 ++++ core-services/gateway/pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core-services/gateway/CHANGELOG.MD b/core-services/gateway/CHANGELOG.MD index 515f5780622..2e144c3346f 100644 --- a/core-services/gateway/CHANGELOG.MD +++ b/core-services/gateway/CHANGELOG.MD @@ -3,3 +3,7 @@ All notable changes to this module will be documented in this file. ## 2.9.1-HOTFIX - 2024-05-28 - Fixed support for form data + +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry \ No newline at end of file diff --git a/core-services/gateway/pom.xml b/core-services/gateway/pom.xml index edbbd1575f6..d84358bc6bf 100644 --- a/core-services/gateway/pom.xml +++ b/core-services/gateway/pom.xml @@ -10,7 +10,7 @@ org.egov gateway - 1.0.0-SNAPSHOT + 1.0.1-SNAPSHOT gateway API Gateway for Spring Boot From 9f97816a86b725e100252cfaaff26d5194a8ecac Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 15:31:27 +0530 Subject: [PATCH 52/70] Updated service request --- core-services/service-request/CHANGELOG.md | 6 +++++- core-services/service-request/pom.xml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core-services/service-request/CHANGELOG.md b/core-services/service-request/CHANGELOG.md index 0ce8c31af4d..37e0b1f0ee1 100644 --- a/core-services/service-request/CHANGELOG.md +++ b/core-services/service-request/CHANGELOG.md @@ -7,4 +7,8 @@ All notable changes to this module will be documented in this file. - Upgraded postgresql version from 42.2.2.jre7 to 42.7.1 - Upgraded org.flywaydb:flyway-core version to 9.22.3 - Upgraded org.egov.services:tracer version from 2.1.2-SNAPSHOT to 2.9.0-SNAPSHOT -- Upgraded org.egov:mdms-client from 0.0.2-SNAPSHOT to 2.9.0-SNAPSHOT \ No newline at end of file +- Upgraded org.egov:mdms-client from 0.0.2-SNAPSHOT to 2.9.0-SNAPSHOT + +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry diff --git a/core-services/service-request/pom.xml b/core-services/service-request/pom.xml index 55abb916069..690dae15784 100644 --- a/core-services/service-request/pom.xml +++ b/core-services/service-request/pom.xml @@ -4,7 +4,7 @@ service-request jar service-request - 2.9.0-SNAPSHOT + 2.9.1-SNAPSHOT 17 ${java.version} From afc64f1353f94bc6361c9f06fe513d47b097ebb2 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 16:11:57 +0530 Subject: [PATCH 53/70] updated idgen --- core-services/egov-idgen/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-idgen/CHANGELOG.md b/core-services/egov-idgen/CHANGELOG.md index ecbafedded1..78777f4b886 100644 --- a/core-services/egov-idgen/CHANGELOG.md +++ b/core-services/egov-idgen/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -8,10 +12,6 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.2.3 - 2022-01-13 - Updated to log4j2 version 2.17.1 From 7ab3dcae4d7a8a146709206b13cb646512791665 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 16:31:14 +0530 Subject: [PATCH 54/70] Updated mdms v2 --- core-services/mdms-v2/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/mdms-v2/CHANGELOG.md b/core-services/mdms-v2/CHANGELOG.md index 5021b147552..c1942fef5c2 100644 --- a/core-services/mdms-v2/CHANGELOG.md +++ b/core-services/mdms-v2/CHANGELOG.md @@ -3,6 +3,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 1.3.2 - 2022-01-13 - Updated to log4j2 version 2.17.1 @@ -10,10 +14,6 @@ All notable changes to this module will be documented in this file. - Added finally blocked wherever missing - Changes to error handling -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.3.0 - 2020-05-29 - Added typescript definition generation plugin From b440e90f11da59de7b6f881e04d32ccbfc41be5e Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 17:14:33 +0530 Subject: [PATCH 55/70] updated location --- core-services/egov-location/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-location/CHANGELOG.md b/core-services/egov-location/CHANGELOG.md index f40118f30c7..1ef69e2215b 100644 --- a/core-services/egov-location/CHANGELOG.md +++ b/core-services/egov-location/CHANGELOG.md @@ -3,6 +3,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -10,10 +14,6 @@ All notable changes to this module will be documented in this file. - Upgraded org.flywaydb:flyway-core version from 6.4.4 to 9.22.3 - Upgraded lombok version from 1.18.8 to 1.18.22 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.1.5 - 2023-03-16 - Fixed bug where search on root level boundary type yields empty search response. From d1a0f9a7c3f1f5645f2fd675076c69f4fe6144da Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 17:35:45 +0530 Subject: [PATCH 56/70] Updated audit service --- core-services/audit-service/CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core-services/audit-service/CHANGELOG.md b/core-services/audit-service/CHANGELOG.md index 2eb16a25032..5d8d0466c0e 100644 --- a/core-services/audit-service/CHANGELOG.md +++ b/core-services/audit-service/CHANGELOG.md @@ -1,11 +1,12 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.6.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 - Upgraded postgresql version from 42.2.2.jre7 to 42.7.1 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry \ No newline at end of file From 17bd35048fd27ef9f64b70b9fa791c9ee56cdff1 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 17:44:28 +0530 Subject: [PATCH 57/70] Updated access control --- core-services/egov-accesscontrol/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-accesscontrol/CHANGELOG.md b/core-services/egov-accesscontrol/CHANGELOG.md index 649c34836bf..f0659abc795 100644 --- a/core-services/egov-accesscontrol/CHANGELOG.md +++ b/core-services/egov-accesscontrol/CHANGELOG.md @@ -3,15 +3,15 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 - Upgraded postgresql version from 9.4.1212 to 42.7.1 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.1.3 - 2022-01-13 - Updated to log4j2 version 2.17.1 From 0730661fe0085530c5df241836e3cc80cda40210 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:28:09 +0530 Subject: [PATCH 58/70] Updated enc service --- core-services/egov-enc-service/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-enc-service/CHANGELOG.md b/core-services/egov-enc-service/CHANGELOG.md index f5a8fd71201..3fc3ab7a543 100644 --- a/core-services/egov-enc-service/CHANGELOG.md +++ b/core-services/egov-enc-service/CHANGELOG.md @@ -3,16 +3,16 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 - Upgraded postgresql version to 42.7.1 - Upgraded lombok version from 1.18.8 to 1.18.22 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.1.4 - 2023-08-11 - Central Instance Library Integration From a73607417ffcddb113726527d728f9594eeab037 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:33:02 +0530 Subject: [PATCH 59/70] updated filestore --- core-services/egov-filestore/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-filestore/CHANGELOG.md b/core-services/egov-filestore/CHANGELOG.md index f0feabb00f8..505589eac0c 100644 --- a/core-services/egov-filestore/CHANGELOG.md +++ b/core-services/egov-filestore/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -8,10 +12,6 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded minio library version from 7.0.2 to 7.1.4 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.3.0 - 2023-03-15 - Fixes flow to store and retrieve files from `Azure blob storage`. From 8fe7b1efbcbcd54994a721c97be07f54858a9774 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:36:35 +0530 Subject: [PATCH 60/70] Updated indexer --- core-services/egov-indexer/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-indexer/CHANGELOG.md b/core-services/egov-indexer/CHANGELOG.md index bcd99343713..6901697780b 100644 --- a/core-services/egov-indexer/CHANGELOG.md +++ b/core-services/egov-indexer/CHANGELOG.md @@ -3,6 +3,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -13,10 +17,6 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.1.8 - 2023-08-11 - Central Instance Library Integration From c0dd69236bc687dbf469fc2dbe02ed433dd0b3d9 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:38:19 +0530 Subject: [PATCH 61/70] Updated mdms service --- core-services/egov-mdms-service/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-mdms-service/CHANGELOG.md b/core-services/egov-mdms-service/CHANGELOG.md index 887094dd940..3d6e96fec74 100644 --- a/core-services/egov-mdms-service/CHANGELOG.md +++ b/core-services/egov-mdms-service/CHANGELOG.md @@ -3,6 +3,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -10,10 +14,6 @@ All notable changes to this module will be documented in this file. - Upgraded org.egov.services:tracer version from 2.1.0-SNAPSHOT to 2.9.0-SNAPSHOT - Upgraded org.egov:mdms-client version from 0.0.2-SNAPSHOT to 2.9.0-SNAPSHOT -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.3.3 - 2023-08-11 - Central Instance Library Integration From 78ac7b4cb41c927510382d1bb5ef3f8b5c79a1d2 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:40:05 +0530 Subject: [PATCH 62/70] Updated notification mail --- core-services/egov-notification-mail/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-notification-mail/CHANGELOG.md b/core-services/egov-notification-mail/CHANGELOG.md index 4373dc8f03c..589b12ee092 100644 --- a/core-services/egov-notification-mail/CHANGELOG.md +++ b/core-services/egov-notification-mail/CHANGELOG.md @@ -1,15 +1,15 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 - Upgraded lombok version from 1.18.8 to 1.18.22 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.2.0 - 2023-03-15 - Removed reading from sms topic to send every sms as email. - Added support for attachments in email. From ca3efb583c2962725ebce1efe43c88ced588092e Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:41:38 +0530 Subject: [PATCH 63/70] Updated notification sms --- core-services/egov-notification-sms/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-notification-sms/CHANGELOG.md b/core-services/egov-notification-sms/CHANGELOG.md index a0ab7e1963d..e7f7bfd82c6 100644 --- a/core-services/egov-notification-sms/CHANGELOG.md +++ b/core-services/egov-notification-sms/CHANGELOG.md @@ -2,15 +2,15 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 - Upgraded lombok version from 1.18.8 to 1.18.22 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.2.0 - 15-03-2023 - Added new API for sms bounce-back tracking From 3afcc1733fdc79fac1a63159dfce9d29a0434174 Mon Sep 17 00:00:00 2001 From: shilpa Date: Mon, 26 May 2025 19:43:28 +0530 Subject: [PATCH 64/70] updated egov otp --- core-services/egov-otp/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-otp/CHANGELOG.md b/core-services/egov-otp/CHANGELOG.md index b33a42a2427..c42832a068e 100644 --- a/core-services/egov-otp/CHANGELOG.md +++ b/core-services/egov-otp/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -9,10 +13,6 @@ All notable changes to this module will be documented in this file. - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 - Upgraded org.egov.services:tracer version from 2.0.0-SNAPSHOT to 2.9.0-SNAPSHOT -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.2.3 - 2023-03-15 - Removed Database timezone dependency From 5ab3880438319b38df44acaff0436d5394e4cd49 Mon Sep 17 00:00:00 2001 From: shilpa Date: Tue, 27 May 2025 11:06:52 +0530 Subject: [PATCH 65/70] Updated persister --- core-services/egov-persister/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-persister/CHANGELOG.md b/core-services/egov-persister/CHANGELOG.md index c9ee5a9e093..e8652aebe92 100644 --- a/core-services/egov-persister/CHANGELOG.md +++ b/core-services/egov-persister/CHANGELOG.md @@ -2,6 +2,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -9,10 +13,6 @@ All notable changes to this module will be documented in this file. - Upgraded lombok version from 1.18.8 to 1.18.22 - Upgraded org.flywaydb:flyway-core version from 6.4.3 to 9.22.3 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.1.6 - 2023-08-11 - Central Instance Library Integration From 16fc264eba35075ee4eff443cca9d17e949ae87b Mon Sep 17 00:00:00 2001 From: shilpa Date: Tue, 27 May 2025 11:08:17 +0530 Subject: [PATCH 66/70] Updated pg service --- core-services/egov-pg-service/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-pg-service/CHANGELOG.md b/core-services/egov-pg-service/CHANGELOG.md index ac514ca4928..25ef8c80c05 100644 --- a/core-services/egov-pg-service/CHANGELOG.md +++ b/core-services/egov-pg-service/CHANGELOG.md @@ -3,6 +3,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -15,10 +19,6 @@ All notable changes to this module will be documented in this file. - Upgraded javax.validation:validation-api version to 3.0.2 - Upgraded org.egov.services:tracer version from 2.1.1-SNAPSHOT to 2.9.0-SNAPSHOT -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.2.3 - 2022-01-13 - Updated to log4j2 version 2.17.1 From b8229f8f3897026e7663acfd952004459eecd345 Mon Sep 17 00:00:00 2001 From: shilpa Date: Tue, 27 May 2025 11:09:56 +0530 Subject: [PATCH 67/70] Updated url shortening --- core-services/egov-url-shortening/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-url-shortening/CHANGELOG.md b/core-services/egov-url-shortening/CHANGELOG.md index 14b4a8f76ed..610d1afcb29 100644 --- a/core-services/egov-url-shortening/CHANGELOG.md +++ b/core-services/egov-url-shortening/CHANGELOG.md @@ -3,6 +3,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.13.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -11,10 +15,6 @@ All notable changes to this module will be documented in this file. - Upgraded org.egov.services:tracer version from 2.1.2-SNAPSHOT to 2.9.0-SNAPSHOT - Upgraded redis.clients:jedis version to 5.0.0 -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry - ## 1.1.2 - 2022-03-03 -Added support for randomized short url generation From 50ff49a37e162bcb5a4b9f857ac72e1be5999265 Mon Sep 17 00:00:00 2001 From: shilpa Date: Tue, 27 May 2025 11:11:22 +0530 Subject: [PATCH 68/70] updated user event --- core-services/egov-user-event/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-services/egov-user-event/CHANGELOG.md b/core-services/egov-user-event/CHANGELOG.md index bff94a03fc0..e0a6ffafb5f 100644 --- a/core-services/egov-user-event/CHANGELOG.md +++ b/core-services/egov-user-event/CHANGELOG.md @@ -1,14 +1,14 @@ # Changelog All notable changes to this module will be documented in this file. -## 1.2.0-beta - 2022-05-12 - -- Enhanced the search API to support date filter - ## 2.9.1 - 2025-05-21 - Upgraded tracer version from 2.9.0 to 2.9.1 - added variables in application.properties required for opentelemetry +## 1.2.0-beta - 2022-05-12 + +- Enhanced the search API to support date filter + ## 1.1.4 - 2022-01-13 - Updated to log4j2 version 2.17.1 From 7ebda8f9977acb15143b5cb15b993763c2166133 Mon Sep 17 00:00:00 2001 From: shilpa Date: Tue, 27 May 2025 11:12:58 +0530 Subject: [PATCH 69/70] Updated gateway --- core-services/gateway/CHANGELOG.MD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core-services/gateway/CHANGELOG.MD b/core-services/gateway/CHANGELOG.MD index 2e144c3346f..b27e47edb95 100644 --- a/core-services/gateway/CHANGELOG.MD +++ b/core-services/gateway/CHANGELOG.MD @@ -1,9 +1,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.1-HOTFIX - 2024-05-28 - Fixed support for form data -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry \ No newline at end of file From 53d2c4ed95fa2486478b3053fe4bf0e9e12530b3 Mon Sep 17 00:00:00 2001 From: shilpa Date: Tue, 27 May 2025 11:14:18 +0530 Subject: [PATCH 70/70] Update service request --- core-services/service-request/CHANGELOG.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core-services/service-request/CHANGELOG.md b/core-services/service-request/CHANGELOG.md index 37e0b1f0ee1..a3dbbb57e0a 100644 --- a/core-services/service-request/CHANGELOG.md +++ b/core-services/service-request/CHANGELOG.md @@ -1,6 +1,10 @@ # Changelog All notable changes to this module will be documented in this file. +## 2.9.1 - 2025-05-21 +- Upgraded tracer version from 2.9.0 to 2.9.1 +- added variables in application.properties required for opentelemetry + ## 2.9.0 - 2024-02-29 - Upgraded spring boot version from 2.2.6.RELEASE to 3.2.2 - Upgraded java version from 1.8 to 17 @@ -9,6 +13,4 @@ All notable changes to this module will be documented in this file. - Upgraded org.egov.services:tracer version from 2.1.2-SNAPSHOT to 2.9.0-SNAPSHOT - Upgraded org.egov:mdms-client from 0.0.2-SNAPSHOT to 2.9.0-SNAPSHOT -## 2.9.1 - 2025-05-21 -- Upgraded tracer version from 2.9.0 to 2.9.1 -- added variables in application.properties required for opentelemetry +