diff --git a/Dockerfile b/Dockerfile index 19a0882..e3baf67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,5 +60,5 @@ EXPOSE 8000 # Make entrypoint script executable RUN chmod +x /code/docker-entrypoint.sh -ENTRYPOINT ["/code/docker-entrypoint.sh"] +ENTRYPOINT ["bash","/code/docker-entrypoint.sh"] CMD ["uvicorn", "DataSpace.asgi:application", "--host", "0.0.0.0", "--port", "8000"] diff --git a/api/migrations/0001_initial.py b/api/migrations/0001_initial.py old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml index 607d99b..06c8f58 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" + services: backend: build: . diff --git a/otel-collector-config.yaml b/otel-collector-config.yaml index 4d75407..d19dd5e 100644 --- a/otel-collector-config.yaml +++ b/otel-collector-config.yaml @@ -10,8 +10,9 @@ processors: batch: exporters: - logging: - loglevel: warn + # 'logging' is replaced by 'debug' + debug: + verbosity: normal # 'normal' is equivalent to the old 'info'/'warn' levels otlp/elastic: endpoint: "apm-server:8200" tls: @@ -26,9 +27,9 @@ service: pipelines: traces: receivers: [otlp] - exporters: [logging, otlp/elastic] - processors: [batch] + processors: [memory_limiter, batch] # Added memory_limiter to the pipeline + exporters: [debug, otlp/elastic] metrics: receivers: [otlp] - exporters: [logging, otlp/elastic] - processors: [batch] + processors: [memory_limiter, batch] # Added memory_limiter to the pipeline + exporters: [debug, otlp/elastic] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 56a9731..aad4a74 100644 --- a/requirements.txt +++ b/requirements.txt @@ -112,7 +112,7 @@ django-stubs==4.2.7 djangorestframework-stubs==3.14.5 #whitenoise for managing static files - whitenoise==6.9.0 +whitenoise==6.9.0 # Activity stream for tracking user actions django-activity-stream==2.0.0