瀏覽代碼

Merge pull request #46429 from cpuguy83/swap_to_otel_action

CI: Switch to use tracing action
CrazyMax 1 年之前
父節點
當前提交
152036f0aa
共有 2 個文件被更改,包括 9 次插入9 次删除
  1. 0 9
      .github/actions/setup-runner/action.yml
  2. 9 0
      .github/workflows/test.yml

+ 0 - 9
.github/actions/setup-runner/action.yml

@@ -25,12 +25,3 @@ runs:
     - run: |
     - run: |
         docker info
         docker info
       shell: bash
       shell: bash
-    # TODO: Remove this step once the separate action is merged
-    # Github doesn't let you add a composite action and use it in the same PR (apparently)
-    # Ref: https://github.com/moby/moby/actions/runs/5581571995/jobs/10199909170?pr=45652#step:9:1
-    - run: |
-        set -e
-        docker run -d --net=host --name jaeger -e COLLECTOR_OTLP_ENABLED=true jaegertracing/all-in-one:1.46
-        docker0_ip="$(ip -f inet addr show docker0 | grep -Po 'inet \K[\d.]+')"
-        echo "OTEL_EXPORTER_OTLP_ENDPOINT=http://${docker0_ip}:4318" >> "${GITHUB_ENV}"
-      shell: bash

+ 9 - 0
.github/workflows/test.yml

@@ -203,6 +203,9 @@ jobs:
       -
       -
         name: Set up runner
         name: Set up runner
         uses: ./.github/actions/setup-runner
         uses: ./.github/actions/setup-runner
+      -
+        name: Set up tracing
+        uses: ./.github/actions/setup-tracing
       -
       -
         name: Set up Docker Buildx
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         uses: docker/setup-buildx-action@v2
@@ -293,6 +296,9 @@ jobs:
       -
       -
         name: Set up runner
         name: Set up runner
         uses: ./.github/actions/setup-runner
         uses: ./.github/actions/setup-runner
+      -
+        name: Set up tracing
+        uses: ./.github/actions/setup-tracing
       -
       -
         name: Prepare
         name: Prepare
         run: |
         run: |
@@ -437,6 +443,9 @@ jobs:
       -
       -
         name: Set up runner
         name: Set up runner
         uses: ./.github/actions/setup-runner
         uses: ./.github/actions/setup-runner
+      -
+        name: Set up tracing
+        uses: ./.github/actions/setup-tracing
       -
       -
         name: Set up Docker Buildx
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         uses: docker/setup-buildx-action@v2