Merge branch 'main' into jamiemagee/opentelemetry-initialization

ylecuyer · Jan 23, 2024 · 1bdeb0e · 1bdeb0e
2 parents 1029176 + 6d16704
commit 1bdeb0e
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 56 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -19,7 +19,7 @@ PATH
       bundler (>= 1.16, < 3.0.0)
       commonmarker (>= 0.20.1, < 0.24.0)
       docker_registry2 (~> 1.18.0)
-      excon (~> 0.96, < 0.105)
+      excon (~> 0.109)
       faraday (= 2.7.11)
       faraday-retry (= 2.2.0)
       gitlab (= 4.19.0)
@@ -165,7 +165,7 @@ GEM
       rest-client (>= 1.8.0)
     domain_name (0.6.20231109)
     erubi (1.12.0)
-    excon (0.104.0)
+    excon (0.109.0)
     faraday (2.7.11)
       base64
       faraday-net_http (>= 2.0, < 3.1)

diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "bundler", ">= 1.16", "< 3.0.0"
   spec.add_dependency "commonmarker", ">= 0.20.1", "< 0.24.0"
   spec.add_dependency "docker_registry2", "~> 1.18.0"
-  spec.add_dependency "excon", "~> 0.96", "< 0.105"
+  spec.add_dependency "excon", "~> 0.109"
   spec.add_dependency "faraday", "2.7.11"
   spec.add_dependency "faraday-retry", "2.2.0"
   spec.add_dependency "gitlab", "4.19.0"

diff --git a/sorbet/rbi/gems/excon@0.104.0.rbi → sorbet/rbi/gems/excon@0.109.0.rbi b/sorbet/rbi/gems/excon@0.104.0.rbi → sorbet/rbi/gems/excon@0.109.0.rbi
diff --git a/updater/Gemfile b/updater/Gemfile
@@ -25,7 +25,7 @@ gem "dependabot-terraform", path: "../terraform"
 gem "http", "~> 5.1"
 gem "octokit", "6.1.1"
 gem "opentelemetry-exporter-otlp", "~> 0.26"
-gem "opentelemetry-instrumentation-excon", "~> 0.21"
+gem "opentelemetry-instrumentation-excon", "~> 0.22"
 gem "opentelemetry-instrumentation-faraday", "~> 0.23"
 gem "opentelemetry-instrumentation-http", "~> 0.23"
 gem "opentelemetry-instrumentation-net_http", "~> 0.22"

diff --git a/updater/Gemfile.lock b/updater/Gemfile.lock
@@ -19,7 +19,7 @@ PATH
       bundler (>= 1.16, < 3.0.0)
       commonmarker (>= 0.20.1, < 0.24.0)
       docker_registry2 (~> 1.18.0)
-      excon (~> 0.96, < 0.105)
+      excon (~> 0.109)
       faraday (= 2.7.11)
       faraday-retry (= 2.2.0)
       gitlab (= 4.19.0)
@@ -165,7 +165,7 @@ GEM
       rest-client (>= 1.8.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    excon (0.104.0)
+    excon (0.109.0)
     faraday (2.7.11)
       base64
       faraday-net_http (>= 2.0, < 3.1)
@@ -233,7 +233,7 @@ GEM
     opentelemetry-instrumentation-base (0.22.3)
       opentelemetry-api (~> 1.0)
       opentelemetry-registry (~> 0.1)
-    opentelemetry-instrumentation-excon (0.21.2)
+    opentelemetry-instrumentation-excon (0.22.0)
       opentelemetry-api (~> 1.0)
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
@@ -372,7 +372,7 @@ DEPENDENCIES
   http (~> 5.1)
   octokit (= 6.1.1)
   opentelemetry-exporter-otlp (~> 0.26)
-  opentelemetry-instrumentation-excon (~> 0.21)
+  opentelemetry-instrumentation-excon (~> 0.22)
   opentelemetry-instrumentation-faraday (~> 0.23)
   opentelemetry-instrumentation-http (~> 0.23)
   opentelemetry-instrumentation-net_http (~> 0.22)