From d81058fe966a02ac02b390a22db12c188f20650b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20K=C3=B6hnecke?=
 <niklas.koehnecke@ext.aleph-alpha.com>
Date: Fri, 7 Jun 2024 16:21:22 +0200
Subject: [PATCH] fix: reenable integration_test

---
 .github/workflows/sdk-tests.yml  | 14 +++++++-------
 docker-compose.yaml              | 19 ++++++++++++++-----
 tests/core/tracer/test_tracer.py |  1 -
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/sdk-tests.yml b/.github/workflows/sdk-tests.yml
index a4ac3263e..2af70b608 100644
--- a/.github/workflows/sdk-tests.yml
+++ b/.github/workflows/sdk-tests.yml
@@ -122,13 +122,13 @@ jobs:
           - "4317:4317"
           - "4318:4318"
           - "16686:16686"
-#      trace-viewer:
-#        image: ghcr.io/aleph-alpha/trace-viewer-trace-viewer:main
-#        credentials:
-#          username: "unused"
-#          password: ${{ secrets.GITHUB_TOKEN }} # TODO: add PAT
-#        ports:
-#          - "3000:3000"
+      trace-viewer:
+        image: ghcr.io/aleph-alpha/trace-viewer-trace-viewer:main
+        credentials:
+          username: "unused"
+          password: ${{ secrets.GH_PAT }}
+        ports:
+          - "3000:3000"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b01e865fa..7aae3e227 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,7 +6,16 @@ services:
       ES_JAVA_OPTS: "-Xms512m -Xmx512m"
       discovery.type: "single-node"
       xpack.security.enabled: "false"
+    command: ["elasticsearch", "-Elogger.level=ERROR"]
+    healthcheck:
+      test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"]
+      interval: 5s
+      timeout: 5s
+      retries: 3
   argilla:
+    depends_on:
+      argilla-elastic-search:
+        condition: service_healthy
     image: argilla/argilla-server:v1.26.1
     ports:
       - "6900:6900"
@@ -22,10 +31,10 @@ services:
       - "4318:4318"
       - "16686:16686"
     image: jaegertracing/all-in-one:1.35
-  # TODO: Below code should be enabled once the secret has been added to the CI. After that, also check tests in test_tracer.py
   # export GITHUB_TOKEN=...
   # echo $GITHUB_TOKEN | docker login ghcr.io -u your_email@for_github --password-stdin
-  # trace_viewer:
-  #   image: ghcr.io/aleph-alpha/trace-viewer-trace-viewer:main
-  #   ports:
-  #    - 3000:3000
+  # docker compose pull to update containers
+  trace_viewer:
+    image: ghcr.io/aleph-alpha/trace-viewer-trace-viewer:main
+    ports:
+     - 3000:3000
diff --git a/tests/core/tracer/test_tracer.py b/tests/core/tracer/test_tracer.py
index 3cd154782..c9848b6d1 100644
--- a/tests/core/tracer/test_tracer.py
+++ b/tests/core/tracer/test_tracer.py
@@ -226,7 +226,6 @@ def test_spans_cannot_be_used_as_context_twice(
             pass
 
 
-@pytest.mark.skip("Not yet implemented")
 @pytest.mark.docker
 @pytest.mark.parametrize(
     "tracer_fixture",