From c45621dd937a4eb567c121b70cbfcd40e7555471 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 22 Feb 2023 10:34:14 -0700 Subject: [PATCH 1/5] featureflag: bump otel dependencies --- src/featureflagservice/mix.exs | 6 +++--- src/featureflagservice/mix.lock | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/featureflagservice/mix.exs b/src/featureflagservice/mix.exs index da3da01cb6..21b0bf8b12 100644 --- a/src/featureflagservice/mix.exs +++ b/src/featureflagservice/mix.exs @@ -54,10 +54,10 @@ defmodule Featureflagservice.MixProject do {:plug_cowboy, "~> 2.5"}, {:grpcbox, "~> 0.15.0", override: true}, - {:opentelemetry_exporter, "~> 1.2.0"}, + {:opentelemetry_exporter, "~> 1.4.0"}, {:opentelemetry_grpcbox, "~> 0.1"}, - {:opentelemetry_api, "~> 1.1.0"}, - {:opentelemetry, "~> 1.1.1"}, + {:opentelemetry_api, "~> 1.2.1"}, + {:opentelemetry, "~> 1.2.1"}, {:opentelemetry_phoenix, "~> 1.0.0"}, {:opentelemetry_ecto, "~> 1.0.0"} ] diff --git a/src/featureflagservice/mix.lock b/src/featureflagservice/mix.lock index 3c08463be8..87943b269d 100644 --- a/src/featureflagservice/mix.lock +++ b/src/featureflagservice/mix.lock @@ -21,13 +21,14 @@ "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"}, "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"}, "mime": {:hex, :mime, "2.0.2", "0b9e1a4c840eafb68d820b0e2158ef5c49385d17fb36855ac6e7e087d4b1dcc5", [:mix], [], "hexpm", "e6a3f76b4c277739e36c2e21a2c640778ba4c3846189d5ab19f97f126df5f9b7"}, - "opentelemetry": {:hex, :opentelemetry, "1.0.5", "f0cd36ac8b30b68e8d70cec5bb88801ed7f3fe79aac67597054ed5490542e810", [:rebar3], [{:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "3b17f8933a58e1246f42a0c215840fd8218aebbcabdb0aac62b0c766fe85542e"}, - "opentelemetry_api": {:hex, :opentelemetry_api, "1.0.3", "77f9644c42340cd8b18c728cde4822ed55ae136f0d07761b78e8c54da46af93a", [:mix, :rebar3], [], "hexpm", "4293e06bd369bc004e6fad5edbb56456d891f14bd3f9f1772b18f1923e0678ea"}, + "opentelemetry": {:hex, :opentelemetry, "1.2.1", "6b374a0b4ebbd206d0c7c13ea34a8b46c63bfefa86d813ed07613876f1811575", [:rebar3], [{:opentelemetry_api, "~> 1.2.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:opentelemetry_semantic_conventions, "~> 0.2", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: false]}], "hexpm", "9a627f3bffcb972d404590ef686309863d0fe09ddf1a4612430b99d781ecf940"}, + "opentelemetry_api": {:hex, :opentelemetry_api, "1.2.1", "7b69ed4f40025c005de0b74fce8c0549625d59cb4df12d15c32fe6dc5076ff42", [:mix, :rebar3], [{:opentelemetry_semantic_conventions, "~> 0.2", [hex: :opentelemetry_semantic_conventions, repo: "hexpm", optional: false]}], "hexpm", "6d7a27b7cad2ad69a09cabf6670514cafcec717c8441beb5c96322bac3d05350"}, "opentelemetry_ecto": {:hex, :opentelemetry_ecto, "1.0.0", "8463cc466429b3e125ae236a5cc32869ea38c88eb2f07722dd88e78ceca6963c", [:mix], [{:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:opentelemetry_process_propagator, "~> 0.1.0", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "39cc60dbdd54e371bd12fb010ee960de851d782dca197efefa5c35eb6b4c18bd"}, - "opentelemetry_exporter": {:hex, :opentelemetry_exporter, "1.0.4", "60a64c75633a82b6c36a20043be355ac72a7b9b21633edd47407924c5596dde0", [:rebar3], [{:grpcbox, ">= 0.0.0", [hex: :grpcbox, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.0", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:tls_certificate_check, "~> 1.11", [hex: :tls_certificate_check, repo: "hexpm", optional: false]}], "hexpm", "61da65290fbb6cac3459b84b8cd630795bf608df93a2b2cc49251cae78200e5e"}, + "opentelemetry_exporter": {:hex, :opentelemetry_exporter, "1.4.0", "56f1a3164940661fbfc11287367acb8eebbb67dbd849859ec81c341bd91bea14", [:rebar3], [{:grpcbox, ">= 0.0.0", [hex: :grpcbox, repo: "hexpm", optional: false]}, {:opentelemetry, "~> 1.2.0", [hex: :opentelemetry, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.2.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:tls_certificate_check, "~> 1.17.4", [hex: :tls_certificate_check, repo: "hexpm", optional: false]}], "hexpm", "d23ba198d6d22eff32d88b045165aa990ea89b9934ee8b337feb834c2c4d315b"}, "opentelemetry_grpcbox": {:hex, :opentelemetry_grpcbox, "0.1.0", "2106e5c1dbce433537529df809d773bb6cc243e55add8bf6f596f218a63e26db", [:rebar3], [{:grpcbox, "~>0.14.0", [hex: :grpcbox, repo: "hexpm", optional: false]}, {:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "4d54c9376a8ec79ed71a654633e25470c545a1789ab46a589b6562699c677b54"}, "opentelemetry_phoenix": {:hex, :opentelemetry_phoenix, "1.0.0", "73b8fee8bca6ac7a6aa0b17f61eb63494d1c78fffccdbac9656d92d279f9980c", [:mix], [{:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:opentelemetry_telemetry, "~> 1.0", [hex: :opentelemetry_telemetry, repo: "hexpm", optional: false]}, {:plug, ">= 1.11.0", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "9cb30018fda95657f5698130541988b68269de2c9a870051f845f7e2193e72c3"}, "opentelemetry_process_propagator": {:hex, :opentelemetry_process_propagator, "0.1.1", "81ec6825971903486ee73be23230d06764df39ee11011e520f601aa2bb21c893", [:mix, :rebar3], [{:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}], "hexpm", "0572f26066bbb0457e22e169f966c0140a8f95237716c9c6ba4458d6dbaa724b"}, + "opentelemetry_semantic_conventions": {:hex, :opentelemetry_semantic_conventions, "0.2.0", "b67fe459c2938fcab341cb0951c44860c62347c005ace1b50f8402576f241435", [:mix, :rebar3], [], "hexpm", "d61fa1f5639ee8668d74b527e6806e0503efc55a42db7b5f39939d84c07d6895"}, "opentelemetry_telemetry": {:hex, :opentelemetry_telemetry, "1.0.0", "d5982a319e725fcd2305b306b65c18a86afdcf7d96821473cf0649ff88877615", [:mix, :rebar3], [{:opentelemetry_api, "~> 1.0", [hex: :opentelemetry_api, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_registry, "~> 0.3.0", [hex: :telemetry_registry, repo: "hexpm", optional: false]}], "hexpm", "3401d13a1d4b7aa941a77e6b3ec074f0ae77f83b5b2206766ce630123a9291a9"}, "phoenix": {:hex, :phoenix, "1.6.9", "648e660040cdc758c5401972e0f592ce622d4ce9cd16d2d9c33dda32d0c9f7fa", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.0", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 1.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:plug, "~> 1.10", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.2", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "be2fe497597d6bf297dcbf9f4416b4929dbfbdcc25edc1acf6d4dcaecbe898a6"}, "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.0", "0672ed4e4808b3fbed494dded89958e22fb882de47a97634c0b13e7b0b5f7720", [:mix], [{:ecto, "~> 3.3", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "09864e558ed31ee00bd48fcc1d4fc58ae9678c9e81649075431e69dbabb43cc1"}, @@ -46,5 +47,5 @@ "telemetry_metrics": {:hex, :telemetry_metrics, "0.6.1", "315d9163a1d4660aedc3fee73f33f1d355dcc76c5c3ab3d59e76e3edf80eef1f", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"}, "telemetry_poller": {:hex, :telemetry_poller, "1.0.0", "db91bb424e07f2bb6e73926fcafbfcbcb295f0193e0a00e825e589a0a47e8453", [:rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"}, "telemetry_registry": {:hex, :telemetry_registry, "0.3.0", "6768f151ea53fc0fbca70dbff5b20a8d663ee4e0c0b2ae589590e08658e76f1e", [:mix, :rebar3], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "492e2adbc609f3e79ece7f29fec363a97a2c484ac78a83098535d6564781e917"}, - "tls_certificate_check": {:hex, :tls_certificate_check, "1.14.0", "6d1638d56ac68b25c987d401dffb7cd059281339aadc3f8bf27ab33ee19ddbfe", [:rebar3], [{:ssl_verify_fun, "1.1.6", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "b4452ddd3ae89cd84451afa0e218cb3ccd5178fe3c1de7fabcbddb12a137bcf4"}, + "tls_certificate_check": {:hex, :tls_certificate_check, "1.17.4", "75209aa363147d77d7782f446d76f7e15b04505b3ebad4be74b59b5a953955b2", [:rebar3], [{:ssl_verify_fun, "1.1.6", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "faf16168b340d965da7b7dd20b73301d24bff925fb4218bb1d6cc54aa41875ad"}, } From 865391a379bf782f9d1b2052e9e78f46d9af7632 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Wed, 22 Feb 2023 10:39:20 -0700 Subject: [PATCH 2/5] featureflag: bump Elixir and Erlang/OTP versions in docker image This was blocked by a failure in featureflag dependency tls_certificate_check on OTP-25. This was fixed in 1.17.4 and featureflag service has been bumped to use that version. --- src/featureflagservice/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/featureflagservice/Dockerfile b/src/featureflagservice/Dockerfile index 0f428ede04..65c8481ede 100644 --- a/src/featureflagservice/Dockerfile +++ b/src/featureflagservice/Dockerfile @@ -10,11 +10,11 @@ # - https://hub.docker.com/r/hexpm/elixir/tags - for the build image # - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image # - https://pkgs.org/ - resource for finding needed packages -# - Ex: hexpm/elixir:1.13.3-erlang-25.0-debian-bullseye-20210902-slim +# - Ex: hexpm/elixir:1.14.3-erlang-25.2.3-debian-buster-20230202-slim # -ARG ELIXIR_VERSION=1.13.3 -ARG OTP_VERSION=23.0 -ARG DEBIAN_VERSION=bullseye-20210902-slim +ARG ELIXIR_VERSION=1.14.3 +ARG OTP_VERSION=25.2.3 +ARG DEBIAN_VERSION=buster-20230202-slim ARG BUILDER_IMAGE="hexpm/elixir:${ELIXIR_VERSION}-erlang-${OTP_VERSION}-debian-${DEBIAN_VERSION}" ARG RUNNER_IMAGE="debian:${DEBIAN_VERSION}" From 117ff753600a0cb3cad4a92b112d5e3233d26c8b Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 24 Feb 2023 10:38:48 -0700 Subject: [PATCH 3/5] add changelog entry for #756 --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b763b6292e..acd49d651e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ release. * rename proto package from hipstershop to oteldemo ([#740](https://github.com/open-telemetry/opentelemetry-demo/pull/740)) * Removed unnecessary code from Program.cs +* feature flag service: update the dependency tls_certificate_check and bump to + OTP-25 ([#756](https://github.com/open-telemetry/opentelemetry-demo/pull/756)) ## v0.1.0 From 8c9fc39d378f1fce983972d37085bc25157e2ea5 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Fri, 24 Feb 2023 20:41:54 +0100 Subject: [PATCH 4/5] Update CHANGELOG.md --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5eb9b696a4..60b469d52c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ release. ([#740](https://github.com/open-telemetry/opentelemetry-demo/pull/740)) * Removed unnecessary code from Program.cs ([#754](https://github.com/open-telemetry/opentelemetry-demo/pull/754)) -* feature flag service: update the dependency tls_certificate_check and bump to OTP-25 +* feature flag service: update the dependency +tls_certificate_check and bump to OTP-25 ([#756](https://github.com/open-telemetry/opentelemetry-demo/pull/756)) * Bump up OTEL Java Agent version to 1.23.0 ([#757](https://github.com/open-telemetry/opentelemetry-demo/pull/757)) From 5b310d1879f170d9cffeff252693f762740f12f1 Mon Sep 17 00:00:00 2001 From: Juliano Costa Date: Fri, 24 Feb 2023 20:43:44 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md --- CHANGELOG.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60b469d52c..38ab2006f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,12 +14,11 @@ release. * Removed unnecessary code from Program.cs ([#754](https://github.com/open-telemetry/opentelemetry-demo/pull/754)) * feature flag service: update the dependency -tls_certificate_check and bump to OTP-25 +tls_certificate_check and bump to OTP-25 ([#756](https://github.com/open-telemetry/opentelemetry-demo/pull/756)) * Bump up OTEL Java Agent version to 1.23.0 ([#757](https://github.com/open-telemetry/opentelemetry-demo/pull/757)) - ## v0.1.0 * The initial code base is donated from a