Merge branch 'main' into grpcbox-deps-update

open-telemetry · Dec 1, 2023 · f04a5ec · f04a5ec
2 parents 6212018 + 1e38926
commit f04a5ec
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 71 deletions.
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -20,7 +20,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Read file
         id: set-matrix
         run: |
@@ -42,7 +42,7 @@ jobs:
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     services:
       postgres:
-        image: circleci/postgres:13.3-ram
+        image: circleci/postgres:13.5-ram
         ports: ["5432:5432"]
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         env:
@@ -51,7 +51,7 @@ jobs:
           POSTGRES_DB: opentelemetry_dataloader_test
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -91,23 +91,23 @@ jobs:
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     services:
       postgres:
-        image: circleci/postgres:13.3-ram
+        image: circleci/postgres:13.5-ram
         ports: ["5432:5432"]
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: opentelemetry_ecto_test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
           otp-version: ${{ matrix.otp_version }}
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/deps
@@ -138,7 +138,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -171,13 +171,13 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Opentelemetry HTTPoison test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -216,7 +216,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -256,15 +256,15 @@ jobs:
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     services:
       postgres:
-        image: circleci/postgres:13.3-ram
+        image: circleci/postgres:13.5-ram
         ports: ["5432:5432"]
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: opentelemetry_oban_test
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -303,7 +303,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -346,7 +346,7 @@ jobs:
         image: redis:alpine
         ports: ["6379:6379"]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -385,7 +385,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -424,7 +424,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -463,7 +463,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -502,7 +502,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict

diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -20,7 +20,7 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Read file
         id: set-matrix
         run: |
@@ -41,7 +41,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -73,7 +73,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -105,7 +105,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -137,7 +137,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -169,7 +169,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict
@@ -201,7 +201,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.test-matrix.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: erlef/setup-beam@v1
         with:
           version-type: strict

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   opentelemetry-aws-xray-release:
     name: '[opentelemetry-aws-xray-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -18,7 +18,7 @@ jobs:
 
   opentelemetry-cowboy-release:
     name: '[opentelemetry-cowboy-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -28,7 +28,7 @@ jobs:
 
   opentelemetry-dataloader-release:
     name: '[opentelemetry-dataloader-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -38,7 +38,7 @@ jobs:
 
   opentelemetry-ecto-release:
     name: '[opentelemetry-ecto-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -48,7 +48,7 @@ jobs:
 
   opentelemetry-elli-release:
     name: '[opentelemetry-elli-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -58,7 +58,7 @@ jobs:
 
   opentelemetry-finch-release:
     name: '[opentelemetry-finch-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -68,7 +68,7 @@ jobs:
 
   opentelemetry-grpcbox-release:
     name: '[opentelemetry-grpcbox-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -78,7 +78,7 @@ jobs:
 
   opentelemetry-httpoison-release:
     name: '[opentelemetry-httpoison-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -88,7 +88,7 @@ jobs:
 
   opentelemetry-instrumentation-http-release:
     name: '[opentelemetry-instrument-http-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -98,7 +98,7 @@ jobs:
 
   opentelemetry-nebulex-release:
     name: '[opentelemetry-nebulex-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -108,7 +108,7 @@ jobs:
 
   opentelemetry-oban-release:
     name: '[opentelemetry-oban-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -118,7 +118,7 @@ jobs:
 
   opentelemetry-phoenix-release:
     name: '[opentelemetry-phoenix-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -128,7 +128,7 @@ jobs:
 
   opentelemetry-process-propagator-release:
     name: '[opentelemetry-process-propagator-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -138,7 +138,7 @@ jobs:
 
   opentelemetry-redix-release:
     name: '[opentelemetry-redix-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -148,7 +148,7 @@ jobs:
 
   opentelemetry-req-release:
     name: '[opentelemetry-req-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -158,7 +158,7 @@ jobs:
 
   opentelemetry-telemetry-release:
     name: '[opentelemetry-telemetry-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:
@@ -168,7 +168,7 @@ jobs:
 
   opentelemetry-tesla-release:
     name: '[opentelemetry-tesla-release] Draft release'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: release-drafter/release-drafter@v5
         with:

diff --git a/examples/roll_dice_elli/package-lock.json b/examples/roll_dice_elli/package-lock.json
diff --git a/instrumentation/opentelemetry_dataloader/docker-compose.yml b/instrumentation/opentelemetry_dataloader/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   postgres:
-    image: postgres:13.3
+    image: postgres:16.1
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres