Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project (almost) finished #7

Merged
merged 24 commits into from
Jun 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
django backend setup
  • Loading branch information
vivoit00 committed Apr 29, 2024
commit b23f14ae5e0a3908a34e5e243666fc697e03426a
Binary file removed pics/2024-03-11-Blackboard.jpg
Binary file not shown.
Binary file removed pics/2024-03-11-ContainerVsTraditional.png
Binary file not shown.
Binary file removed pics/2024-03-11-DistributedSystemsBrainstorm.png
Binary file not shown.
47 changes: 29 additions & 18 deletions sample/otel-in-action/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,39 @@ services:
- POSTGRES_USER=matthias
- POSTGRES_DB=mydb

todobackend-springboot:
image: todobackend:v2402
# todobackend-springboot:
# image: todobackend:v2402
# networks:
# - todonet
# build:
# context: ./todobackend-springboot
# dockerfile: Dockerfile
# ports:
# - "8080:8080"
# restart: unless-stopped
# environment:
# - SPRING_PROFILES_ACTIVE=prod
# - OTEL_EXPORTER_OTLP_ENDPOINT=http:https://jaeger:4318 # http endpoint
# - OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
# - OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
# - 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

todobackend-django: #NICHT FERTIG
image: #WHAT IS DIS
networks:
- todonet
build:
context: ./todobackend-springboot
context: ./todobackend_django
dockerfile: Dockerfile
ports:
- "8080:8080"
restart: unless-stopped
environment:
- SPRING_PROFILES_ACTIVE=prod
# - OTEL_EXPORTER_OTLP_ENDPOINT=http:https://jaeger:4318 # http endpoint
- OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
- OTEL_EXPORTER_OTLP_METRICS_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
- 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
restart: unless stopped

todoui-thymeleaf:
image: todoui:otel
Expand All @@ -49,7 +60,7 @@ services:
ports:
- "8090:8090"
environment:
- BACKEND_URL=http:https://todobackend-springboot:8080/
#- 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}
- OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=grpc
Expand All @@ -67,7 +78,7 @@ services:
ports:
- "5001:5000"
environment:
- BACKEND_URL=http:https://todobackend-springboot:8080/todos/
#- BACKEND_URL=http:https://todobackend-springboot:8080/todos/ ÄNDERN
- OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT}
- OTEL_RESOURCE_ATTRIBUTES=service.name=todoui-flask
- OTEL_METRICS_EXPORTER=otlp
Expand Down
23 changes: 0 additions & 23 deletions sample/otel-in-action/todobackend-springboot/Dockerfile

This file was deleted.

6 changes: 0 additions & 6 deletions sample/otel-in-action/todobackend-springboot/Dockerfile.dev

This file was deleted.

74 changes: 0 additions & 74 deletions sample/otel-in-action/todobackend-springboot/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading