Merge branch 'main' into feat-compactor-panics

Author: codetheweb

.github/actions/export-tilt-logs/action.yaml

@@ -0,0 +1,19 @@
+name: Export Tilt logs
+description: Exports logs and traces from services in Tilt to an artifact
+inputs:
+  artifact-name:
+    description: "The name of the artifact containing logs and traces from services in Tilt"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - name: Get logs of all services
+      id: get-logs
+      run: |
+        bin/get-logs.sh ${{ inputs.artifact-name }}.zip
+      shell: bash
+    - name: Upload logs as artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.artifact-name }}
+        path: "${{ inputs.artifact-name }}.zip"

.github/actions/tilt/action.yaml

@@ -31,3 +31,4 @@ runs:
         kubectl -n chroma port-forward svc/query-service 50053:50051 &
         kubectl -n chroma port-forward svc/frontend-service 8000:8000 &
         kubectl -n chroma port-forward svc/minio 9000:9000 &
+        kubectl -n chroma port-forward svc/jaeger 16686:16686 &

.github/workflows/_go-tests.yml

@@ -44,3 +44,8 @@ jobs:
         uses: ./.github/actions/go
       - uses: ./.github/actions/tilt
       - run: bin/cluster-test.sh bash -c 'cd go && go test -timeout 30s -run ^TestNodeWatcher$ github.com/chroma-core/chroma/go/pkg/memberlist_manager'
+      - name: Save service logs to artifact
+        if: always()
+        uses: ./.github/actions/export-tilt-logs
+        with:
+          artifact-name: "go-cluster-test"

.github/workflows/_python-tests.yml

@@ -118,21 +118,15 @@ jobs:
         shell: bash
         env:
           PROPERTY_TESTING_PRESET: ${{ inputs.property_testing_preset }}
-      - name: Get logs of all services
-        id: get-logs
-        if: success() || failure()
-        run: |
-          bin/get-logs.sh "${{ matrix.test-globs }}" "${{ matrix.python }}"
-          # Output the logs zip file path as a job output
-          echo "artifact_name=cluster_logs_$(basename "${{ matrix.test-globs }}" .py)_${{ matrix.python }}" >> $GITHUB_OUTPUT
-          echo "logs_zip_path=$(pwd)/$(basename "${{ matrix.test-globs }}" .py)_${{ matrix.python }}_logs.zip" >> $GITHUB_OUTPUT
-        shell: bash
-      - name: Upload logs as artifact
-        if: success() || failure()
-        uses: actions/upload-artifact@v4
+      - name: Compute artifact name
+        if: always()
+        id: compute-artifact-name
+        run: echo "artifact_name=cluster_logs_$(basename "${{ matrix.test-globs }}" .py)_${{ matrix.python }}" >> $GITHUB_OUTPUT
+      - name: Save service logs to artifact
+        if: always()
+        uses: ./.github/actions/export-tilt-logs
         with:
-          name: ${{ steps.get-logs.outputs.artifact_name }}
-          path: ${{ steps.get-logs.outputs.logs_zip_path }}
+          artifact-name: ${{ steps.compute-artifact-name.outputs.artifact_name }}
 
   merge-cluster-logs:
     runs-on: ubuntu-latest

.github/workflows/_rust-tests.yml

@@ -36,6 +36,12 @@ jobs:
         uses: ./.github/actions/tilt
       - name: Run tests
         run: cargo nextest run --profile k8s_integration
+      - name: Save service logs to artifact
+        if: always()
+        uses: ./.github/actions/export-tilt-logs
+        with:
+          artifact-name: "rust-integration-test"
+
   test-benches:
     strategy:
       matrix:

.github/workflows/nightly-tests.yml

@@ -27,21 +27,11 @@ jobs:
         shell: bash
         env:
           PROPERTY_TESTING_PRESET: slow
-      - name: Get logs of all services
-        id: get-logs
-        if: success() || failure()
-        run: |
-          bin/get-logs.sh "${{ matrix.test-globs }}" "3.12"
-          # Output the logs zip file path as a job output
-          echo "artifact_name=cluster_logs_$(basename "${{ matrix.test-globs }}" .py)_3.12" >> $GITHUB_OUTPUT
-          echo "logs_zip_path=$(pwd)/$(basename "${{ matrix.test-globs }}" .py)_3.12_logs.zip" >> $GITHUB_OUTPUT
-        shell: bash
-      - name: Upload logs as artifact
-        if: success() || failure()
-        uses: actions/upload-artifact@v4
+      - name: Save service logs to artifact
+        if: always()
+        uses: ./.github/actions/export-tilt-logs
         with:
-          name: ${{ steps.get-logs.outputs.artifact_name }}
-          path: ${{ steps.get-logs.outputs.logs_zip_path }}
+          artifact-name: "tilt-logs"
       - name: Send PagerDuty alert on failure
         if: ${{ failure() }}
         uses: Entle/[email protected]

.github/workflows/release-chromadb.yml

@@ -279,7 +279,7 @@ jobs:
                 // - This workflow finishes for A and deploys A to Chroma Cloud
                 // Chroma Cloud is now running A, but the last commit was B.
                 "environment": "staging",
-                "planes": "data"
+                "planes": "data,control"
               }
             })
 

.taplo.toml

@@ -0,0 +1,2 @@
+[formatting]
+column_width = 65535