frontend GET works

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

@@ -3,8 +3,6 @@ networks:
 
 services:
 
-### APPLICATION PART
-
  postgresdb:
  image: postgres
  networks:
@@ -17,37 +15,32 @@ services:
  - POSTGRES_DB=mydb
 
  todobackend-django:
-
  build:
  context: ./todobackend_django
  dockerfile: Dockerfile
  networks:
  - todonet
  ports:
- - "8000:8000" 
+ - "8080:8080"
  restart: unless-stopped
-# environment:
-# Können wir immer noch wiederherstellen, wenn wir sie brauchen
  depends_on:
  - postgresdb
  volumes:
- - ./todobackend_django:/app # Bind mount your local code to the container
-
+ - ./todobackend_django:/app
 
  todoui-thymeleaf:
  image: maeddes/todoui-thymeleaf:v2404
  build:
  context: ./todoui-thymeleaf
- dockerfile: Dockerfile #-multistage
+ dockerfile: Dockerfile
  networks:
  - todonet
  ports:
  - "8090:8090"
  environment:
- # - BACKEND_URL=http:https://todobackend-springboot:8080/ ÄNDERN
+ - BACKEND_URL=http:https://todobackend-django:8080/
  - 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
@@ -63,9 +56,8 @@ services:
  ports:
  - "5001:5000"
  environment:
- #- BACKEND_URL=http:https://todobackend-springboot:8080/todos/  ÄNDERN
+ - BACKEND_URL=http:https://todobackend-django:8080/ 
  - OTEL_EXPORTER_OTLP_ENDPOINT=otelcol:4317
-
  - OTEL_RESOURCE_ATTRIBUTES=service.name=todoui-flask
  - OTEL_METRICS_EXPORTER=otlp
 
@@ -74,4 +66,4 @@ services:
  build:
  context: ./loadgenerator
  networks:
- - todonet
+ - todonet

sample/otel-in-action/todobackend_django/Dockerfile

@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y postgresql-client && rm -rf /var/lib/ap
 
 COPY . /app
 
-EXPOSE 8000
+EXPOSE 8080
 
-# Befehl zum Starten des Django-Servers
-CMD sh -c "python manage.py makemigrations && python manage.py migrate && python manage.py runserver 0.0.0.0:8000" 
+CMD sh -c "python manage.py makemigrations && python manage.py migrate && python manage.py runserver 0.0.0.0:8080" 

sample/otel-in-action/todobackend_django/todobackend_django/urls.py

@@ -1,8 +1,9 @@
+# urls.py
+
 from django.urls import path
 from todos import views
 
 urlpatterns = [
  path('todos/', views.todo_list),
- path('todos/<str:pk>/', views.todo_detail, name='todo_detail_string'),
+ path('todos/<str:pk>/', views.todo_detail, name='todo_detail'),
 ]
-

sample/otel-in-action/todobackend_django/todos/views.py

@@ -4,18 +4,16 @@
 from .models import Todo
 from .serializers import TodoSerializer
 
+# views.py
+
 @api_view(['GET', 'POST'])
 def todo_list(request):
  if request.method == 'GET':
- todos = Todo.objects.all()
- serializer = TodoSerializer(todos, many=True)
- return Response(serializer.data)
-
+ todos = Todo.objects.all().values_list('todo', flat=True) 
+ return Response(list(todos))
+
  elif request.method == 'POST':
- if 'todo' in request.data:
- serializer = TodoSerializer(data={'todo': request.data['todo']})
- else:
- serializer = TodoSerializer(data=request.data)
+ serializer = TodoSerializer(data=request.data)
 
  if serializer.is_valid():
  serializer.save()
@@ -25,10 +23,11 @@ def todo_list(request):
 @api_view(['DELETE'])
 def todo_detail(request, pk):
  try:
- todo = Todo.objects.get(todo=pk)
+ todo = Todo.objects.get(pk=pk)
  except Todo.DoesNotExist:
  return Response(status=status.HTTP_404_NOT_FOUND)
 
  if request.method == 'DELETE':
  todo.delete()
  return Response(status=status.HTTP_204_NO_CONTENT)
+