Merge branch 'develop' into new_backend

sample/otel-in-action/docker-compose.yaml

@@ -16,6 +16,7 @@ services:
  - POSTGRES_USER=matthias
  - POSTGRES_DB=mydb
 
+
 # todobackend-springboot:
 # image: todobackend:v2402
 # networks:
@@ -40,6 +41,7 @@ services:
 # - postgresdb
 
  todobackend-django:
+
  build:
  context: ./todobackend_django
  dockerfile: Dockerfile
@@ -49,6 +51,19 @@ services:
  - "8000:8000" 
  restart: unless-stopped
 
+ environment:
+ - SPRING_PROFILES_ACTIVE=prod
+# - OTEL_EXPORTER_OTLP_ENDPOINT=http:https://jaeger:4318 # http endpoint
+ - OTEL_EXPORTER_OTLP_ENDPOINT=otelcol:4317
+ - OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=otelcol:4317
+ - OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
+ - OTEL_EXPORTER_OTLP_METRICS_PROTOCOL=grpc
+ - OTEL_RESOURCE_ATTRIBUTES=service.name=todobackend-springboot
+ - OTEL_METRICS_EXPORTER=otlp,logging-otlp
+ - OTEL_LOGS_EXPORTER=none
+ depends_on:
+ - postgresdb
+
 
  todoui-thymeleaf:
  image: maeddes/todoui-thymeleaf:v2404
@@ -60,9 +75,10 @@ services:
  ports:
  - "8090:8090"
  environment:
- #- BACKEND_URL=http:https://todobackend-springboot:8080/ ÄNDERN
- - OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
- - OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
+ # - BACKEND_URL=http:https://todobackend-springboot:8080/ ÄNDERN
+ - OTEL_EXPORTER_OTLP_ENDPOINT=otelcol:4317
+ - OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=otelcol:4317
+
  - OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
  - OTEL_EXPORTER_OTLP_METRICS_PROTOCOL=grpc
  - OTEL_RESOURCE_ATTRIBUTES=service.name=todoui-thymeleaf
@@ -79,7 +95,8 @@ services:
  - "5001:5000"
  environment:
  #- BACKEND_URL=http:https://todobackend-springboot:8080/todos/ ÄNDERN
- - OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
+ - OTEL_EXPORTER_OTLP_ENDPOINT=otelcol:4317
+
  - OTEL_RESOURCE_ATTRIBUTES=service.name=todoui-flask
  - OTEL_METRICS_EXPORTER=otlp