From fd9951c59634abd40044afcd425230729e5044e2 Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Wed, 10 Dec 2025 03:26:24 +0300
Subject: [PATCH 01/11] Integrate OpenTelemetry java agent

---
 .github/workflows/deploy.yml          |  1 +
 pom.xml                               | 44 ++++++++++++++++++++++++++-
 src/main/resources/Dockerfile         |  3 +-
 src/main/resources/logback-spring.xml | 11 ++++++-
 4 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3ccda4ee..ae4af791 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - 'master'
       - 'main'
+      - 'epic/**'
 
 jobs:
   deploy:
diff --git a/pom.xml b/pom.xml
index 5cc41899..398be7e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>3.0.1</version>
+    <version>4.0.0-test-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>
@@ -38,6 +38,10 @@
         <url>https://github.com/valitydev/java-shared-resources/tree/master</url>
     </scm>
 
+    <properties>
+        <opentelemetry.javaagent.version>2.22.0</opentelemetry.javaagent.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -55,10 +59,48 @@
             <artifactId>janino</artifactId>
             <version>3.1.9</version>
         </dependency>
+        <dependency>
+            <groupId>io.opentelemetry.javaagent</groupId>
+            <artifactId>opentelemetry-javaagent</artifactId>
+            <version>${opentelemetry.javaagent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentelemetry.instrumentation</groupId>
+            <artifactId>opentelemetry-logback-mdc-1.0</artifactId>
+            <version>2.22.0-alpha</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.6.1</version>
+                <executions>
+                    <execution>
+                        <id>copy-opentelemetry-javaagent</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>io.opentelemetry.javaagent</groupId>
+                                    <artifactId>opentelemetry-javaagent</artifactId>
+                                    <version>${opentelemetry.javaagent.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                    <destFileName>opentelemetry-javaagent.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
                 <version>3.0.0</version>
diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile
index ef7e40dd..43981c2e 100644
--- a/src/main/resources/Dockerfile
+++ b/src/main/resources/Dockerfile
@@ -2,11 +2,12 @@ FROM ghcr.io/valitydev/temurin-jemalloc:sha-14c0b34
 
 RUN useradd -s /bin/false -U -u 20000 vality
 
+COPY --chown=vality:vality opentelemetry-javaagent.jar /opt/${artifactId}/opentelemetry-javaagent.jar
 COPY --chown=vality:vality ${artifactId}-${version}.jar /opt/${artifactId}/${artifactId}.jar
 
 USER vality:vality
 
-CMD ["java", "-jar","/opt/${artifactId}/${artifactId}.jar"]
+CMD ["java", "-javaagent:/opt/${artifactId}/opentelemetry-javaagent.jar", "-jar","/opt/${artifactId}/${artifactId}.jar"]
 
 EXPOSE ${exposed.ports}
 
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 8c4aa714..c3da2dc4 100755
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -66,8 +66,17 @@
                 </encoder>
             </appender>
 
-            <root level="${loggingLevelRoot}">
+            <appender name="JSON_K8S_CONSOLE_OTEL"
+                      class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
+                <addBaggage>true</addBaggage>
+                <traceIdKey>otel_trace_id</traceIdKey>
+                <spanIdKey>otel_span_id</spanIdKey>
+                <traceFlagsKey>otel_trace_flags</traceFlagsKey>
                 <appender-ref ref="JSON_K8S_CONSOLE"/>
+            </appender>
+
+            <root level="${loggingLevelRoot}">
+                <appender-ref ref="JSON_K8S_CONSOLE_OTEL"/>
             </root>
         </then>
     </if>

From afde586b6b4ded09de01976322a3d3414926ea0b Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Wed, 10 Dec 2025 03:31:40 +0300
Subject: [PATCH 02/11] fix deploy

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 398be7e3..87fc3e96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.0.0-test-SNAPSHOT</version>
+    <version>4.0.0-alpha1</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>

From 5d70829b872671652bf0a4fb43d25db2290b1483 Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Wed, 10 Dec 2025 11:46:11 +0300
Subject: [PATCH 03/11] Update parent POM version to 3.1.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 87fc3e96..ae7207a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>dev.vality</groupId>
         <artifactId>library-parent-pom</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
     </parent>
 
     <artifactId>shared-resources</artifactId>

From 82be6247aa44e312733f1baa3c987472f8a4c8ff Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Wed, 10 Dec 2025 14:18:43 +0300
Subject: [PATCH 04/11] fix output directory

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae7207a4..ee565b5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.0.0-alpha1</version>
+    <version>4.0.0-alpha2</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>
@@ -81,7 +81,7 @@
                 <executions>
                     <execution>
                         <id>copy-opentelemetry-javaagent</id>
-                        <phase>process-resources</phase>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -93,7 +93,7 @@
                                     <version>${opentelemetry.javaagent.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                    <outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
                                     <destFileName>opentelemetry-javaagent.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>

From 8321034cdc2c1026313b2bd0c4aaada3016487ee Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Thu, 11 Dec 2025 14:21:15 +0300
Subject: [PATCH 05/11] Revert "fix output directory"

This reverts commit 82be6247aa44e312733f1baa3c987472f8a4c8ff.
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ee565b5a..ae7207a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.0.0-alpha2</version>
+    <version>4.0.0-alpha1</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>
@@ -81,7 +81,7 @@
                 <executions>
                     <execution>
                         <id>copy-opentelemetry-javaagent</id>
-                        <phase>generate-resources</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -93,7 +93,7 @@
                                     <version>${opentelemetry.javaagent.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
                                     <destFileName>opentelemetry-javaagent.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>

From 26ac57604143b9fab07efbe15739bdf5ffe7ad8d Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Thu, 11 Dec 2025 14:23:11 +0300
Subject: [PATCH 06/11] Fix OpenTelemetry agent path in Dockerfile

---
 pom.xml                       | 2 +-
 src/main/resources/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae7207a4..401edd71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.0.0-alpha1</version>
+    <version>4.0.0-alpha3</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>
diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile
index 43981c2e..6ba4ec73 100644
--- a/src/main/resources/Dockerfile
+++ b/src/main/resources/Dockerfile
@@ -2,7 +2,7 @@ FROM ghcr.io/valitydev/temurin-jemalloc:sha-14c0b34
 
 RUN useradd -s /bin/false -U -u 20000 vality
 
-COPY --chown=vality:vality opentelemetry-javaagent.jar /opt/${artifactId}/opentelemetry-javaagent.jar
+COPY --chown=vality:vality maven-shared-archive-resources/opentelemetry-javaagent.jar /opt/${artifactId}/opentelemetry-javaagent.jar
 COPY --chown=vality:vality ${artifactId}-${version}.jar /opt/${artifactId}/${artifactId}.jar
 
 USER vality:vality

From 0004a218a729fbac289608707b608c4f34f58be0 Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Thu, 11 Dec 2025 15:00:53 +0300
Subject: [PATCH 07/11] Fix OpenTelemetry agent configuration

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 401edd71..4b12cbdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.0.0-alpha3</version>
+    <version>4.0.0-alpha4</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>
@@ -80,8 +80,8 @@
                 <version>3.6.1</version>
                 <executions>
                     <execution>
-                        <id>copy-opentelemetry-javaagent</id>
-                        <phase>process-resources</phase>
+                        <id>copy-opentelemetry-javaagent-to-resources</id>
+                        <phase>generate-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -93,7 +93,7 @@
                                     <version>${opentelemetry.javaagent.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                                    <outputDirectory>${project.basedir}/src/main/resources</outputDirectory>
                                     <destFileName>opentelemetry-javaagent.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>

From 65137ff41b6ab7f40affd9ea0501458013baae13 Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Fri, 27 Mar 2026 13:43:14 +0700
Subject: [PATCH 08/11] Update

---
 README.md | 31 +++++++++++++++++++++++++++----
 pom.xml   |  4 ++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 813f4f3e..ef66d5e4 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,20 @@
-Данный репозиторий содержит шаблоны (используемых в сервисах домена) ресурсов
+# shared-resources
 
-#Переопределяемые настройки `logback`
+Данный репозиторий содержит шаблоны ресурсов, используемых в сервисах домена.
+
+## Переопределяемые настройки `logback`
+
+`application.yml`:
 
-`application.yml`
 ```yaml
 logback:
   appender: JSON_K8S_CONSOLE # возможные значения: DEFAULT_CONSOLE || COLOR_CONSOLE || JSON_K8S_CONSOLE
 ```
 
-#`pom.xml`
+## Настройка `pom.xml`
+
+Dependency:
+
 ```xml
 <dependency>
     <groupId>dev.vality</groupId>
@@ -16,6 +22,9 @@ logback:
     <version>${shared.resources.version}</version>
 </dependency>
 ```
+
+Resources:
+
 ```xml
 <resources>
     <resource>
@@ -31,6 +40,7 @@ logback:
         <filtering>true</filtering>
         <excludes>
             <exclude>Dockerfile</exclude>
+            <exclude>opentelemetry-javaagent.jar</exclude>
         </excludes>
     </resource>
     <resource>
@@ -39,6 +49,9 @@ logback:
     </resource>
 </resources>
 ```
+
+Plugin:
+
 ```xml
 <plugin>
     <groupId>org.apache.maven.plugins</groupId>
@@ -67,3 +80,13 @@ logback:
     </executions>
 </plugin>
 ```
+
+## Отключение OpenTelemetry Java Agent
+
+Для отключения Java agent используйте один из вариантов:
+
+- Переменная окружения: `OTEL_JAVAAGENT_ENABLED=false`
+- JVM-параметр: `-Dotel.javaagent.enabled=false`
+
+Документация:
+[Disabling the agent entirely](https://opentelemetry.io/docs/zero-code/java/agent/disable/#disabling-the-agent-entirely)
diff --git a/pom.xml b/pom.xml
index 2c798190..34abcc38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
     </scm>
 
     <properties>
-        <opentelemetry.javaagent.version>2.22.0</opentelemetry.javaagent.version>
+        <opentelemetry.javaagent.version>2.26.1</opentelemetry.javaagent.version>
     </properties>
 
     <dependencies>
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-logback-mdc-1.0</artifactId>
-            <version>2.22.0-alpha</version>
+            <version>2.26.1-alpha</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

From 80b67f8c13b5fef6efa1fbd949bd4bffe842dea4 Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Fri, 27 Mar 2026 13:44:25 +0700
Subject: [PATCH 09/11] update

---
 .github/workflows/deploy.yml | 1 -
 pom.xml                      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 9baaeaca..d155578a 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,7 +5,6 @@ on:
     branches:
       - 'master'
       - 'main'
-      - 'epic/**'
 
 jobs:
   deploy:
diff --git a/pom.xml b/pom.xml
index 34abcc38..aa13d49e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.1.0-alpha1</version>
+    <version>4.1.0</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>

From f01d8997d2e17cd0e44e4d1f961d847c7d6c994f Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Fri, 27 Mar 2026 15:02:10 +0700
Subject: [PATCH 10/11] bump

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa13d49e..42db07c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <artifactId>shared-resources</artifactId>
-    <version>4.1.0</version>
+    <version>5.0.0</version>
     <packaging>jar</packaging>
 
     <name>Java shared resources</name>

From 77f9183674b9d2ac4886dd84ee62d03ae5f4c6a4 Mon Sep 17 00:00:00 2001
From: "f.shim" <fshim.dev@gmail.com>
Date: Fri, 27 Mar 2026 17:05:54 +0700
Subject: [PATCH 11/11] ${opentelemetry.javaagent.version}-alpha

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 42db07c7..cf2f6907 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>io.opentelemetry.instrumentation</groupId>
             <artifactId>opentelemetry-logback-mdc-1.0</artifactId>
-            <version>2.26.1-alpha</version>
+            <version>${opentelemetry.javaagent.version}-alpha</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>