Merge branch 'main' into al/span-docs

open-telemetry · Feb 6, 2024 · ce08c3c · ce08c3c
2 parents d5fe7e0 + 3666088
commit ce08c3c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -98,7 +98,7 @@ jobs:
         name: Deps
       - run: mix test --cover
         name: ExUnit
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         if: ${{ always() }}
         with:
           file: apps/opentelemetry_api/coverage.xml

diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -62,25 +62,25 @@ jobs:
     - name: Covertool
       if: ${{ always() }}
       run: rebar3 covertool generate
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4
       if: ${{ always() }}
       with:
         file: _build/test/covertool/opentelemetry.covertool.xml
         env_vars: OTP_VERSION
         flags: sdk,erlang
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4
       if: ${{ always() }}
       with:
         file: _build/test/covertool/opentelemetry_api.covertool.xml
         env_vars: OTP_VERSION
         flags: api,erlang
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4
       if: ${{ always() }}
       with:
         file: _build/test/covertool/opentelemetry_exporter.covertool.xml
         env_vars: OTP_VERSION
         flags: exporter,erlang
-    - uses: codecov/codecov-action@v3
+    - uses: codecov/codecov-action@v4
       if: ${{ always() }}
       with:
         file: _build/test/covertool/opentelemetry_zipkin.covertool.xml

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   otel:
-    image: otel/opentelemetry-collector-contrib:0.92.0
+    image: otel/opentelemetry-collector-contrib:0.93.0
     command: ["--config=/conf/otel-collector-config.yaml"]
     privileged: true
     ports: