Merge pull request #22 from NarrativeApp/chore/migrate-github-runners-away-from-2004-image-epd-1270

puzza007 · web-flow · commit ec54e715d117 · 2025-02-14T16:57:52.000+13:00
chore: update dependencies and GitHub Actions configuration
diff --git a/.github/workflows/private-elixir-library-w-git-ops.yml b/.github/workflows/private-elixir-library-w-git-ops.yml
@@ -3,12 +3,12 @@ on: push
 name: Privately published Elixir Library (with git ops)
 
 env:
-  ELIXIR_VERSION: "1.11.4"
-  OTP_VERSION: "22.3.1"
+  ELIXIR_VERSION: "1.14.5-otp-24"
+  OTP_VERSION: "24.3.4.17"
 
 jobs:
   deps:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       NARRATIVE_HEX_ORG_API_KEY: ${{ secrets.NARRATIVE_HEX_ORG_API_KEY }}
       MIX_ENV: test
@@ -29,13 +29,14 @@ jobs:
           key: ${{ runner.os }}-deps
       - run: mix deps.get
       - name: Uploading dependencies for other jobs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: deps
           path: deps/
+          include-hidden-files: true
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: ["deps"]
     env:
       MIX_ENV: test
@@ -48,7 +49,7 @@ jobs:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}
       - name: Downloading dependencies
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: deps
           path: deps/
@@ -60,13 +61,13 @@ jobs:
       - name: Run `mix compile`
         run: mix deps.compile && mix compile
       - name: Uploading build artifacts for other jobs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: build
           path: _build/
 
   credo:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: ["deps", "build"]
     env:
       MIX_ENV: test
@@ -79,19 +80,19 @@ jobs:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}
       - name: Downloading dependencies
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: deps
           path: deps/
       - name: Downloading build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: build
           path: _build/
       - run: mix credo --strict
 
   formatter:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checking out project
         uses: actions/checkout@v2
@@ -103,7 +104,7 @@ jobs:
       - run: mix format --check-formatted
 
   audit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: ["deps"]
     env:
       NARRATIVE_HEX_ORG_API_KEY: ${{ secrets.NARRATIVE_HEX_ORG_API_KEY }}
@@ -118,14 +119,14 @@ jobs:
           elixir-version: ${{ env.ELIXIR_VERSION }}
       - run: mix hex.organization auth narrativeapp --key $NARRATIVE_HEX_ORG_API_KEY
       - name: Downloading dependencies
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: deps
           path: deps/
       - run: mix hex.audit
 
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: ["deps", "build"]
     env:
       MIX_ENV: test
@@ -138,19 +139,19 @@ jobs:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}
       - name: Downloading dependencies
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: deps
           path: deps/
       - name: Downloading build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: build
           path: _build/
       - run: mix test
 
   is_releasable:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: ["deps", "test", "audit", "formatter", "credo"]
     if: ${{ github.event_name == 'push' && github.ref != 'refs/heads/master'}}
     env:
@@ -164,12 +165,12 @@ jobs:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}
       - name: Downloading dependencies
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: deps
           path: deps/
       - name: Downloading build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: build
           path: _build/
@@ -179,20 +180,20 @@ jobs:
       - name: Run mix hex.build
         run: mix hex.build -o ${{ steps.app-info.outputs.app_name }}-${{ steps.app-info.outputs.app_version }}.tar
       - name: Uploading hex package as job artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.app-info.outputs.app_name }}-${{ steps.app-info.outputs.app_version }}.tar
           path: ${{ steps.app-info.outputs.app_name }}-${{ steps.app-info.outputs.app_version }}.tar
       - name: Run mix docs
         run: MIX_ENV=test mix docs && tar zcvf docs.tar.gz doc/
       - name: Uploading documentation as job artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.app-info.outputs.app_name }}-docs-${{ steps.app-info.outputs.app_version }}.tar.gz
           path: docs.tar.gz
 
   git_ops:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: ["deps", "test", "audit", "formatter", "credo"]
     if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
     env:
@@ -208,12 +209,12 @@ jobs:
           otp-version: ${{ env.OTP_VERSION }}
           elixir-version: ${{ env.ELIXIR_VERSION }}
       - name: Downloading dependencies
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: deps
           path: deps/
       - name: Downloading build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: build
           path: _build/
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1,2 @@
+elixir 1.14.5-otp-24
+erlang 24.3.4.17
diff --git a/lib/dogstatsd/statsd.ex b/lib/dogstatsd/statsd.ex
@@ -51,12 +51,8 @@ defmodule DogStatsd.Statsd do
       def add_tags(event, []), do: event
 
       def add_tags(event, tags) do
-        tags =
-          tags
-          |> Enum.map(&rm_pipes/1)
-          |> Enum.join(",")
-
-        "#{event}|##{tags}"
+        tags_string = Enum.map_join(tags, ",", &rm_pipes/1)
+        "#{event}|##{tags_string}"
       end
 
       def increment(dogstatsd, stat, opts \\ %{}) do
diff --git a/mix.exs b/mix.exs
@@ -33,7 +33,7 @@ defmodule DogStatsd.MixProject do
   # Type `mix help deps` for more examples and options
   defp deps do
     [
-      {:credo, "~> 1.5.1", only: ~w[dev test]a, runtime: false},
+      {:credo, "~> 1.6", only: ~w[dev test]a, runtime: false},
       {:ex_doc, ">= 0.0.0", only: ~w[dev test]a},
       {:excoveralls, "~> 0.14.0", only: ~w[dev test]a},
       {:git_ops, "~> 2.2", only: ~w[dev test]a, runtime: false}
diff --git a/mix.lock b/mix.lock
@@ -1,18 +1,18 @@
 %{
-  "bunt": {:hex, :bunt, "0.2.0", "951c6e801e8b1d2cbe58ebbd3e616a869061ddadcc4863d0a2182541acae9a38", [:mix], [], "hexpm", "7af5c7e09fe1d40f76c8e4f9dd2be7cebd83909f31fee7cd0e9eadc567da8353"},
+  "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
   "certifi": {:hex, :certifi, "2.5.3", "70bdd7e7188c804f3a30ee0e7c99655bc35d8ac41c23e12325f36ab449b70651", [:rebar3], [{:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}], "hexpm", "ed516acb3929b101208a9d700062d520f3953da3b6b918d866106ffa980e1c10"},
-  "credo": {:hex, :credo, "1.5.5", "e8f422026f553bc3bebb81c8e8bf1932f498ca03339856c7fec63d3faac8424b", [:mix], [{:bunt, "~> 0.2.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "dd8623ab7091956a855dc9f3062486add9c52d310dfd62748779c4315d8247de"},
+  "credo": {:hex, :credo, "1.7.11", "d3e805f7ddf6c9c854fd36f089649d7cf6ba74c42bc3795d587814e3c9847102", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "56826b4306843253a66e47ae45e98e7d284ee1f95d53d1612bb483f88a8cf219"},
   "earmark": {:hex, :earmark, "1.2.0", "bf1ce17aea43ab62f6943b97bd6e3dc032ce45d4f787504e3adf738e54b42f3a", [:mix], [], "hexpm", "6709251dd10e70cca0d50be8a25adc38c701b39eac2da3b1c166e3e7e4d358ed"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.12", "b245e875ec0a311a342320da0551da407d9d2b65d98f7a9597ae078615af3449", [:mix], [], "hexpm", "711e2cc4d64abb7d566d43f54b78f7dc129308a63bc103fbd88550d2174b3160"},
   "ex_doc": {:hex, :ex_doc, "0.24.0", "2df14354835afaabdf87cb2971ea9485d8a36ff590e4b6c250b4f60c8fdf9143", [:mix], [{:earmark_parser, "~> 1.4.0", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "a0f4bcff21ceebea48414e49885d2a3e542200f76a2facf3f8faa54935eeb721"},
   "excoveralls": {:hex, :excoveralls, "0.14.0", "4b562d2acd87def01a3d1621e40037fdbf99f495ed3a8570dfcf1ab24e15f76d", [:mix], [{:hackney, "~> 1.16", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "94f17478b0cca020bcd85ce7eafea82d2856f7ed022be777734a2f864d36091a"},
   "exjsx": {:hex, :exjsx, "3.2.1", "1bc5bf1e4fd249104178f0885030bcd75a4526f4d2a1e976f4b428d347614f0f", [:mix], [{:jsx, "~> 2.8.0", [hex: :jsx, repo: "hexpm", optional: false]}], "hexpm", "b55727b206dab96feb025267e5c122ddb448f55b6648f9156b8d481215d80290"},
-  "file_system": {:hex, :file_system, "0.2.10", "fb082005a9cd1711c05b5248710f8826b02d7d1784e7c3451f9c1231d4fc162d", [:mix], [], "hexpm", "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"},
+  "file_system": {:hex, :file_system, "1.1.0", "08d232062284546c6c34426997dd7ef6ec9f8bbd090eb91780283c9016840e8f", [:mix], [], "hexpm", "bfcf81244f416871f2a2e15c1b515287faa5db9c6bcf290222206d120b3d43f6"},
   "git_cli": {:hex, :git_cli, "0.3.0", "a5422f9b95c99483385b976f5d43f7e8233283a47cda13533d7c16131cb14df5", [:mix], [], "hexpm", "78cb952f4c86a41f4d3511f1d3ecb28edb268e3a7df278de2faa1bd4672eaf9b"},
   "git_ops": {:hex, :git_ops, "2.4.2", "291a4f105dfa3d34cffa56cf8faf0e8c2699b49d3316270aa4881e75c62b1832", [:mix], [{:git_cli, "~> 0.2", [hex: :git_cli, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "bd9051c49e17d0dc2e0ae9306292f9f5f671d402227f5dda12e69a702198dec4"},
   "hackney": {:hex, :hackney, "1.17.0", "717ea195fd2f898d9fe9f1ce0afcc2621a41ecfe137fae57e7fe6e9484b9aa99", [:rebar3], [{:certifi, "~>2.5", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "~>6.1.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "~>1.0.0", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:parse_trans, "~>3.3", [hex: :parse_trans, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "~>1.1.0", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}, {:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "64c22225f1ea8855f584720c0e5b3cd14095703af1c9fbc845ba042811dc671c"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~>0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
-  "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
+  "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "jsex": {:hex, :jsex, "2.0.0", "d54a39e49418b34b1a78236a92f73e4d7c46329c220275d7223fab4b3dc6120f", [:mix], [{:jsx, "~> 2.0", [hex: :jsx, optional: false]}]},
   "jsx": {:hex, :jsx, "2.8.2", "7acc7d785b5abe8a6e9adbde926a24e481f29956dd8b4df49e3e4e7bcc92a018", [:mix, :rebar3], [], "hexpm", "b4c5d3230b397c8d95579e4a3d72826bb6463160130ccf4182f5be8579b5f44c"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
diff --git a/test/dogstatsd_test.exs b/test/dogstatsd_test.exs
@@ -357,9 +357,7 @@ defmodule DogStatsdTest do
     # We should receive a packet of 50 messages that was automatically
     # flushed when the buffer got too big
     theoretical_reply =
-      Enum.into(1..50, [])
-      |> Enum.map(fn _ -> "mycounter:1|c" end)
-      |> Enum.join("\n")
+      Enum.map_join(1..50, "\n", fn _ -> "mycounter:1|c" end)
       |> String.to_charlist()
 
     assert_receive {:udp, _port, _from_ip, _from_port, ^theoretical_reply}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+elixir 1.14.5-otp-24`
	`2`	`+erlang 24.3.4.17`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ defmodule DogStatsd.MixProject do`
`33`	`33`	# Type `mix help deps` for more examples and options
`34`	`34`	`defp deps do`
`35`	`35`	`[`
`36`		`- {:credo, "~> 1.5.1", only: ~w[dev test]a, runtime: false},`
	`36`	`+ {:credo, "~> 1.6", only: ~w[dev test]a, runtime: false},`
`37`	`37`	`{:ex_doc, ">= 0.0.0", only: ~w[dev test]a},`
`38`	`38`	`{:excoveralls, "~> 0.14.0", only: ~w[dev test]a},`
`39`	`39`	`{:git_ops, "~> 2.2", only: ~w[dev test]a, runtime: false}`