ver 0.17

mnadeem · Feb 27, 2021 · ce2c5f8 · ce2c5f8
1 parent afffb89
commit ce2c5f8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/boot-otel-tempo-api/Dockerfile b/boot-otel-tempo-api/Dockerfile
@@ -16,7 +16,7 @@ EXPOSE 8080
 # https:/open-telemetry/opentelemetry-java-instrumentation
 ENV JAVA_OPTS "${JAVA_OPTS} \
  -Dotel.traces.exporter=jaeger \
- -Dotel.exporter.jaeger.endpoint=tempo:14250 \
+ -Dotel.exporter.jaeger.endpoint=http://tempo:14250 \
  -Dotel.metrics.exporter=none \
  -Dotel.resource.attributes="service.name=${APP_NAME}" \
  -Dotel.javaagent.debug=false \

diff --git a/boot-otel-tempo-api/src/main/resources/application.properties b/boot-otel-tempo-api/src/main/resources/application.properties
@@ -20,8 +20,8 @@ logging.level.web=INFO
 logging.level.io.opentelemetry=DEBUG
 logging.level.root=INFO
 
-logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{traceId},%X{spanId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
-logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{traceId},%X{spanId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
+logging.pattern.console=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{trace_id},%X{span_id}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
+logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{trace_id},%X{span_id}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
 logging.file.name=/app/logs/${spring.application.name}.log
 logging.file.max-size=10MB
 logging.file.max-history=1

diff --git a/boot-otel-tempo-docker/Dockerfile b/boot-otel-tempo-docker/Dockerfile
@@ -5,7 +5,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk \
  JAVA_VERSION=8u212 \
  JAVA_ALPINE_VERSION=8.212.04-r0 \
  OTEL_AGENT_VERSION=0.16.1 \
- OTEL_AGENT_JAR_FILE=opentelemetry-javaagent-all-0.16.1.jar \
+ OTEL_AGENT_JAR_FILE=opentelemetry-javaagent-all-0.17.0.jar \
  APP_HOME=/app/bin \
  MIN_HEAP_SIZE="40M" MAX_HEAP_SIZE="512M" THREADSTACK_SIZE="228k" \
  JAVA_GC_ARGS="-XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:+UseSerialGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90" \

diff --git a/...nt/opentelemetry-javaagent-all-0.16.1.jar → ...nt/opentelemetry-javaagent-all-0.17.0.jar b/...nt/opentelemetry-javaagent-all-0.16.1.jar → ...nt/opentelemetry-javaagent-all-0.17.0.jar
diff --git a/boot-otel-tempo-provider1/Dockerfile b/boot-otel-tempo-provider1/Dockerfile
@@ -16,7 +16,7 @@ EXPOSE 8090
 # https:/open-telemetry/opentelemetry-java-instrumentation
 ENV JAVA_OPTS "${JAVA_OPTS} \
  -Dotel.traces.exporter=jaeger \
- -Dotel.exporter.jaeger.endpoint=tempo:14250 \
+ -Dotel.exporter.jaeger.endpoint=http://tempo:14250 \
  -Dotel.metrics.exporter=none \
  -Dotel.resource.attributes="service.name=${APP_NAME}" \
  -Dotel.javaagent.debug=false \

diff --git a/boot-otel-tempo-provider1/src/main/resources/application.properties b/boot-otel-tempo-provider1/src/main/resources/application.properties
@@ -32,8 +32,8 @@ logging.level.io.opentelemetry=DEBUG
 logging.level.web=INFO
 logging.level.root=INFO
 
-logging.pattern.console =%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{traceId},%X{spanId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
-logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{traceId},%X{spanId}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
+logging.pattern.console =%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{trace_id},%X{span_id}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
+logging.pattern.file=%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr([${spring.application.name},%X{trace_id},%X{span_id}]) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m %n%wEx
 logging.file.name=/app/logs/${spring.application.name}.log
 logging.file.max-size=10MB
 logging.file.max-history=1

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
 
  <properties>
  <java.version>1.8</java.version>
- <opentelemetry.version>0.16.0</opentelemetry.version>
+ <opentelemetry.version>0.17.1</opentelemetry.version>
  <docker-maven-plugin.version>0.34.1</docker-maven-plugin.version>
  </properties>