sentry-inst_jobs 1.0.2 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4cbe84c189cde8c59647109fe2cfcc9e1084337b21494c89919b8c66cbc713a
-  data.tar.gz: e29e0bec56eaad4e34545c2e59112c72a9eb96661500ebf3446467e820d210ed
+  metadata.gz: 35c449936eb2e0b5e283fe255192c191c2e0b94bf74744da4b69c0ca7e89e788
+  data.tar.gz: e2d6e29e03fb8d16492742968ea996f2380c148cce554cb1733aa699cd041181
 SHA512:
-  metadata.gz: '088d25334595bf80c693a96d2913d31192eaf13a4e4991942dc39f79eaed181bd6343b3e7ca813249e9a2aa10de75ddc41eb3edd9f270e44f9724ebc552fe9ba'
-  data.tar.gz: e529411aef5b11f5a85ed6d725cda4570bf402a91599e0a6c26bc9abf85110b8b3605c81edfdef661735a0e52e7b202fe688f6635e12ad97bea8b54b38742e7c
+  metadata.gz: 73b8f0841ec6e42bad11185dfcc094499f7a8685a6723a31ba9ba2ac8345015467de6a09dd69479ad203be4bc7298c2b37da5855e109e32d4619e2646a2ea774
+  data.tar.gz: e4dc5622c87f7825968f51235f97e91ce78f9bc0ee1e7a12c88e76abcca10ec3dd978ff7d715f97c25c5d9a8ab9dead02c687ed7197423244a4c1cfe7c841adf

data/Dockerfile.ci

@@ -16,4 +16,4 @@ COPY --chown=docker:docker . /usr/src/app
 
 ENV TEST_DB_USERNAME postgres
 
-CMD bash -lc "until pg_isready --host=$TEST_DB_HOST; do sleep 1; done && bundle exec rake"
+CMD ["bash", "-lc", "./test.sh"]

data/Gemfile

@@ -6,12 +6,6 @@ gemspec
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
 
-gem "inst-jobs"
-gem "rails"
 gem "pg"
 
-gem "sentry-ruby"
-gem "sentry-rails"
-
-gem "pry"
-gem "debug", github: "ruby/debug", platform: :ruby if RUBY_VERSION.to_f >= 2.6
+gem "sentry-rails", "~> 5.10"

data/Gemfile.lock

@@ -1,40 +1,13 @@
-GIT
-  remote: https://github.com/ruby/debug.git
-  revision: a21742df633cb4c4c19ab7819c88b5fe6d8ed293
-  specs:
-    debug (1.4.0)
-      irb (>= 1.3.6)
-      reline (>= 0.2.7)
-
 PATH
   remote: .
   specs:
-    sentry-inst_jobs (1.0.2)
+    sentry-inst_jobs (5.10.0)
       inst-jobs (~> 3.0)
-      sentry-ruby-core (~> 5.1.0)
+      sentry-ruby (~> 5.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      mail (>= 2.7.1)
-    actionmailer (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
     actionpack (6.1.4.6)
       actionview (= 6.1.4.6)
       activesupport (= 6.1.4.6)
@@ -42,21 +15,12 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      nokogiri (>= 1.8.5)
     actionview (6.1.4.6)
       activesupport (= 6.1.4.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.6)
-      activesupport (= 6.1.4.6)
-      globalid (>= 0.3.6)
     activemodel (6.1.4.6)
       activesupport (= 6.1.4.6)
     activerecord (6.1.4.6)
@@ -65,13 +29,6 @@ GEM
     activerecord-pg-extensions (0.4.3)
       activerecord (>= 6.0, < 6.2)
       railties (>= 6.0, < 6.2)
-    activestorage (6.1.4.6)
-      actionpack (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      marcel (~> 1.0.0)
-      mini_mime (>= 1.1.0)
     activesupport (6.1.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
@@ -81,8 +38,7 @@ GEM
     after_transaction_commit (2.2.2)
       activerecord (>= 5.2)
     builder (3.2.4)
-    coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
     debug_inspector (1.1.0)
     diff-lcs (1.5.0)
@@ -92,8 +48,6 @@ GEM
     fugit (1.5.2)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
     i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     inst-jobs (3.0.8)
@@ -104,45 +58,25 @@ GEM
       debug_inspector (~> 1.0)
       fugit (~> 1.3)
       railties (>= 6.0)
-    io-console (0.5.11)
-    irb (1.4.1)
-      reline (>= 0.3.0)
     loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.1.2)
     minitest (5.15.0)
-    nio4r (2.5.8)
+    nokogiri (1.13.1-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.13.1-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
+    nokogiri (1.13.1-x86_64-linux)
+      racc (~> 1.4)
     pg (1.3.2)
-    pry (0.14.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
     raabro (1.4.0)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.6)
-      actioncable (= 6.1.4.6)
-      actionmailbox (= 6.1.4.6)
-      actionmailer (= 6.1.4.6)
-      actionpack (= 6.1.4.6)
-      actiontext (= 6.1.4.6)
-      actionview (= 6.1.4.6)
-      activejob (= 6.1.4.6)
-      activemodel (= 6.1.4.6)
-      activerecord (= 6.1.4.6)
-      activestorage (= 6.1.4.6)
-      activesupport (= 6.1.4.6)
-      bundler (>= 1.15.0)
-      railties (= 6.1.4.6)
-      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
@@ -155,8 +89,6 @@ GEM
       rake (>= 0.13)
       thor (~> 1.0)
     rake (12.3.3)
-    reline (0.3.1)
-      io-console (~> 0.5)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -170,44 +102,28 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    sentry-rails (5.1.0)
+    sentry-rails (5.10.0)
       railties (>= 5.0)
-      sentry-ruby-core (~> 5.1.0)
-    sentry-ruby (5.1.0)
+      sentry-ruby (~> 5.10.0)
+    sentry-ruby (5.10.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      sentry-ruby-core (= 5.1.0)
-    sentry-ruby-core (5.1.0)
-      concurrent-ruby
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
     zeitwerk (2.5.4)
 
 PLATFORMS
-  x86_64-darwin-20
-  x86_64-darwin-21
+  aarch64-linux
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
-  debug!
-  inst-jobs
   pg
-  pry
-  rails
   rake (~> 12.0)
   rspec (~> 3.0)
   sentry-inst_jobs!
-  sentry-rails
-  sentry-ruby
+  sentry-rails (~> 5.10)
 
 BUNDLED WITH
    2.2.33

data/README.md

@@ -15,7 +15,6 @@ make `sentry-delayed_job` compatible with `inst-jobs`. This integration is not a
 ### Install
 
 ```ruby
-gem "sentry-ruby"
 gem "sentry-inst_jobs"
 ```
 

data/Rakefile

@@ -1,6 +1,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+#load 'rails/tasks/engine.rake'
+
 RSpec::Core::RakeTask.new(:spec).tap do |task|
   task.rspec_opts = "--order rand"
 end

data/docker-compose.yml

@@ -6,6 +6,7 @@ services:
       context: .
       dockerfile: Dockerfile.ci
     environment:
+      RAILS_ENV: test
       TEST_DB_HOST: postgres
     depends_on:
       - postgres

data/lib/sentry/inst_jobs/plugin.rb

@@ -6,6 +6,7 @@ module Sentry
     class Plugin < ::Delayed::Plugin
       # need to symbolize strings as keyword arguments in Ruby 2.4~2.6
       INST_JOBS_CONTEXT_KEY = :"Inst-Jobs"
+      OP_NAME = "inst_jobs"
 
       callbacks do |lifecycle|
         lifecycle.around(:invoke_job) do |job, *args, &block|
@@ -13,11 +14,11 @@ module Sentry
 
           Sentry.with_scope do |scope|
             contexts = generate_contexts(job)
-            scope.set_transaction_name(contexts.dig(INST_JOBS_CONTEXT_KEY, :job_class))
+            scope.set_transaction_name(contexts.dig(INST_JOBS_CONTEXT_KEY, :job_class), source: :task)
             scope.set_contexts(**contexts)
             scope.set_tags("inst_jobs.queue" => job.queue, "inst_jobs.id" => job.id.to_s)
 
-            transaction = Sentry.start_transaction(name: scope.transaction_name, op: "inst_jobs")
+            transaction = Sentry.start_transaction(name: scope.transaction_name, source: scope.transaction_source, op: OP_NAME)
             scope.set_span(transaction) if transaction
 
             begin
@@ -48,6 +49,9 @@ module Sentry
           last_error: job.last_error&.byteslice(0..1000),
           handler: job.handler&.byteslice(0..1000),
           job_class: compute_job_class(job.payload_object),
+          tag: job.tag,
+          strand: job.strand,
+          singleton: job.singleton,
         }
 
         context
@@ -76,7 +80,7 @@ module Sentry
 
       def self.finish_transaction(transaction, status)
         return unless transaction
-  
+
         transaction.set_http_status(status)
         transaction.finish
       end

data/lib/sentry/inst_jobs/version.rb

@@ -1,5 +1,5 @@
 module Sentry
   module InstJobs
-    VERSION = "1.0.2"
+    VERSION = "5.10.0"
   end
 end

data/sentry-inst_jobs.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sentry-ruby-core", "~> 5.1.0"
+  spec.add_dependency "sentry-ruby", "~> 5.10"
   spec.add_dependency "inst-jobs", "~> 3.0"
 end

data/test.sh

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Wait for database to be ready
+until pg_isready --host="$TEST_DB_HOST"; do sleep 1; done
+
+# Migrate the database
+bundle exec rake db:migrate
+
+# Run tests
+bundle exec rake

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sentry-inst_jobs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 5.10.0
 platform: ruby
 authors:
 - Isaac Moore
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sentry-ruby-core
+  name: sentry-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: inst-jobs
   requirement: !ruby/object:Gem::Requirement
@@ -69,6 +69,7 @@ files:
 - lib/sentry/inst_jobs/plugin.rb
 - lib/sentry/inst_jobs/version.rb
 - sentry-inst_jobs.gemspec
+- test.sh
 homepage: https://github.com/instructure/sentry-inst_jobs
 licenses:
 - MIT
@@ -91,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: An inst-jobs integration for the Sentry error logger