Merge branch 'main' into fix-oban-attributes

open-telemetry · Feb 3, 2024 · 655721d · 655721d
2 parents 0f320ab + 3a9ed42
commit 655721d
Show file tree

Hide file tree

Showing 38 changed files with 187 additions and 172 deletions.
diff --git a/.github/elixir-test-matrix.json b/.github/elixir-test-matrix.json
@@ -1,33 +1,29 @@
 {
   "otp_version": [
-    "26.1.2",
-    "23.3.4.19"
+    "26.2.1",
+    "25.3.2.8",
+    "24.3.4.15"
   ],
   "elixir_version": [
-    "1.15.7",
-    "1.11.4"
+    "1.16.0",
+    "1.14.5"
   ],
   "rebar3_version": [
-    "3.20.0"
+    "3.22.1"
   ],
   "os": [
     "ubuntu-20.04"
   ],
   "include": [
     {
-      "elixir_version": "1.15.7",
-      "otp_version": "26.1.2",
+      "elixir_version": "1.16.0",
+      "otp_version": "26.2.1",
       "check_formatted": true
-    }
-  ],
-  "exclude": [
-    {
-      "elixir_version": "1.15.7",
-      "otp_version": "23.3.4.19"
     },
     {
-      "elixir_version": "1.11.4",
-      "otp_version": "26.1.2"
+      "elixir_version": "1.12.3",
+      "otp_version": "24.3.4.15"
     }
-  ]
+  ],
+  "exclude": []
 }
diff --git a/.github/erlang-test-matrix.json b/.github/erlang-test-matrix.json
@@ -1,5 +1,5 @@
 {
-  "otp_version": ["26.1.2", "25.3.2.7", "24.3.4.14", "23.3.4.19"],
-  "rebar3_version": ["3.20.0"],
+  "otp_version": ["26.1.2", "25.3.2.8", "24.3.4.15"],
+  "rebar3_version": ["3.22.1"],
   "os": ["ubuntu-20.04"]
 }
diff --git a/.github/workflows/elixir.yml b/.github/workflows/elixir.yml
@@ -35,7 +35,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Dataloader test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -59,7 +59,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -84,7 +84,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Ecto test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -107,7 +107,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -132,7 +132,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Finch test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -146,7 +146,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -185,7 +185,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -210,7 +210,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Nebulex test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -224,7 +224,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -249,7 +249,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Oban test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -272,7 +272,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -297,7 +297,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Phoenix test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -311,7 +311,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -336,7 +336,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Redix test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -354,7 +354,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -379,7 +379,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Req test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -393,7 +393,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -418,7 +418,7 @@ jobs:
     defaults:
       run:
         working-directory: utilities/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Telemetry test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -432,7 +432,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -457,7 +457,7 @@ jobs:
     defaults:
       run:
         working-directory: propagators/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Process Propagator test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -471,7 +471,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps
@@ -496,7 +496,7 @@ jobs:
     defaults:
       run:
         working-directory: instrumentation/${{ env.app }}
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-22.04
     name: Opentelemetry Tesla test on Elixir ${{ matrix.elixir_version }} (OTP ${{ matrix.otp_version }})
     strategy:
       fail-fast: false
@@ -510,7 +510,7 @@ jobs:
           elixir-version: ${{ matrix.elixir_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/deps

diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -48,7 +48,7 @@ jobs:
           otp-version: ${{ matrix.otp_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/_build
@@ -80,7 +80,7 @@ jobs:
           otp-version: ${{ matrix.otp_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/_build
@@ -112,7 +112,7 @@ jobs:
           otp-version: ${{ matrix.otp_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/_build
@@ -144,7 +144,7 @@ jobs:
           otp-version: ${{ matrix.otp_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/_build
@@ -176,7 +176,7 @@ jobs:
           otp-version: ${{ matrix.otp_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/_build
@@ -208,7 +208,7 @@ jobs:
           otp-version: ${{ matrix.otp_version }}
           rebar3-version: ${{ matrix.rebar3_version }}
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/_build

diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@
     &nbsp;&nbsp;&bull;&nbsp;&nbsp;
     <a href="propagators/">Propagators<a/>
     &nbsp;&nbsp;&bull;&nbsp;&nbsp;
+    <a href="utilities/">Utilities<a/>
+    &nbsp;&nbsp;&bull;&nbsp;&nbsp;
     <a href="examples/">Examples<a/>
   </strong>
 </p>
@@ -25,7 +27,7 @@
 
 ## About this project
 
-This is a repository for OpenTelemetry Erlang & Elixir contributions that are not part of the
+This is a repository for OpenTelemetry Erlang & Elixir contribution libraries that are not part of the
 [core repository](https://github.com/open-telemetry/opentelemetry-erlang) and
 core distribution of the API and SDK.
 
@@ -40,9 +42,15 @@ OpenTelemetry can collect tracing data using instrumentation. Vendors/Users can
 
 ## Supported Runtimes
 
-OpenTelemetry requires OTP v21.3 and above.
+OpenTelemetry Contribution libraries are verified to support the last 3 OTP versions
+to match the supported runtimes of the OpenTelemetry API and SDK.
+
+For Elixir libraries, all versions that support the last 3 OTP versions are verified.
+
+See [Elixir OTP Compatibility](https://hexdocs.pm/elixir/1.16/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp) for supported OTP/Elixir combinations.
 
-See [Elixir OTP Compatibility](https://hexdocs.pm/elixir/1.12/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp) for supported OTP/Elixir combinations.
+Elixir libraries should aim for the minimum supported version to be the lowest possible
+it can for the code in the library, but must at least support versions outlined above.
 
 ## Contributing
 

diff --git a/instrumentation/opentelemetry_cowboy/rebar.config b/instrumentation/opentelemetry_cowboy/rebar.config
@@ -1,7 +1,7 @@
 {erl_opts, [debug_info]}.
 {deps, [
   {cowboy_telemetry, "~> 0.4"},
-  {opentelemetry_api, "~> 1.0"},
+  {opentelemetry_api, "~> 1.2"},
   {opentelemetry_telemetry, "~> 1.0"},
   {telemetry, "~> 1.0"}
 ]}.
@@ -19,9 +19,9 @@
             {subpackages, true}]}]},
   {test, [{erl_opts, [nowarn_export_all]},
           {deps, [
-            {opentelemetry, "~> 1.0"},
-            {opentelemetry_exporter, "~> 1.0"},
-            {cowboy, "~> 2.7"}
+            {opentelemetry, "~> 1.3"},
+            {opentelemetry_exporter, "~> 1.6"},
+            {cowboy, "~> 2.10"}
             ]},
           {paths, ["src", "test/support"]},
           {ct_opts, [{ct_hooks, [cth_surefire]}]}]}]}.