Skip to content

Commit 8f7ea8b

Browse files
Merge branch 'main' into feat/ad-prometheus-metric
2 parents 2877963 + f8170c7 commit 8f7ea8b

10 files changed

Lines changed: 917 additions & 1745 deletions

File tree

src/email/Gemfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ gem "google-protobuf", "~> 4.34.1"
1515

1616
gem "ostruct"
1717

18-
gem "opentelemetry-sdk", "~> 1.11"
19-
gem "opentelemetry-common", "~> 0.24"
20-
gem "opentelemetry-logs-sdk", "~> 0.5"
21-
gem 'opentelemetry-metrics-sdk', "~> 0.13"
22-
gem "opentelemetry-exporter-otlp", "~> 0.33"
23-
gem 'opentelemetry-exporter-otlp-metrics', "~> 0.8"
24-
gem 'opentelemetry-exporter-otlp-logs', "~> 0.4"
18+
gem "opentelemetry-sdk", "~> 1.12"
19+
gem "opentelemetry-common", "~> 0.25"
20+
gem "opentelemetry-logs-sdk", "~> 0.6"
21+
gem 'opentelemetry-metrics-sdk', "~> 0.14"
22+
gem "opentelemetry-exporter-otlp", "~> 0.34"
23+
gem 'opentelemetry-exporter-otlp-metrics', "~> 0.9"
24+
gem 'opentelemetry-exporter-otlp-logs', "~> 0.5"
2525
gem "opentelemetry-instrumentation-all", "~> 0.93"
2626

2727
gem "openfeature-sdk", "~> 0.6"

src/email/Gemfile.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,18 @@ GEM
5353
grpc (~> 1.50)
5454
openfeature-sdk (~> 0.3)
5555
openfeature-sdk (0.6.5)
56-
opentelemetry-api (1.9.0)
56+
opentelemetry-api (1.10.0)
5757
logger
58-
opentelemetry-common (0.24.0)
58+
opentelemetry-common (0.25.0)
5959
opentelemetry-api (~> 1.0)
60-
opentelemetry-exporter-otlp (0.33.0)
60+
opentelemetry-exporter-otlp (0.34.0)
6161
google-protobuf (>= 3.18)
6262
googleapis-common-protos-types (~> 1.3)
6363
opentelemetry-api (~> 1.1)
6464
opentelemetry-common (~> 0.20)
6565
opentelemetry-sdk (~> 1.10)
6666
opentelemetry-semantic_conventions
67-
opentelemetry-exporter-otlp-logs (0.4.0)
67+
opentelemetry-exporter-otlp-logs (0.5.0)
6868
google-protobuf (>= 3.18)
6969
googleapis-common-protos-types (~> 1.3)
7070
opentelemetry-api (~> 1.1)
@@ -73,7 +73,7 @@ GEM
7373
opentelemetry-logs-sdk (~> 0.1)
7474
opentelemetry-sdk
7575
opentelemetry-semantic_conventions
76-
opentelemetry-exporter-otlp-metrics (0.8.0)
76+
opentelemetry-exporter-otlp-metrics (0.9.0)
7777
google-protobuf (>= 3.18, < 5.0)
7878
googleapis-common-protos-types (~> 1.3)
7979
opentelemetry-api (~> 1.1)
@@ -236,27 +236,27 @@ GEM
236236
opentelemetry-helpers-sql-processor
237237
opentelemetry-instrumentation-base (~> 0.25)
238238
opentelemetry-semantic_conventions (>= 1.8.0)
239-
opentelemetry-logs-api (0.3.0)
239+
opentelemetry-logs-api (0.4.0)
240240
opentelemetry-api (~> 1.0)
241-
opentelemetry-logs-sdk (0.5.1)
241+
opentelemetry-logs-sdk (0.6.0)
242242
opentelemetry-api (~> 1.2)
243243
opentelemetry-logs-api (~> 0.1)
244244
opentelemetry-sdk (~> 1.3)
245-
opentelemetry-metrics-api (0.5.0)
245+
opentelemetry-metrics-api (0.6.0)
246246
opentelemetry-api (~> 1.0)
247-
opentelemetry-metrics-sdk (0.13.1)
247+
opentelemetry-metrics-sdk (0.14.0)
248248
opentelemetry-api (~> 1.1)
249249
opentelemetry-metrics-api (~> 0.2)
250250
opentelemetry-sdk (~> 1.2)
251-
opentelemetry-registry (0.5.0)
251+
opentelemetry-registry (0.6.0)
252252
opentelemetry-api (~> 1.1)
253-
opentelemetry-sdk (1.11.0)
253+
opentelemetry-sdk (1.12.0)
254254
logger
255255
opentelemetry-api (~> 1.1)
256256
opentelemetry-common (~> 0.20)
257257
opentelemetry-registry (~> 0.2)
258258
opentelemetry-semantic_conventions
259-
opentelemetry-semantic_conventions (1.37.0)
259+
opentelemetry-semantic_conventions (1.37.1)
260260
opentelemetry-api (~> 1.0)
261261
ostruct (0.6.3)
262262
pony (1.13.1)
@@ -295,14 +295,14 @@ DEPENDENCIES
295295
net-smtp (~> 0.5.1)
296296
openfeature-flagd-provider (~> 0.1)
297297
openfeature-sdk (~> 0.6)
298-
opentelemetry-common (~> 0.24)
299-
opentelemetry-exporter-otlp (~> 0.33)
300-
opentelemetry-exporter-otlp-logs (~> 0.4)
301-
opentelemetry-exporter-otlp-metrics (~> 0.8)
298+
opentelemetry-common (~> 0.25)
299+
opentelemetry-exporter-otlp (~> 0.34)
300+
opentelemetry-exporter-otlp-logs (~> 0.5)
301+
opentelemetry-exporter-otlp-metrics (~> 0.9)
302302
opentelemetry-instrumentation-all (~> 0.93)
303-
opentelemetry-logs-sdk (~> 0.5)
304-
opentelemetry-metrics-sdk (~> 0.13)
305-
opentelemetry-sdk (~> 1.11)
303+
opentelemetry-logs-sdk (~> 0.6)
304+
opentelemetry-metrics-sdk (~> 0.14)
305+
opentelemetry-sdk (~> 1.12)
306306
ostruct
307307
pony (~> 1.13)
308308
puma (~> 8.0)

src/flagd-ui/mix.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%{
22
"acceptor_pool": {:hex, :acceptor_pool, "1.0.0", "43c20d2acae35f0c2bcd64f9d2bde267e459f0f3fd23dab26485bf518c281b21", [:rebar3], [], "hexpm", "0cbcd83fdc8b9ad2eee2067ef8b91a14858a5883cb7cd800e6fcd5803e158788"},
3-
"bandit": {:hex, :bandit, "1.11.0", "dbdd9c9963f146ee9da9860d1ee5b0ffd65cea51fe2aab3f3273df84329d133a", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "c949d93a325a28da2333dde5a9ab61986ad2c2b7226347db6a28303b9139865e"},
3+
"bandit": {:hex, :bandit, "1.11.1", "1eb33123cc3c17ae0c3447874eb83399ee530f960c39711ed240342fbd4865fa", [:mix], [{:hpax, "~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}, {:plug, "~> 1.18", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:thousand_island, "~> 1.0", [hex: :thousand_island, repo: "hexpm", optional: false]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d4401016df9abbc6dcd325c0b78b2b193e7c7c96bb68f31e576112be025d84a5"},
44
"bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
55
"chatterbox": {:hex, :ts_chatterbox, "0.15.1", "5cac4d15dd7ad61fc3c4415ce4826fc563d4643dee897a558ec4ea0b1c835c9c", [:rebar3], [{:hpack, "~> 0.3.0", [hex: :hpack_erl, repo: "hexpm", optional: false]}], "hexpm", "4f75b91451338bc0da5f52f3480fa6ef6e3a2aeecfc33686d6b3d0a0948f31aa"},
66
"cowboy": {:hex, :cowboy, "2.13.0", "09d770dd5f6a22cc60c071f432cd7cb87776164527f205c5a6b0f24ff6b38990", [:make, :rebar3], [{:cowlib, ">= 2.14.0 and < 3.0.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, ">= 1.8.0 and < 3.0.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "e724d3a70995025d654c1992c7b11dbfea95205c047d86ff9bf1cda92ddc5614"},
@@ -44,7 +44,7 @@
4444
"phoenix_live_view": {:hex, :phoenix_live_view, "1.1.30", "a84af1610755dc208da35d4d45564485edbf18c3f3c77373c4a650dc994cdcdb", [:mix], [{:igniter, ">= 0.6.16 and < 1.0.0-0", [hex: :igniter, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:lazy_html, "~> 0.1.0", [hex: :lazy_html, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0 or ~> 1.8.0-rc", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a353c51ac1e3190910f01a6100c7d5cc02c5e22e7374fd817bd3aedd21149039"},
4545
"phoenix_pubsub": {:hex, :phoenix_pubsub, "2.2.0", "ff3a5616e1bed6804de7773b92cbccfc0b0f473faf1f63d7daf1206c7aeaaa6f", [:mix], [], "hexpm", "adc313a5bf7136039f63cfd9668fde73bba0765e0614cba80c06ac9460ff3e96"},
4646
"phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
47-
"plug": {:hex, :plug, "1.19.1", "09bac17ae7a001a68ae393658aa23c7e38782be5c5c00c80be82901262c394c0", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "560a0017a8f6d5d30146916862aaf9300b7280063651dd7e532b8be168511e62"},
47+
"plug": {:hex, :plug, "1.19.2", "e4950525b22c6789dfb38a3f95d47171ba159da3fc5a33be9643b43d5e8adb98", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "b6fce20a56af5e60fa5dfecf3f907bb98ec981be43c79a3809a499bc3d133de0"},
4848
"plug_crypto": {:hex, :plug_crypto, "2.1.1", "19bda8184399cb24afa10be734f84a16ea0a2bc65054e23a62bb10f06bc89491", [:mix], [], "hexpm", "6470bce6ffe41c8bd497612ffde1a7e4af67f36a15eea5f921af71cf3e11247c"},
4949
"ranch": {:hex, :ranch, "2.2.0", "25528f82bc8d7c6152c57666ca99ec716510fe0925cb188172f41ce93117b1b0", [:make, :rebar3], [], "hexpm", "fa0b99a1780c80218a4197a59ea8d3bdae32fbff7e88527d7d8a4787eff4f8e7"},
5050
"req": {:hex, :req, "0.5.17", "0096ddd5b0ed6f576a03dde4b158a0c727215b15d2795e59e0916c6971066ede", [:mix], [{:brotli, "~> 0.3.1", [hex: :brotli, repo: "hexpm", optional: true]}, {:ezstd, "~> 1.0", [hex: :ezstd, repo: "hexpm", optional: true]}, {:finch, "~> 0.17", [hex: :finch, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}, {:mime, "~> 2.0.6 or ~> 2.1", [hex: :mime, repo: "hexpm", optional: false]}, {:nimble_csv, "~> 1.0", [hex: :nimble_csv, repo: "hexpm", optional: true]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0b8bc6ffdfebbc07968e59d3ff96d52f2202d0536f10fef4dc11dc02a2a43e39"},

0 commit comments

Comments
 (0)