appsignal 2.9.13-java → 2.9.14-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +19 -16
  3. data/CHANGELOG.md +4 -0
  4. data/build_matrix.yml +8 -4
  5. data/ext/Rakefile +2 -3
  6. data/ext/agent.yml +40 -37
  7. data/ext/base.rb +33 -10
  8. data/ext/extconf.rb +2 -3
  9. data/gemfiles/que_beta.gemfile +10 -0
  10. data/lib/appsignal/helpers/instrumentation.rb +0 -1
  11. data/lib/appsignal/helpers/metrics.rb +0 -1
  12. data/lib/appsignal/integrations/que.rb +9 -8
  13. data/lib/appsignal/version.rb +1 -1
  14. metadata +3 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a9c898665ca1095ddea5adc72f9afbf15b07c6b9c520d57b712a54e7250b9eb9
4
- data.tar.gz: 0bdbe76b92161152d125419e909f0458174481cb2e9c6edff9da7605e0b1fae6
3
+ metadata.gz: b3ed7d56efdb2146e5dd0b8e6aba68dcf557ad1ad27ddd1648a5ebeee292d0b9
4
+ data.tar.gz: c735b260db329a7f90571ded2da4c746b5c6726436854a07558955f9cd9adac9
5
5
  SHA512:
6
- metadata.gz: 92f7e9719ec2fcf4f38b20402375ca6ca4bdc792055d74feb78b4c007b9307eb7308a9559e36525f8010c4f831109108c7ee32d4d51f5b042da2ce2579f66140
7
- data.tar.gz: b4cb1c66105c24a6abb51e50b4d5c03ecdcba30fbdc49f1d11d1c3a5353806e82f7fc4a5e778c09731ec214f1361d086fe96056ec68bfe7d529a79b219097cc6
6
+ metadata.gz: b74bce10bf61e7fa3b4e3543cd47687ec31f8ff6d88c92751e2f6df99709390eedfd09950e67b09b2597de8ceba0537dab08b907251c864d23d2892e9d936455
7
+ data.tar.gz: 0b222c1f400beff619374f65d2ae17389ecf8d71d5bd3a8f976a4ecc12baed1063d3ba8748eb7ac87ba10975157de93ee1100247c503aafc05eb9238cd20d0a2
data/.travis.yml CHANGED
@@ -30,7 +30,7 @@ after_failure:
30
30
  matrix:
31
31
  fast_finish: true
32
32
  include:
33
- - rvm: 2.6.0
33
+ - rvm: 2.6.4
34
34
  gemfile: gemfiles/no_dependencies.gemfile
35
35
  before_script: ''
36
36
  script:
@@ -93,49 +93,52 @@ matrix:
93
93
  - rvm: 2.5.3
94
94
  gemfile: gemfiles/rails-5.2.gemfile
95
95
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
96
- - rvm: 2.6.0
96
+ - rvm: 2.6.4
97
97
  gemfile: gemfiles/no_dependencies.gemfile
98
98
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
99
- - rvm: 2.6.0
99
+ - rvm: 2.6.4
100
100
  gemfile: gemfiles/capistrano2.gemfile
101
101
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
102
- - rvm: 2.6.0
102
+ - rvm: 2.6.4
103
103
  gemfile: gemfiles/capistrano3.gemfile
104
104
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
105
- - rvm: 2.6.0
105
+ - rvm: 2.6.4
106
106
  gemfile: gemfiles/grape.gemfile
107
107
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
108
- - rvm: 2.6.0
108
+ - rvm: 2.6.4
109
109
  gemfile: gemfiles/padrino.gemfile
110
110
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
111
- - rvm: 2.6.0
111
+ - rvm: 2.6.4
112
112
  gemfile: gemfiles/que.gemfile
113
113
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
114
- - rvm: 2.6.0
114
+ - rvm: 2.6.4
115
+ gemfile: gemfiles/que_beta.gemfile
116
+ env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
117
+ - rvm: 2.6.4
115
118
  gemfile: gemfiles/rails-5.0.gemfile
116
119
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
117
- - rvm: 2.6.0
120
+ - rvm: 2.6.4
118
121
  gemfile: gemfiles/rails-5.1.gemfile
119
122
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
120
- - rvm: 2.6.0
123
+ - rvm: 2.6.4
121
124
  gemfile: gemfiles/rails-5.2.gemfile
122
125
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
123
- - rvm: 2.6.0
126
+ - rvm: 2.6.4
124
127
  gemfile: gemfiles/rails-6.0.gemfile
125
128
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
126
- - rvm: 2.6.0
129
+ - rvm: 2.6.4
127
130
  gemfile: gemfiles/resque.gemfile
128
131
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
129
- - rvm: 2.6.0
132
+ - rvm: 2.6.4
130
133
  gemfile: gemfiles/sequel.gemfile
131
134
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
132
- - rvm: 2.6.0
135
+ - rvm: 2.6.4
133
136
  gemfile: gemfiles/sequel-435.gemfile
134
137
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
135
- - rvm: 2.6.0
138
+ - rvm: 2.6.4
136
139
  gemfile: gemfiles/sinatra.gemfile
137
140
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
138
- - rvm: 2.6.0
141
+ - rvm: 2.6.4
139
142
  gemfile: gemfiles/webmachine.gemfile
140
143
  env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
141
144
  - rvm: jruby-19mode
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## 2.9.14
4
+ - Support mirrors when downloading the agent & extension. PR #558
5
+ - Support Que's upcoming 1.0.0 release. PR #557
6
+
3
7
  ## 2.9.13
4
8
  - Bump agent to v-e1c9363
5
9
  - Detect revision from Heroku dynos automatically when Dyno Metadata is
data/build_matrix.yml CHANGED
@@ -31,7 +31,7 @@ travis: # Default `.travis.yml` contents
31
31
  matrix:
32
32
  fast_finish: true
33
33
  include: # Builds based on the matrix below are added to this list
34
- - rvm: "2.6.0"
34
+ - rvm: "2.6.4"
35
35
  gemfile: "gemfiles/no_dependencies.gemfile"
36
36
  before_script: "" # Unset default: No need to install the extension
37
37
  script:
@@ -65,7 +65,7 @@ matrix:
65
65
  gems: "none"
66
66
  - ruby: "2.5.3"
67
67
  gems: "minimal"
68
- - ruby: "2.6.0"
68
+ - ruby: "2.6.4"
69
69
  - ruby: "jruby-19mode"
70
70
  gems: "minimal"
71
71
  gems:
@@ -76,16 +76,20 @@ matrix:
76
76
  - gem: "padrino"
77
77
  bundler: "1.17.3"
78
78
  - gem: "que"
79
+ - gem: "que_beta"
80
+ exclude:
81
+ ruby:
82
+ - "2.0.0"
79
83
  - gem: "rails-3.2"
80
84
  bundler: "1.17.3"
81
85
  exclude:
82
86
  ruby:
83
- - "2.6.0"
87
+ - "2.6.4"
84
88
  - gem: "rails-4.2"
85
89
  bundler: "1.17.3"
86
90
  exclude:
87
91
  ruby:
88
- - "2.6.0"
92
+ - "2.6.4"
89
93
  - gem: "rails-5.0"
90
94
  exclude:
91
95
  ruby:
data/ext/Rakefile CHANGED
@@ -15,14 +15,13 @@ task :default do
15
15
  report["language"]["implementation"] = "jruby"
16
16
  report["build"]["library_type"] = library_type
17
17
  next unless check_architecture
18
- arch_config = AGENT_CONFIG["triples"][ARCH]
19
18
 
20
19
  if local_build?
21
20
  report["build"]["source"] = "local"
22
21
  else
23
- archive = download_archive(arch_config, library_type)
22
+ archive = download_archive(library_type)
24
23
  next unless archive
25
- next unless verify_archive(archive, arch_config, library_type)
24
+ next unless verify_archive(archive, library_type)
26
25
  unarchive(archive)
27
26
  end
28
27
  successful_installation
data/ext/agent.yml CHANGED
@@ -1,67 +1,70 @@
1
1
  ---
2
- version: e1c9363
2
+ version: d8dc806
3
+ mirrors:
4
+ - https://appsignal-agent-releases.global.ssl.fastly.net
5
+ - https://d135dj0rjqvssy.cloudfront.net
3
6
  triples:
4
7
  x86_64-darwin:
5
8
  static:
6
- checksum: 27c9a6de8ee9cd27bc3021e9f5a0814923814a72be0dfc901e1adf49840181f3
7
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-darwin-all-static.tar.gz
9
+ checksum: a2cc43f4fd296a6a3db06096030185c7cfbdde701b19c1580b44ee5c1bdbef95
10
+ filename: appsignal-x86_64-darwin-all-static.tar.gz
8
11
  dynamic:
9
- checksum: e18b67cb4b816d60b6ab08e130bfb60581454dcfa91801e2d07c98bcb9d5bf4e
10
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-darwin-all-dynamic.tar.gz
12
+ checksum: 77e4bb01a260e7daf798388a44e54ec1950a880563858a1b323eb9eb0426c790
13
+ filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
11
14
  universal-darwin:
12
15
  static:
13
- checksum: 27c9a6de8ee9cd27bc3021e9f5a0814923814a72be0dfc901e1adf49840181f3
14
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-darwin-all-static.tar.gz
16
+ checksum: a2cc43f4fd296a6a3db06096030185c7cfbdde701b19c1580b44ee5c1bdbef95
17
+ filename: appsignal-x86_64-darwin-all-static.tar.gz
15
18
  dynamic:
16
- checksum: e18b67cb4b816d60b6ab08e130bfb60581454dcfa91801e2d07c98bcb9d5bf4e
17
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-darwin-all-dynamic.tar.gz
19
+ checksum: 77e4bb01a260e7daf798388a44e54ec1950a880563858a1b323eb9eb0426c790
20
+ filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
18
21
  i686-linux:
19
22
  static:
20
- checksum: 55085bbdbb802bb1fb1f451fc13387360eff9aa9eaf5c4e8f6380692bd3d7c5a
21
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-i686-linux-all-static.tar.gz
23
+ checksum: ac048bc96c05b4662d8959d2bb7c9028ba9a6fcd78f08cd284457dba8db4e0fc
24
+ filename: appsignal-i686-linux-all-static.tar.gz
22
25
  dynamic:
23
- checksum: bcb2b68ed27635e7c24f9e60635d436a911b1463213458058debfc37c1286750
24
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-i686-linux-all-dynamic.tar.gz
26
+ checksum: 0ae2e52d86416a78a75632bef5c7f3d151d57ea76d45457a39926964b0288328
27
+ filename: appsignal-i686-linux-all-dynamic.tar.gz
25
28
  x86-linux:
26
29
  static:
27
- checksum: 55085bbdbb802bb1fb1f451fc13387360eff9aa9eaf5c4e8f6380692bd3d7c5a
28
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-i686-linux-all-static.tar.gz
30
+ checksum: ac048bc96c05b4662d8959d2bb7c9028ba9a6fcd78f08cd284457dba8db4e0fc
31
+ filename: appsignal-i686-linux-all-static.tar.gz
29
32
  dynamic:
30
- checksum: bcb2b68ed27635e7c24f9e60635d436a911b1463213458058debfc37c1286750
31
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-i686-linux-all-dynamic.tar.gz
33
+ checksum: 0ae2e52d86416a78a75632bef5c7f3d151d57ea76d45457a39926964b0288328
34
+ filename: appsignal-i686-linux-all-dynamic.tar.gz
32
35
  i686-linux-musl:
33
36
  static:
34
- checksum: 27f86f2b5b0be80980fd7e72557c3aff5fc6bed6eada97f09f53bf2c74723e0a
35
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-i686-linux-musl-all-static.tar.gz
37
+ checksum: c61e68128fd8adc3f19917eb4c82a2cd4887f71c96fb5c20a281867841cc6020
38
+ filename: appsignal-i686-linux-musl-all-static.tar.gz
36
39
  x86-linux-musl:
37
40
  static:
38
- checksum: 27f86f2b5b0be80980fd7e72557c3aff5fc6bed6eada97f09f53bf2c74723e0a
39
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-i686-linux-musl-all-static.tar.gz
41
+ checksum: c61e68128fd8adc3f19917eb4c82a2cd4887f71c96fb5c20a281867841cc6020
42
+ filename: appsignal-i686-linux-musl-all-static.tar.gz
40
43
  x86_64-linux:
41
44
  static:
42
- checksum: 3eff05e641c5c4a2a2dd3945bd0b96ac191cb229ded9181ee317e78539d8cd1d
43
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-linux-all-static.tar.gz
45
+ checksum: 525349f02f3d089bbac237d79b50ec5a6b503354b26ec20638d4a15aae79c635
46
+ filename: appsignal-x86_64-linux-all-static.tar.gz
44
47
  dynamic:
45
- checksum: 39650959d3bde5705e9bc3d459d2fb948a331c60691b093d47feab28bc521265
46
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-linux-all-dynamic.tar.gz
48
+ checksum: 788cf409505c41af5284f6b6159b958438c7ce3675a338d73a2c3092b13d7532
49
+ filename: appsignal-x86_64-linux-all-dynamic.tar.gz
47
50
  x86_64-linux-musl:
48
51
  static:
49
- checksum: 4bbea5ec8a1301dc4a3eb4a764a0daddff6d34dad7937d0b3839c1f827b11542
50
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-linux-musl-all-static.tar.gz
52
+ checksum: 133f5f29f38e0d4bf946b8b7290b848efef580ab0f5480790db766653614b0cf
53
+ filename: appsignal-x86_64-linux-musl-all-static.tar.gz
51
54
  dynamic:
52
- checksum: 5f5bb3ec6f4f37001d539642bf55c8bd655113ede975f14a3cf1a23f0287b0b5
53
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-linux-musl-all-dynamic.tar.gz
55
+ checksum: c2c59a186e462c6d9236094c4efad06866f3630a4e0929bc842e2e55fa12760a
56
+ filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
54
57
  x86_64-freebsd:
55
58
  static:
56
- checksum: 2091e45c6cd11721b2b3cf6db927b360e36c5596ef36f292ba38c60f63102e6d
57
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-freebsd-all-static.tar.gz
59
+ checksum: b241082609ad39f26b16094f3f43b113c4eb45340e5b59adae2b365c605b9a8c
60
+ filename: appsignal-x86_64-freebsd-all-static.tar.gz
58
61
  dynamic:
59
- checksum: 1cc85d682d5345091d461095f1b637b21ea3571bcd030f593e3bd63622d78eb8
60
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-freebsd-all-dynamic.tar.gz
62
+ checksum: e7256671ed27f3fd8f19c479a73c34d456adbee27da97e522dbb5bfe98ecf449
63
+ filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
61
64
  amd64-freebsd:
62
65
  static:
63
- checksum: 2091e45c6cd11721b2b3cf6db927b360e36c5596ef36f292ba38c60f63102e6d
64
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-freebsd-all-static.tar.gz
66
+ checksum: b241082609ad39f26b16094f3f43b113c4eb45340e5b59adae2b365c605b9a8c
67
+ filename: appsignal-x86_64-freebsd-all-static.tar.gz
65
68
  dynamic:
66
- checksum: 1cc85d682d5345091d461095f1b637b21ea3571bcd030f593e3bd63622d78eb8
67
- download_url: https://appsignal-agent-releases.global.ssl.fastly.net/e1c9363/appsignal-x86_64-freebsd-all-dynamic.tar.gz
69
+ checksum: e7256671ed27f3fd8f19c479a73c34d456adbee27da97e522dbb5bfe98ecf449
70
+ filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
data/ext/base.rb CHANGED
@@ -12,6 +12,7 @@ AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
12
12
 
13
13
  AGENT_PLATFORM = Appsignal::System.agent_platform
14
14
  ARCH = "#{RbConfig::CONFIG["host_cpu"]}-#{AGENT_PLATFORM}".freeze
15
+ ARCH_CONFIG = AGENT_CONFIG["triples"][ARCH].freeze
15
16
  CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
16
17
 
17
18
  def ext_path(path)
@@ -102,31 +103,53 @@ def check_architecture
102
103
  end
103
104
  end
104
105
 
105
- def download_archive(arch_config, type)
106
+ def download_archive(type)
106
107
  report["build"]["source"] = "remote"
107
- if arch_config.key?(type)
108
- download_url = arch_config[type]["download_url"]
109
- report["download"]["download_url"] = download_url
110
- open(download_url, :ssl_ca_cert => CA_CERT_PATH)
111
- else
108
+
109
+ unless ARCH_CONFIG.key?(type)
112
110
  abort_installation(
113
111
  "AppSignal currently does not support your system. " \
114
- "Expected config for architecture '#{ARCH}' and package type '#{type}', but none found. " \
112
+ "Expected config for architecture '#{arch}' and package type '#{type}', but none found. " \
115
113
  "For a full list of supported systems visit: " \
116
114
  "https://docs.appsignal.com/support/operating-systems.html"
117
115
  )
116
+ return
118
117
  end
118
+
119
+ version = AGENT_CONFIG["version"]
120
+ filename = ARCH_CONFIG[type]["filename"]
121
+ attempted_mirror_urls = []
122
+
123
+ AGENT_CONFIG["mirrors"].each do |mirror|
124
+ download_url = [mirror, version, filename].join("/")
125
+ attempted_mirror_urls << download_url
126
+ report["download"]["download_url"] = download_url
127
+
128
+ begin
129
+ return open(download_url, :ssl_ca_cert => CA_CERT_PATH)
130
+ rescue
131
+ next
132
+ end
133
+ end
134
+
135
+ attempted_mirror_urls_mapped = attempted_mirror_urls.map { |mirror| "- #{mirror}" }
136
+ abort_installation(
137
+ "Could not download archive from any of our mirrors. " \
138
+ "Attempted to download the archive from the following urls:\n" \
139
+ "#{attempted_mirror_urls_mapped.join("\n")}\n" \
140
+ "Please make sure your network allows access to any of these mirrors."
141
+ )
119
142
  end
120
143
 
121
- def verify_archive(archive, arch_config, type)
122
- if Digest::SHA256.hexdigest(archive.read) == arch_config[type]["checksum"]
144
+ def verify_archive(archive, type)
145
+ if Digest::SHA256.hexdigest(archive.read) == ARCH_CONFIG[type]["checksum"]
123
146
  report["download"]["checksum"] = "verified"
124
147
  true
125
148
  else
126
149
  report["download"]["checksum"] = "invalid"
127
150
  abort_installation(
128
151
  "Checksum of downloaded archive could not be verified: " \
129
- "Expected '#{arch_config[type]["checksum"]}', got '#{checksum}'."
152
+ "Expected '#{ARCH_CONFIG[type]["checksum"]}', got '#{checksum}'."
130
153
  )
131
154
  end
132
155
  end
data/ext/extconf.rb CHANGED
@@ -11,14 +11,13 @@ def install
11
11
  report["language"]["implementation"] = "ruby"
12
12
  report["build"]["library_type"] = library_type
13
13
  return unless check_architecture
14
- arch_config = AGENT_CONFIG["triples"][ARCH]
15
14
 
16
15
  if local_build?
17
16
  report["build"]["source"] = "local"
18
17
  else
19
- archive = download_archive(arch_config, library_type)
18
+ archive = download_archive(library_type)
20
19
  return unless archive
21
- return unless verify_archive(archive, arch_config, library_type)
20
+ return unless verify_archive(archive, library_type)
22
21
  unarchive(archive)
23
22
  end
24
23
 
data/gemfiles/que_beta.gemfile ADDED
@@ -0,0 +1,10 @@
1
+ source 'https://rubygems.org'
2
+
3
+ gem 'que', '1.0.0.beta3'
4
+ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
5
+ gem 'public_suffix', "~> 2.0.0"
6
+ else
7
+ gem 'public_suffix'
8
+ end
9
+
10
+ gemspec :path => '../'
data/lib/appsignal/helpers/instrumentation.rb CHANGED
@@ -2,7 +2,6 @@
2
2
 
3
3
  module Appsignal
4
4
  module Helpers
5
- # @api private
6
5
  module Instrumentation # rubocop:disable Metrics/ModuleLength
7
6
  # Creates an AppSignal transaction for the given block.
8
7
  #
data/lib/appsignal/helpers/metrics.rb CHANGED
@@ -2,7 +2,6 @@
2
2
 
3
3
  module Appsignal
4
4
  module Helpers
5
- # @api private
6
5
  module Metrics
7
6
  def set_gauge(key, value, tags = {})
8
7
  Appsignal::Extension.set_gauge(
data/lib/appsignal/integrations/que.rb CHANGED
@@ -5,16 +5,17 @@ module Appsignal
5
5
  module QuePlugin
6
6
  def self.included(base)
7
7
  base.class_eval do
8
- def _run_with_appsignal
8
+ def _run_with_appsignal(*)
9
+ local_attrs = respond_to?(:que_attrs) ? que_attrs : attrs
9
10
  env = {
10
11
  :metadata => {
11
- :id => attrs[:job_id],
12
- :queue => attrs[:queue],
13
- :run_at => attrs[:run_at].to_s,
14
- :priority => attrs[:priority],
15
- :attempts => attrs[:error_count].to_i
12
+ :id => local_attrs[:job_id] || local_attrs[:id],
13
+ :queue => local_attrs[:queue],
14
+ :run_at => local_attrs[:run_at].to_s,
15
+ :priority => local_attrs[:priority],
16
+ :attempts => local_attrs[:error_count].to_i
16
17
  },
17
- :params => attrs[:args]
18
+ :params => local_attrs[:args]
18
19
  }
19
20
 
20
21
  request = Appsignal::Transaction::GenericRequest.new(env)
@@ -31,7 +32,7 @@ module Appsignal
31
32
  transaction.set_error(error)
32
33
  raise error
33
34
  ensure
34
- transaction.set_action "#{attrs[:job_class]}#run"
35
+ transaction.set_action "#{local_attrs[:job_class]}#run"
35
36
  Appsignal::Transaction.complete_current!
36
37
  end
37
38
  end
data/lib/appsignal/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Appsignal
4
- VERSION = "2.9.13".freeze
4
+ VERSION = "2.9.14".freeze
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: appsignal
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.9.13
4
+ version: 2.9.14
5
5
  platform: java
6
6
  authors:
7
7
  - Robert Beekman
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2019-09-05 00:00:00.000000000 Z
13
+ date: 2019-09-23 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rack
@@ -177,6 +177,7 @@ files:
177
177
  - gemfiles/no_dependencies.gemfile
178
178
  - gemfiles/padrino.gemfile
179
179
  - gemfiles/que.gemfile
180
+ - gemfiles/que_beta.gemfile
180
181
  - gemfiles/rails-3.2.gemfile
181
182
  - gemfiles/rails-4.0.gemfile
182
183
  - gemfiles/rails-4.1.gemfile