Update code to clean up unused resources and optimize the configuration

.env

@@ -13,7 +13,8 @@ OTEL_METRICS_EXPORTER=otlp
 OTEL_EXPORTER_OTLP_INSECURE=true
 OTEL_JAVAAGENT_LOGGING=application
 OTEL_JAVAAGENT_ENABLED=true
-OTEL_JAVAAGENT_DEBUG=true
+OTEL_JAVAAGENT_DEBUG=false
+OTEL_INSTRUMENTATION_MESSAGING_EXPERIMENTAL_RECEIVE_TELEMETRY_ENABLED=true
 # OpenTelemetry Resource Definitions
 OTEL_RESOURCE_ATTRIBUTES="service.namespace=yas-msa"
 

.gitignore

@@ -25,4 +25,6 @@
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 .project
-.settings
+.settings*
+.project
+.vscode

deployment/app-config/logback-spring.xml

@@ -12,7 +12,7 @@
 	<include
 		resource="org/springframework/boot/logging/logback/console-appender.xml" />
 	<!-- Define own appender to be used in the logger to append the data into -->
-	<!-- <appender name="CONSOLE"
+	<appender name="JSON_APPENDER"
 		class="ch.qos.logback.core.ConsoleAppender">
 		<Target>${user-system}.out</Target>
 		<encoder
@@ -40,8 +40,12 @@
 			</providers>
 		</encoder>
 	</appender>
- -->
 
+	<appender name="OTEL" class="io.opentelemetry.instrumentation.logback.mdc.v1_0.OpenTelemetryAppender">
+		<captureExperimentalAttributes>true</captureExperimentalAttributes>
+		<captureMdcAttributes>*</captureMdcAttributes>
+		<appender-ref ref="JSON_APPENDER" />
+	</appender>
 	<!-- This appender is to define the log to console that human friendly on 
 		dev machine -->
 	<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> 
@@ -53,6 +57,6 @@
 		name="org.springframework.web.filter.CommonsRequestLoggingFilter"
 		level="DEBUG" />
 	<root level="INFO">
-		<appender-ref ref="CONSOLE" />
+		<appender-ref ref="OTEL" />
 	</root>
 </configuration>

docker-compose.o11y.yml

@@ -41,7 +41,8 @@ services:
       - yas-network    
   prometheus:
     image: prom/prometheus:v2.42.0
-    container_name: prometheus    
+    hostname: ${PROMETHEUS_SERVICE_HOST}
+    container_name: prometheus
     command:
       - --web.console.templates=/etc/prometheus/consoles
       - --web.console.libraries=/etc/prometheus/console_libraries
@@ -55,7 +56,7 @@ services:
     volumes:
       - ./docker/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml:ro
     ports:
-      - "9090:9090"
+      - "${PROMETHEUS_SERVICE_PORT}:${PROMETHEUS_SERVICE_PORT}"
     healthcheck:
       interval: 5s
       retries: 10

docker-compose.yml

@@ -154,6 +154,8 @@ services:
     - OTEL_JAVAAGENT_LOGGING
     - OTEL_JAVAAGENT_ENABLED
     - OTEL_JAVAAGENT_DEBUG
+    - OTEL_INSTRUMENTATION_MESSAGING_EXPERIMENTAL_RECEIVE_TELEMETRY_ENABLED 
+    - OTEL.INSTRUMENTATION.LOGBACK-MDC.ADD-BAGGAGE=true
     volumes:
     - ./docker/libs/opentelemetry-javaagent_1.30.0.jar:/opentelemetry-javaagent.jar
     - ./deployment/app-config:/app-config