Merge branch 'main' into chore-performance-improvements

kubeshop · Feb 8, 2024 · 2c11804 · 2c11804
2 parents d713747 + 3bfdbab
commit 2c11804
Show file tree

Hide file tree

Showing 53 changed files with 1,213 additions and 183 deletions.
diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml
@@ -209,6 +209,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
 
+    - shell: bash
+      run: |
+        echo "TAG=sha-$(git rev-parse --short=8 $GITHUB_SHA)" >> $GITHUB_ENV
+
     - uses: google-github-actions/setup-gcloud@94337306dda8180d967a56932ceb4ddcf01edae7
       with:
         service_account_key: ${{ secrets.GKE_SA_KEY }}
@@ -225,11 +229,18 @@ jobs:
 
     - name: Deploy
       run: |
-        TAG=sha-$(git rev-parse --short=8 $GITHUB_SHA) \
+        TAG=${{env.TAG}} \
         NAME=tracetest-beta \
         CONFIG_FILE=./k8s/tracetest.beta.yaml \
         EXPOSE_HOST=beta.tracetest.io \
         CERT_NAME=tracetest-beta \
         BACKEND_CONFIG=tracetest-beta \
         ./k8s/deploy.sh
 
+    - name: Trigger Infra Update
+      uses: peter-evans/repository-dispatch@v1
+      with:
+        token: ${{ secrets.INFRA_REPO_PAT }}
+        repository: ${{ secrets.INFRA_REPO }}
+        event-type: update-tags
+        client-payload: '{"repo_name": "tracetest", "new_tag": "${{ env.TAG }}"}'
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
@@ -103,3 +103,12 @@ jobs:
         env:
           VERSION: ${{ github.ref_name }}
 
+      - name: Trigger Infra Update
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.INFRA_REPO_PAT }}
+          repository: ${{ secrets.INFRA_REPO }}
+          event-type: update-tags
+          client-payload: '{"repo_name": "tracetest", "new_tag": "${{ github.ref_name}}"}'
+
+
diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml
@@ -102,6 +102,14 @@ jobs:
           ANALYTICS_BE_KEY: ${{ secrets.ANALYTICS_BE_KEY }}
           TRACETEST_DEFAULT_CLOUD_ENDPOINT: ${{ secrets.TRACETEST_DEFAULT_CLOUD_ENDPOINT }}
 
+      - name: Trigger Infra Update
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.INFRA_REPO_PAT }}
+          repository: ${{ secrets.INFRA_REPO }}
+          event-type: update-tags
+          client-payload: '{"repo_name": "tracetest", "new_tag": "${{ github.ref_name}}"}'
+
   helm_chart_version_bump:
       name: "Trigger Helm chart appVersion update"
       needs: "release"

diff --git a/api/dataStores.yaml b/api/dataStores.yaml
@@ -208,6 +208,7 @@ components:
           signoz,
           dynatrace,
           sumologic,
+          instana
         ]
     SupportedClients:
       type: string

diff --git a/api/openapi.yaml b/api/openapi.yaml
@@ -489,6 +489,34 @@ paths:
             application/json:
               schema:
                 $ref: "tests.yaml#/components/schemas/ExportedTestInformation"
+
+  /tests/{testId}/run/{runId}/search-spans:
+    post:
+      tags:
+        - api
+      parameters:
+        - $ref: "./parameters.yaml#/components/parameters/testId"
+        - $ref: "./parameters.yaml#/components/parameters/runId"
+      summary: get spans fileter by query
+      description: get spans fileter by query
+      operationId: searchSpans
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                query:
+                  type: string
+                  description: query to filter spans, can be either a full text search or a Span Query Language query
+      responses:
+        200:
+          description: trace containing matching spans only
+          content:
+            application/json:
+              schema:
+                $ref: "tests.yaml#/components/schemas/SearchSpansResult"
+
   /tests/import:
     post:
       tags:

diff --git a/api/tests.yaml b/api/tests.yaml
@@ -339,6 +339,14 @@ components:
           items:
             type: string
 
+    SearchSpansResult:
+      type: object
+      properties:
+        spansIds:
+          type: array
+          items:
+            type: string
+
     Selector:
       type: object
       properties:

diff --git a/api/trace.yaml b/api/trace.yaml
@@ -9,7 +9,7 @@ components:
         tree:
           $ref: "#/components/schemas/Span"
         flat:
-          description: falttened version, mapped as spanId -> span{}
+          description: flattened version, mapped as spanId -> span{}
           type: object
           additionalProperties:
             $ref: "#/components/schemas/Span"

diff --git a/cli/openapi/api_api.go b/cli/openapi/api_api.go
diff --git a/cli/openapi/model_search_spans_request.go b/cli/openapi/model_search_spans_request.go