feat(linkkerd): tracing

openknowledge · Oct 11, 2023 · 5c9c01d · 5c9c01d
1 parent 8b5bafc
commit 5c9c01d
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 5 deletions.
diff --git a/address-validation-service/Dockerfile b/address-validation-service/Dockerfile
@@ -12,4 +12,6 @@ EXPOSE 8080
 COPY --from=mvn /usr/src/online-shop/target/runner/meecrowave-core-runner.jar /opt/meecrowave-runner.jar
 COPY --from=mvn /usr/src/online-shop/target/address-validation-service.war /opt/address-validation-service.war
 COPY src/main/resources/log4j2.xml /opt/log4j2.xml
-ENTRYPOINT ["java", "--illegal-access=permit", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/address-validation-service.war"]
+COPY opentelemetry-javaagent.jar /opt/opentelemetry-javaagent.jar
+
+ENTRYPOINT ["java", "--illegal-access=permit", "-javaagent:/opt/opentelemetry-javaagent.jar" , "-Dotel.service.name=address-validation-service", "-Dotel.propagators=b3", "-Dotel.exporter.otlp.endpoint=http://collector.linkerd-jaeger:4317", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/address-validation-service.war"]
diff --git a/address-validation-service/opentelemetry-javaagent.jar b/address-validation-service/opentelemetry-javaagent.jar
diff --git a/billing-service-v2/Dockerfile b/billing-service-v2/Dockerfile
@@ -12,4 +12,6 @@ EXPOSE 8080
 COPY --from=mvn /usr/src/online-shop/target/runner/meecrowave-core-runner.jar /opt/meecrowave-runner.jar
 COPY --from=mvn /usr/src/online-shop/target/billing-service.war /opt/billing-service.war
 COPY src/main/resources/log4j2.xml /opt/log4j2.xml
-ENTRYPOINT ["java", "--illegal-access=permit", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/billing-service.war"]
+COPY opentelemetry-javaagent.jar /opt/opentelemetry-javaagent.jar
+
+ENTRYPOINT ["java", "--illegal-access=permit", "-javaagent:/opt/opentelemetry-javaagent.jar" , "-Dotel.service.name=billing-v2-service", "-Dotel.propagators=b3", "-Dotel.exporter.otlp.endpoint=http://collector.linkerd-jaeger:4317", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/billing-service.war"]
diff --git a/billing-service-v2/opentelemetry-javaagent.jar b/billing-service-v2/opentelemetry-javaagent.jar
diff --git a/billing-service/Dockerfile b/billing-service/Dockerfile
@@ -12,4 +12,6 @@ EXPOSE 8080
 COPY --from=mvn /usr/src/online-shop/target/runner/meecrowave-core-runner.jar /opt/meecrowave-runner.jar
 COPY --from=mvn /usr/src/online-shop/target/billing-service.war /opt/billing-service.war
 COPY src/main/resources/log4j2.xml /opt/log4j2.xml
-ENTRYPOINT ["java", "--illegal-access=permit", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/billing-service.war"]
+COPY opentelemetry-javaagent.jar /opt/opentelemetry-javaagent.jar
+
+ENTRYPOINT ["java", "--illegal-access=permit", "-javaagent:/opt/opentelemetry-javaagent.jar" , "-Dotel.service.name=billing-service", "-Dotel.propagators=b3", "-Dotel.exporter.otlp.endpoint=http://collector.linkerd-jaeger:4317", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/billing-service.war"]
diff --git a/billing-service/opentelemetry-javaagent.jar b/billing-service/opentelemetry-javaagent.jar
diff --git a/customer-service/Dockerfile b/customer-service/Dockerfile
@@ -14,4 +14,4 @@ COPY --from=mvn /usr/src/online-shop/target/customer-service.war /opt/customer-s
 COPY src/main/resources/log4j2.xml /opt/log4j2.xml
 COPY opentelemetry-javaagent.jar /opt/opentelemetry-javaagent.jar
 
-ENTRYPOINT ["java", "--illegal-access=permit", "-javaagent:/opt/opentelemetry-javaagent.jar" , "-Dotel.service.name=customer-service", "-Dotel.propagators=b3", "-Dotel.traces.exporter=jaeger", "-Dotel.exporter.otlp.endpoint=collector.linkerd-jaeger:55678" , "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/customer-service.war"]
+ENTRYPOINT ["java", "--illegal-access=permit", "-javaagent:/opt/opentelemetry-javaagent.jar" , "-Dotel.service.name=customer-service", "-Dotel.propagators=b3", "-Dotel.exporter.otlp.endpoint=http://collector.linkerd-jaeger:4317", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/customer-service.war"]
diff --git a/delivery-service/Dockerfile b/delivery-service/Dockerfile
@@ -12,4 +12,6 @@ EXPOSE 8080
 COPY --from=mvn /usr/src/online-shop/target/runner/meecrowave-core-runner.jar /opt/meecrowave-runner.jar
 COPY --from=mvn /usr/src/online-shop/target/delivery-service.war /opt/delivery-service.war
 COPY src/main/resources/log4j2.xml /opt/log4j2.xml
-ENTRYPOINT ["java", "--illegal-access=permit", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/delivery-service.war"]
+COPY opentelemetry-javaagent.jar /opt/opentelemetry-javaagent.jar
+
+ENTRYPOINT ["java", "--illegal-access=permit", "-javaagent:/opt/opentelemetry-javaagent.jar" , "-Dotel.service.name=delivery-service", "-Dotel.propagators=b3", "-Dotel.exporter.otlp.endpoint=http://collector.linkerd-jaeger:4317", "-Djava.net.preferIPv4Stack=true", "-Dlog4j2.configurationFile=/opt/log4j2.xml", "-jar", "/opt/meecrowave-runner.jar", "--webapp", "/opt/delivery-service.war"]
diff --git a/delivery-service/opentelemetry-javaagent.jar b/delivery-service/opentelemetry-javaagent.jar