From 8a9ed7ed2891924cbdb31007337dd8bcc96ba453 Mon Sep 17 00:00:00 2001
From: Jan Dusil <jan.dusil@wultra.com>
Date: Tue, 6 Feb 2024 03:43:47 +0100
Subject: [PATCH] Fix #1564: Add TraceID/SpanID to Monitoring for Enhanced
 Observability

---
 powerauth-nextstep/pom.xml                    | 19 +++++++++++++++++++
 .../src/main/resources/application.properties |  3 +++
 powerauth-tpp-engine/pom.xml                  | 19 +++++++++++++++++++
 .../src/main/resources/application.properties |  3 +++
 powerauth-webflow-client/pom.xml              | 19 +++++++++++++++++++
 .../src/main/resources/application.properties |  3 +++
 powerauth-webflow/pom.xml                     | 19 +++++++++++++++++++
 .../src/main/resources/application.properties |  3 +++
 8 files changed, 88 insertions(+)

diff --git a/powerauth-nextstep/pom.xml b/powerauth-nextstep/pom.xml
index 8de118210..f55972edf 100644
--- a/powerauth-nextstep/pom.xml
+++ b/powerauth-nextstep/pom.xml
@@ -135,6 +135,25 @@
             <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
         </dependency>
 
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+
+        <!-- For run at Apple M1 architecture -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <scope>runtime</scope>
+            <classifier>osx-aarch_64</classifier>
+        </dependency>
+
         <!-- Upgrade Swagger Guava dependency due to CVE-2018-10237 -->
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/powerauth-nextstep/src/main/resources/application.properties b/powerauth-nextstep/src/main/resources/application.properties
index 3457a9cc1..d796f3178 100644
--- a/powerauth-nextstep/src/main/resources/application.properties
+++ b/powerauth-nextstep/src/main/resources/application.properties
@@ -69,3 +69,6 @@ springdoc.default-produces-media-type=application/json
 spring.application.name=powerauth-nextstep
 
 logging.config=${POWERAUTH_NEXTSTEP_LOGGING:}
+
+# Monitoring
+management.tracing.sampling.probability=1.0
diff --git a/powerauth-tpp-engine/pom.xml b/powerauth-tpp-engine/pom.xml
index a5823f3ae..17c43706d 100644
--- a/powerauth-tpp-engine/pom.xml
+++ b/powerauth-tpp-engine/pom.xml
@@ -112,6 +112,25 @@
             <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
         </dependency>
 
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+
+        <!-- For run at Apple M1 architecture -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <scope>runtime</scope>
+            <classifier>osx-aarch_64</classifier>
+        </dependency>
+
         <!-- Upgrade Swagger Guava dependency due to CVE-2018-10237 -->
         <dependency>
             <groupId>com.google.guava</groupId>
diff --git a/powerauth-tpp-engine/src/main/resources/application.properties b/powerauth-tpp-engine/src/main/resources/application.properties
index f77fa7492..9cfaff2f7 100644
--- a/powerauth-tpp-engine/src/main/resources/application.properties
+++ b/powerauth-tpp-engine/src/main/resources/application.properties
@@ -42,3 +42,6 @@ springdoc.swagger-ui.disable-swagger-default-url=true
 spring.application.name=powerauth-tpp-engine
 
 logging.config=${POWERAUTH_TPP_ENGINE_LOGGING:}
+
+# Monitoring
+management.tracing.sampling.probability=1.0
diff --git a/powerauth-webflow-client/pom.xml b/powerauth-webflow-client/pom.xml
index d3bb00440..492c7aefc 100644
--- a/powerauth-webflow-client/pom.xml
+++ b/powerauth-webflow-client/pom.xml
@@ -72,6 +72,25 @@
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
 
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+
+        <!-- For run at Apple M1 architecture -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <scope>runtime</scope>
+            <classifier>osx-aarch_64</classifier>
+        </dependency>
+
         <!-- Other Dependencies -->
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
diff --git a/powerauth-webflow-client/src/main/resources/application.properties b/powerauth-webflow-client/src/main/resources/application.properties
index 595200973..263c27280 100644
--- a/powerauth-webflow-client/src/main/resources/application.properties
+++ b/powerauth-webflow-client/src/main/resources/application.properties
@@ -33,3 +33,6 @@ spring.jpa.open-in-view=false
 spring.web.resources.cache.cachecontrol.max-age=86400
 
 logging.config=${POWERAUTH_WEBFLOW_CLIENT_LOGGING:}
+
+# Monitoring
+management.tracing.sampling.probability=1.0
diff --git a/powerauth-webflow/pom.xml b/powerauth-webflow/pom.xml
index fe3dc2b2f..13389b2b8 100644
--- a/powerauth-webflow/pom.xml
+++ b/powerauth-webflow/pom.xml
@@ -164,6 +164,25 @@
             <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
         </dependency>
 
+        <!-- Monitoring -->
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core-micrometer</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-otel</artifactId>
+        </dependency>
+
+        <!-- For run at Apple M1 architecture -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <scope>runtime</scope>
+            <classifier>osx-aarch_64</classifier>
+        </dependency>
+
         <!-- TEST -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/powerauth-webflow/src/main/resources/application.properties b/powerauth-webflow/src/main/resources/application.properties
index 9977ac0cd..5e1cbcaaa 100644
--- a/powerauth-webflow/src/main/resources/application.properties
+++ b/powerauth-webflow/src/main/resources/application.properties
@@ -124,3 +124,6 @@ springdoc.swagger-ui.disable-swagger-default-url=true
 spring.application.name=powerauth-webflow
 
 logging.config=${POWERAUTH_WEBFLOW_LOGGING:}
+
+# Monitoring
+management.tracing.sampling.probability=1.0