-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump sentry-ruby from 5.16.1 to 5.18.2 #653
Closed
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gem compare concurrent-ruby 1.2.3 1.3.3 Compared versions: ["1.2.3", "1.3.3"]
DIFFERENT date:
1.2.3: 2024-01-16 00:00:00 UTC
1.3.3: 2024-06-09 00:00:00 UTC
DIFFERENT version:
1.2.3: 1.2.3
1.3.3: 1.3.3
DIFFERENT files:
1.2.3->1.3.3:
* Changed:
CHANGELOG.md +23/-0
Rakefile +26/-6
lib/concurrent-ruby/concurrent/executor/java_executor_service.rb +2/-6
lib/concurrent-ruby/concurrent/utility/processor_counter.rb +84/-4
lib/concurrent-ruby/concurrent/version.rb +1/-1
DIFFERENT extra_rdoc_files:
1.2.3->1.3.3:
* Changed:
CHANGELOG.md +23/-0 |
gem compare --diff concurrent-ruby 1.2.3 1.3.3 Compared versions: ["1.2.3", "1.3.3"]
DIFFERENT files:
1.2.3->1.3.3:
* Changed:
CHANGELOG.md
--- /tmp/d20240724-1941-6e8go/concurrent-ruby-1.2.3/CHANGELOG.md 2024-07-24 02:08:26.374338033 +0000
+++ /tmp/d20240724-1941-6e8go/concurrent-ruby-1.3.3/CHANGELOG.md 2024-07-24 02:08:26.398337892 +0000
@@ -2,0 +3,23 @@
+## Release v1.3.3 (9 June 2024)
+
+* (#1053) Improve the speed of `Concurrent.physical_processor_count` on Windows.
+
+## Release v1.3.2, edge v0.7.1 (7 June 2024)
+
+concurrent-ruby:
+
+* (#1051) Remove dependency on `win32ole`.
+
+concurrent-ruby-edge:
+
+* (#1052) Fix dependency on `concurrent-ruby` to allow the latest release.
+
+## Release v1.3.1 (29 May 2024)
+
+* Release 1.3.0 was broken when pushed to RubyGems. 1.3.1 is a packaging fix.
+
+## Release v1.3.0 (28 May 2024)
+
+* (#1042) Align Java Executor Service behavior for `shuttingdown?`, `shutdown?`
+* (#1038) Add `Concurrent.available_processor_count` that is cgroups aware.
+
Rakefile
--- /tmp/d20240724-1941-6e8go/concurrent-ruby-1.2.3/Rakefile 2024-07-24 02:08:26.374338033 +0000
+++ /tmp/d20240724-1941-6e8go/concurrent-ruby-1.3.3/Rakefile 2024-07-24 02:08:26.398337892 +0000
@@ -30,0 +31,4 @@
+def which?(executable)
+ !`which #{executable} 2>/dev/null`.empty?
+end
+
@@ -44,0 +49,8 @@
+ rack_compiler_dock_kwargs = {}
+ if which?('podman') and (!which?('docker') || `docker --version`.include?('podman'))
+ # podman and only podman available, so RakeCompilerDock will use podman, otherwise it uses docker
+ rack_compiler_dock_kwargs = {
+ options: ['--privileged'], # otherwise the directory in the image is empty
+ runas: false
+ }
+ end
@@ -49,2 +61 @@
- options: ['--privileged'], # otherwise the directory in the image is empty
- runas: false)
+ **rack_compiler_dock_kwargs)
@@ -258,0 +270 @@
+ sh 'bundle install'
@@ -261 +273 @@
- env = { "PATH" => "#{ENV['CONCURRENT_JRUBY_HOME']}/bin:#{ENV['PATH']}" }
+ env = { "PATH" => "#{ENV.fetch('CONCURRENT_JRUBY_HOME')}/bin:#{ENV['PATH']}" }
@@ -262,0 +275 @@
+ sh env, 'bundle install'
@@ -274,2 +287,2 @@
- publish_base = true
- publish_edge = false
+ publish_base = nil
+ publish_edge = nil
@@ -282,0 +296,7 @@
+
+ begin
+ STDOUT.puts 'Do you want to publish `concurrent-ruby`? (y/n)'
+ input = STDIN.gets.strip.downcase
+ end until %w(y n).include?(input)
+ publish_base = input == 'y'
+
@@ -284 +304 @@
- STDOUT.puts 'It will publish `concurrent-ruby`. Do you want to publish `concurrent-ruby-edge`? (y/n)'
+ STDOUT.puts 'Do you want to publish `concurrent-ruby-edge`? (y/n)'
lib/concurrent-ruby/concurrent/concurrent_ruby.jar
Binary files /tmp/d20240724-1941-6e8go/concurrent-ruby-1.2.3/lib/concurrent-ruby/concurrent/concurrent_ruby.jar and /tmp/d20240724-1941-6e8go/concurrent-ruby-1.3.3/lib/concurrent-ruby/concurrent/concurrent_ruby.jar differ
lib/concurrent-ruby/concurrent/executor/java_executor_service.rb
--- /tmp/d20240724-1941-6e8go/concurrent-ruby-1.2.3/lib/concurrent-ruby/concurrent/executor/java_executor_service.rb 2024-07-24 02:08:26.390337939 +0000
+++ /tmp/d20240724-1941-6e8go/concurrent-ruby-1.3.3/lib/concurrent-ruby/concurrent/executor/java_executor_service.rb 2024-07-24 02:08:26.410337822 +0000
@@ -60,5 +60 @@
- if @executor.respond_to? :isTerminating
- @executor.isTerminating
- else
- false
- end
+ @executor.isShutdown && !@executor.isTerminated
@@ -68 +64 @@
- @executor.isShutdown || @executor.isTerminated
+ @executor.isTerminated
lib/concurrent-ruby/concurrent/utility/processor_counter.rb
--- /tmp/d20240724-1941-6e8go/concurrent-ruby-1.2.3/lib/concurrent-ruby/concurrent/utility/processor_counter.rb 2024-07-24 02:08:26.398337892 +0000
+++ /tmp/d20240724-1941-6e8go/concurrent-ruby-1.3.3/lib/concurrent-ruby/concurrent/utility/processor_counter.rb 2024-07-24 02:08:26.422337752 +0000
@@ -13,0 +14 @@
+ @cpu_quota = Delay.new { compute_cpu_quota }
@@ -23,0 +25,19 @@
+ def available_processor_count
+ cpu_count = processor_count.to_f
+ quota = cpu_quota
+
+ return cpu_count if quota.nil?
+
+ # cgroup cpus quotas have no limits, so they can be set to higher than the
+ # real count of cores.
+ if quota > cpu_count
+ cpu_count
+ else
+ quota
+ end
+ end
+
+ def cpu_quota
+ @cpu_quota.value
+ end
+
@@ -51,4 +71,14 @@
- require 'win32ole'
- result_set = WIN32OLE.connect("winmgmts://").ExecQuery(
- "select NumberOfCores from Win32_Processor")
- result_set.to_enum.collect(&:NumberOfCores).reduce(:+)
+ # Get-CimInstance introduced in PowerShell 3 or earlier: https://learn.microsoft.com/en-us/previous-versions/powershell/module/cimcmdlets/get-ciminstance?view=powershell-3.0
+ result = run('powershell -command "Get-CimInstance -ClassName Win32_Processor -Property NumberOfCores | Select-Object -Property NumberOfCores"')
+ if !result || $?.exitstatus != 0
+ # fallback to deprecated wmic for older systems
+ result = run("wmic cpu get NumberOfCores")
+ end
+ if !result || $?.exitstatus != 0
+ # Bail out if both commands returned something unexpected
+ processor_count
+ else
+ # powershell: "\nNumberOfCores\n-------------\n 4\n\n\n"
+ # wmic: "NumberOfCores \n\n4 \n\n\n\n"
+ result.scan(/\d+/).map(&:to_i).reduce(:+)
+ end
@@ -62,0 +93,23 @@
+
+ def run(command)
+ IO.popen(command, &:read)
+ rescue Errno::ENOENT
+ end
+
+ def compute_cpu_quota
+ if RbConfig::CONFIG["target_os"].include?("linux")
+ if File.exist?("/sys/fs/cgroup/cpu.max")
+ # cgroups v2: https://docs.kernel.org/admin-guide/cgroup-v2.html#cpu-interface-files
+ cpu_max = File.read("/sys/fs/cgroup/cpu.max")
+ return nil if cpu_max.start_with?("max ") # no limit
+ max, period = cpu_max.split.map(&:to_f)
+ max / period
+ elsif File.exist?("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us")
+ # cgroups v1: https://kernel.googlesource.com/pub/scm/linux/kernel/git/glommer/memcg/+/cpu_stat/Documentation/cgroups/cpu.txt
+ max = File.read("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_quota_us").to_i
+ return nil if max == 0
+ period = File.read("/sys/fs/cgroup/cpu,cpuacct/cpu.cfs_period_us").to_f
+ max / period
+ end
+ end
+ end
@@ -108,0 +162,27 @@
+ end
+
+ # Number of processors cores available for process scheduling.
+ # Returns `nil` if there is no #cpu_quota, or a `Float` if the
+ # process is inside a cgroup with a dedicated CPU quota (typically Docker).
+ #
+ # For performance reasons the calculated value will be memoized on the first
+ # call.
+ #
+ # @return [nil, Float] number of available processors
+ def self.available_processor_count
+ processor_counter.available_processor_count
+ end
+
+ # The maximum number of processors cores available for process scheduling.
+ # Returns `nil` if there is no enforced limit, or a `Float` if the
+ # process is inside a cgroup with a dedicated CPU quota (typically Docker).
+ #
+ # Note that nothing prevents setting a CPU quota higher than the actual number of
+ # cores on the system.
+ #
+ # For performance reasons the calculated value will be memoized on the first
+ # call.
+ #
+ # @return [nil, Float] Maximum number of available processors as set by a cgroup CPU quota, or nil if none set
+ def self.cpu_quota
+ processor_counter.cpu_quota
lib/concurrent-ruby/concurrent/version.rb
--- /tmp/d20240724-1941-6e8go/concurrent-ruby-1.2.3/lib/concurrent-ruby/concurrent/version.rb 2024-07-24 02:08:26.398337892 +0000
+++ /tmp/d20240724-1941-6e8go/concurrent-ruby-1.3.3/lib/concurrent-ruby/concurrent/version.rb 2024-07-24 02:08:26.422337752 +0000
@@ -2 +2 @@
- VERSION = '1.2.3'
+ VERSION = '1.3.3' |
gem compare sentry-ruby 5.16.1 5.18.2 Compared versions: ["5.16.1", "5.18.2"]
DIFFERENT date:
5.16.1: 2024-01-09 00:00:00 UTC
5.18.2: 2024-07-23 00:00:00 UTC
DIFFERENT homepage:
5.16.1: https://github.com/getsentry/sentry-ruby
5.18.2: https://github.com/getsentry/sentry-ruby/tree/5.18.2/sentry-ruby
DIFFERENT metadata:
5.16.1: {"homepage_uri"=>"https://github.com/getsentry/sentry-ruby", "source_code_uri"=>"https://github.com/getsentry/sentry-ruby", "changelog_uri"=>"https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md"}
5.18.2: {"homepage_uri"=>"https://github.com/getsentry/sentry-ruby/tree/5.18.2/sentry-ruby", "source_code_uri"=>"https://github.com/getsentry/sentry-ruby/tree/5.18.2/sentry-ruby", "changelog_uri"=>"https://github.com/getsentry/sentry-ruby/blob/5.18.2/CHANGELOG.md", "bug_tracker_uri"=>"https://github.com/getsentry/sentry-ruby/issues", "documentation_uri"=>"http://www.rubydoc.info/gems/sentry-ruby/5.18.2"}
DIFFERENT rubygems_version:
5.16.1: 3.1.6
5.18.2: 3.5.11
DIFFERENT version:
5.16.1: 5.16.1
5.18.2: 5.18.2
DIFFERENT files:
5.16.1->5.18.2:
* Added:
lib/sentry/graphql.rb +9/-0
lib/sentry/interfaces/mechanism.rb +20/-0
lib/sentry/metrics.rb +56/-0
lib/sentry/metrics/aggregator.rb +248/-0
lib/sentry/metrics/configuration.rb +47/-0
lib/sentry/metrics/counter_metric.rb +25/-0
lib/sentry/metrics/distribution_metric.rb +25/-0
lib/sentry/metrics/gauge_metric.rb +35/-0
lib/sentry/metrics/local_aggregator.rb +53/-0
lib/sentry/metrics/metric.rb +19/-0
lib/sentry/metrics/set_metric.rb +28/-0
lib/sentry/metrics/timing.rb +43/-0
lib/sentry/threaded_periodic_worker.rb +39/-0
* Changed:
Gemfile +2/-0
README.md +20/-10
Rakefile +1/-1
bin/console +1/-0
lib/sentry-ruby.rb +26/-3
lib/sentry/background_worker.rb +1/-1
lib/sentry/backpressure_monitor.rb +2/-32
lib/sentry/backtrace.rb +7/-3
lib/sentry/check_in_event.rb +1/-1
lib/sentry/client.rb +59/-9
lib/sentry/configuration.rb +28/-12
lib/sentry/cron/monitor_schedule.rb +1/-1
lib/sentry/dsn.rb +1/-1
lib/sentry/envelope.rb +18/-1
lib/sentry/error_event.rb +2/-2
lib/sentry/event.rb +9/-11
lib/sentry/hub.rb +15/-2
lib/sentry/integrable.rb +4/-0
lib/sentry/interface.rb +1/-0
lib/sentry/interfaces/exception.rb +5/-3
lib/sentry/interfaces/request.rb +2/-2
lib/sentry/interfaces/single_exception.rb +6/-4
lib/sentry/interfaces/stacktrace_builder.rb +8/-0
lib/sentry/net/http.rb +2/-1
lib/sentry/propagation_context.rb +9/-8
lib/sentry/puma.rb +1/-1
lib/sentry/rack/capture_exceptions.rb +14/-2
lib/sentry/rake.rb +3/-1
lib/sentry/redis.rb +2/-1
lib/sentry/scope.rb +21/-26
lib/sentry/session.rb +2/-2
lib/sentry/session_flusher.rb +6/-38
lib/sentry/span.rb +39/-5
lib/sentry/test_helper.rb +2/-1
lib/sentry/transaction.rb +16/-14
lib/sentry/transaction_event.rb +5/-0
lib/sentry/transport.rb +8/-22
lib/sentry/transport/configuration.rb +0/-1
lib/sentry/utils/argument_checking_helper.rb +6/-0
lib/sentry/utils/logging_helper.rb +0/-4
lib/sentry/utils/real_ip.rb +1/-1
lib/sentry/utils/request_id.rb +1/-1
lib/sentry/version.rb +1/-1
sentry-ruby.gemspec +11/-4
DIFFERENT extra_rdoc_files:
5.16.1->5.18.2:
* Changed:
README.md +20/-10
DIFFERENT runtime dependencies:
5.16.1->5.18.2:
* Added:
bigdecimal [">= 0"] (runtime) |
|
dependabot
bot
force-pushed
the
dependabot/bundler/sentry-ruby-5.18.2
branch
3 times, most recently
from
August 10, 2024 17:30
e9877a1
to
50e3bc6
Compare
Bumps [sentry-ruby](https://github.com/getsentry/sentry-ruby) from 5.16.1 to 5.18.2. - [Release notes](https://github.com/getsentry/sentry-ruby/releases) - [Changelog](https://github.com/getsentry/sentry-ruby/blob/master/CHANGELOG.md) - [Commits](getsentry/sentry-ruby@5.16.1...5.18.2) --- updated-dependencies: - dependency-name: sentry-ruby dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
dependabot
bot
force-pushed
the
dependabot/bundler/sentry-ruby-5.18.2
branch
from
August 10, 2024 17:32
50e3bc6
to
197e352
Compare
Superseded by #663. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps sentry-ruby from 5.16.1 to 5.18.2.
Changelog
Sourced from sentry-ruby's changelog.
... (truncated)
Commits
cdf8a4a
release: 5.18.2c785d04
Add client reports for span drop counts (#2346)c16a0f2
Don't overwrite ip_address if already set on user (#2350)18029e3
teardown_sentry_test
helper should clear global even processors too (#2342)89f371f
Suppress the unnecessary “unsupported options notice” (#2349)36866c5
Make links more specific in gemspecs (#2311)a1b61bb
Show contributors on README.md (#2326)142ec2f
Use Concurrent.usable_processor_count when it is available (#2339)9a2b5ba
release: 5.18.1369a920
release: 5.18.0Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditions
will show all of the ignore conditions of the specified dependency@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)