Skip to content

Commit 9dee609

Browse files
Merge pull request #2417 from alphagov/update-govuk-app-config
Pin connection_pool to < 3
2 parents 1fb40e9 + d0c0562 commit 9dee609

1 file changed

Lines changed: 27 additions & 26 deletions

File tree

Gemfile.lock

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ GEM
103103
rspec (>= 2.14, < 4)
104104
coderay (1.1.3)
105105
concurrent-ruby (1.3.5)
106-
connection_pool (3.0.2)
106+
connection_pool (2.5.5)
107107
crack (1.0.1)
108108
bigdecimal
109109
rexml
@@ -154,16 +154,16 @@ GEM
154154
warden-oauth2 (~> 0.0.1)
155155
globalid (1.3.0)
156156
activesupport (>= 6.1)
157-
google-protobuf (4.33.1)
157+
google-protobuf (4.33.2)
158158
bigdecimal
159159
rake (>= 13)
160-
google-protobuf (4.33.1-aarch64-linux-gnu)
160+
google-protobuf (4.33.2-aarch64-linux-gnu)
161161
bigdecimal
162162
rake (>= 13)
163-
google-protobuf (4.33.1-arm64-darwin)
163+
google-protobuf (4.33.2-arm64-darwin)
164164
bigdecimal
165165
rake (>= 13)
166-
google-protobuf (4.33.1-x86_64-linux-gnu)
166+
google-protobuf (4.33.2-x86_64-linux-gnu)
167167
bigdecimal
168168
rake (>= 13)
169169
googleapis-common-protos-types (1.22.0)
@@ -178,16 +178,17 @@ GEM
178178
nokogiri (~> 1.12)
179179
rinku (~> 2.0)
180180
sanitize (>= 6, < 8)
181-
govuk_app_config (9.22.1)
181+
govuk_app_config (9.22.3)
182+
connection_pool (< 3)
182183
logstasher (~> 2.1)
183184
opentelemetry-exporter-otlp (>= 0.25, < 0.32)
184-
opentelemetry-instrumentation-all (>= 0.39.1, < 0.88.0)
185+
opentelemetry-instrumentation-all (>= 0.39.1, < 0.90.0)
185186
opentelemetry-sdk (~> 1.2)
186187
plek (>= 4, < 6)
187188
prometheus_exporter (~> 2.3)
188189
puma (>= 5.6, < 8.0)
189190
rack-proxy (~> 0.7)
190-
sentry-rails (~> 5.3)
191+
sentry-rails (>= 5.3, < 7.0)
191192
sentry-ruby (~> 5.3)
192193
statsd-ruby (~> 1.5)
193194
govuk_personalisation (1.1.0)
@@ -329,7 +330,7 @@ GEM
329330
opentelemetry-common (~> 0.21)
330331
opentelemetry-helpers-sql (0.3.0)
331332
opentelemetry-api (~> 1.7)
332-
opentelemetry-helpers-sql-obfuscation (0.5.0)
333+
opentelemetry-helpers-sql-processor (0.3.1)
333334
opentelemetry-common (~> 0.21)
334335
opentelemetry-instrumentation-action_mailer (0.6.1)
335336
opentelemetry-instrumentation-active_support (~> 0.10)
@@ -347,7 +348,7 @@ GEM
347348
opentelemetry-instrumentation-active_support (~> 0.10)
348349
opentelemetry-instrumentation-active_support (0.10.1)
349350
opentelemetry-instrumentation-base (~> 0.25)
350-
opentelemetry-instrumentation-all (0.87.0)
351+
opentelemetry-instrumentation-all (0.89.1)
351352
opentelemetry-instrumentation-active_model_serializers (~> 0.24.0)
352353
opentelemetry-instrumentation-anthropic (~> 0.3.0)
353354
opentelemetry-instrumentation-aws_lambda (~> 0.6.0)
@@ -356,7 +357,7 @@ GEM
356357
opentelemetry-instrumentation-concurrent_ruby (~> 0.24.0)
357358
opentelemetry-instrumentation-dalli (~> 0.29.0)
358359
opentelemetry-instrumentation-delayed_job (~> 0.25.1)
359-
opentelemetry-instrumentation-ethon (~> 0.25.0)
360+
opentelemetry-instrumentation-ethon (~> 0.26.0)
360361
opentelemetry-instrumentation-excon (~> 0.26.0)
361362
opentelemetry-instrumentation-faraday (~> 0.30.0)
362363
opentelemetry-instrumentation-grape (~> 0.5.0)
@@ -369,10 +370,10 @@ GEM
369370
opentelemetry-instrumentation-koala (~> 0.23.0)
370371
opentelemetry-instrumentation-lmdb (~> 0.25.0)
371372
opentelemetry-instrumentation-mongo (~> 0.25.0)
372-
opentelemetry-instrumentation-mysql2 (~> 0.31.0)
373+
opentelemetry-instrumentation-mysql2 (~> 0.32.1)
373374
opentelemetry-instrumentation-net_http (~> 0.26.0)
374-
opentelemetry-instrumentation-pg (~> 0.33.0)
375-
opentelemetry-instrumentation-que (~> 0.11.1)
375+
opentelemetry-instrumentation-pg (~> 0.34.1)
376+
opentelemetry-instrumentation-que (~> 0.12.0)
376377
opentelemetry-instrumentation-racecar (~> 0.6.0)
377378
opentelemetry-instrumentation-rack (~> 0.29.0)
378379
opentelemetry-instrumentation-rails (~> 0.39.1)
@@ -382,9 +383,9 @@ GEM
382383
opentelemetry-instrumentation-resque (~> 0.8.0)
383384
opentelemetry-instrumentation-restclient (~> 0.26.0)
384385
opentelemetry-instrumentation-ruby_kafka (~> 0.24.0)
385-
opentelemetry-instrumentation-sidekiq (~> 0.28.0)
386+
opentelemetry-instrumentation-sidekiq (~> 0.28.1)
386387
opentelemetry-instrumentation-sinatra (~> 0.28.0)
387-
opentelemetry-instrumentation-trilogy (~> 0.64.0)
388+
opentelemetry-instrumentation-trilogy (~> 0.65.1)
388389
opentelemetry-instrumentation-anthropic (0.3.0)
389390
opentelemetry-instrumentation-base (~> 0.25)
390391
opentelemetry-instrumentation-aws_lambda (0.6.0)
@@ -403,7 +404,7 @@ GEM
403404
opentelemetry-instrumentation-base (~> 0.25)
404405
opentelemetry-instrumentation-delayed_job (0.25.1)
405406
opentelemetry-instrumentation-base (~> 0.25)
406-
opentelemetry-instrumentation-ethon (0.25.1)
407+
opentelemetry-instrumentation-ethon (0.26.0)
407408
opentelemetry-instrumentation-base (~> 0.25)
408409
opentelemetry-instrumentation-excon (0.26.1)
409410
opentelemetry-instrumentation-base (~> 0.25)
@@ -429,18 +430,18 @@ GEM
429430
opentelemetry-instrumentation-base (~> 0.25)
430431
opentelemetry-instrumentation-mongo (0.25.0)
431432
opentelemetry-instrumentation-base (~> 0.25)
432-
opentelemetry-instrumentation-mysql2 (0.31.0)
433+
opentelemetry-instrumentation-mysql2 (0.32.1)
433434
opentelemetry-helpers-mysql
434435
opentelemetry-helpers-sql
435-
opentelemetry-helpers-sql-obfuscation
436+
opentelemetry-helpers-sql-processor
436437
opentelemetry-instrumentation-base (~> 0.25)
437438
opentelemetry-instrumentation-net_http (0.26.1)
438439
opentelemetry-instrumentation-base (~> 0.25)
439-
opentelemetry-instrumentation-pg (0.33.0)
440+
opentelemetry-instrumentation-pg (0.34.1)
440441
opentelemetry-helpers-sql
441-
opentelemetry-helpers-sql-obfuscation
442+
opentelemetry-helpers-sql-processor
442443
opentelemetry-instrumentation-base (~> 0.25)
443-
opentelemetry-instrumentation-que (0.11.1)
444+
opentelemetry-instrumentation-que (0.12.0)
444445
opentelemetry-instrumentation-base (~> 0.25)
445446
opentelemetry-instrumentation-racecar (0.6.0)
446447
opentelemetry-instrumentation-base (~> 0.25)
@@ -471,10 +472,10 @@ GEM
471472
opentelemetry-instrumentation-base (~> 0.25)
472473
opentelemetry-instrumentation-sinatra (0.28.0)
473474
opentelemetry-instrumentation-rack (~> 0.29)
474-
opentelemetry-instrumentation-trilogy (0.64.0)
475+
opentelemetry-instrumentation-trilogy (0.65.1)
475476
opentelemetry-helpers-mysql
476477
opentelemetry-helpers-sql
477-
opentelemetry-helpers-sql-obfuscation
478+
opentelemetry-helpers-sql-processor
478479
opentelemetry-instrumentation-base (~> 0.25)
479480
opentelemetry-semantic_conventions (>= 1.8.0)
480481
opentelemetry-registry (0.4.0)
@@ -572,11 +573,11 @@ GEM
572573
rb-fsevent (0.11.2)
573574
rb-inotify (0.10.1)
574575
ffi (~> 1.0)
575-
rdoc (6.16.1)
576+
rdoc (6.17.0)
576577
erb
577578
psych (>= 4.0.0)
578579
tsort
579-
redis-client (0.26.1)
580+
redis-client (0.26.2)
580581
connection_pool
581582
regexp_parser (2.11.2)
582583
reline (0.6.3)

0 commit comments

Comments
 (0)