diff --git a/README.md b/README.md index 813f4f3..ef66d5e 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 dev.vality @@ -16,6 +22,9 @@ logback: ${shared.resources.version} ``` + +Resources: + ```xml @@ -31,6 +40,7 @@ logback: true Dockerfile + opentelemetry-javaagent.jar @@ -39,6 +49,9 @@ logback: ``` + +Plugin: + ```xml org.apache.maven.plugins @@ -67,3 +80,13 @@ logback: ``` + +## Отключение 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 97e72ef..cf2f690 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ shared-resources - 4.0.0 + 5.0.0 jar Java shared resources @@ -38,6 +38,10 @@ https://github.com/valitydev/java-shared-resources/tree/master + + 2.26.1 + + org.springframework.boot @@ -55,10 +59,48 @@ janino 3.1.9 + + io.opentelemetry.javaagent + opentelemetry-javaagent + ${opentelemetry.javaagent.version} + + + io.opentelemetry.instrumentation + opentelemetry-logback-mdc-1.0 + ${opentelemetry.javaagent.version}-alpha + runtime + + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.1 + + + copy-opentelemetry-javaagent-to-resources + generate-resources + + copy + + + + + io.opentelemetry.javaagent + opentelemetry-javaagent + ${opentelemetry.javaagent.version} + jar + true + ${project.basedir}/src/main/resources + opentelemetry-javaagent.jar + + + + + + maven-remote-resources-plugin 3.3.0 diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index d2cc274..5e1af17 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -2,11 +2,12 @@ FROM ghcr.io/valitydev/temurin-jemalloc:sha-402a042 RUN useradd -s /bin/false -U -u 20000 vality +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 -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 8c4aa71..c3da2dc 100755 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -66,8 +66,17 @@ - + + true + otel_trace_id + otel_span_id + otel_trace_flags + + + +