appsignal 2.9.12.beta.0 → 2.9.18.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/.travis.yml +19 -16
- data/CHANGELOG.md +38 -2
- data/appsignal.gemspec +4 -3
- data/build_matrix.yml +12 -5
- data/ext/Rakefile +2 -3
- data/ext/agent.yml +40 -37
- data/ext/base.rb +33 -10
- data/ext/extconf.rb +2 -3
- data/gemfiles/que_beta.gemfile +10 -0
- data/gemfiles/rails-6.0.gemfile +1 -1
- data/lib/appsignal/cli/install.rb +34 -10
- data/lib/appsignal/helpers/instrumentation.rb +8 -5
- data/lib/appsignal/helpers/metrics.rb +0 -1
- data/lib/appsignal/hooks/puma.rb +13 -18
- data/lib/appsignal/hooks/sequel.rb +1 -1
- data/lib/appsignal/hooks/sidekiq.rb +21 -7
- data/lib/appsignal/integrations/que.rb +9 -8
- data/lib/appsignal/transaction.rb +5 -0
- data/lib/appsignal/utils/rails_helper.rb +4 -0
- data/lib/appsignal/version.rb +1 -1
- data/lib/puma/plugin/appsignal.rb +26 -0
- data/spec/lib/appsignal/cli/install_spec.rb +51 -7
- data/spec/lib/appsignal/hooks/puma_spec.rb +43 -35
- data/spec/lib/appsignal/hooks/sidekiq_spec.rb +13 -0
- data/spec/lib/appsignal/minutely_spec.rb +11 -48
- data/spec/lib/appsignal/transaction_spec.rb +27 -4
- data/spec/lib/appsignal_spec.rb +13 -5
- data/spec/lib/puma/appsignal_spec.rb +91 -0
- data/spec/support/helpers/wait_for_helper.rb +28 -0
- data/spec/support/mocks/mock_probe.rb +11 -0
- metadata +16 -8
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
|
-
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
2
|
+
SHA256:
|
|
3
|
+
metadata.gz: 497a4a7b4a8d6a2d195f7e509a0a270f75e06a244c662d8294ad9f2b41c6401b
|
|
4
|
+
data.tar.gz: e583e62d155c23794a4e29728be90d8d04cb5c92c6f33970c6f97ea0b9a97e89
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6164b48d04632a33bd801f303de05fbd77eab91d6611123d80183d19f7b5b934485972883cc3f0e563e1632e8020d2bf229db1d91c53f550cff5c95413b41f6b
|
|
7
|
+
data.tar.gz: e8e6af01a31bc1ffc7c304df523538bd95a58d0e65ffe3cfcbaf63d4fc0791a69d20c5606aed84ba5dbc85df9350796561a8c9d8b57b7b3840360d2c718c1ecb
|
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.
|
|
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.
|
|
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.
|
|
99
|
+
- rvm: 2.6.4
|
|
100
100
|
gemfile: gemfiles/capistrano2.gemfile
|
|
101
101
|
env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
|
|
102
|
-
- rvm: 2.6.
|
|
102
|
+
- rvm: 2.6.4
|
|
103
103
|
gemfile: gemfiles/capistrano3.gemfile
|
|
104
104
|
env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
|
|
105
|
-
- rvm: 2.6.
|
|
105
|
+
- rvm: 2.6.4
|
|
106
106
|
gemfile: gemfiles/grape.gemfile
|
|
107
107
|
env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
|
|
108
|
-
- rvm: 2.6.
|
|
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.
|
|
111
|
+
- rvm: 2.6.4
|
|
112
112
|
gemfile: gemfiles/que.gemfile
|
|
113
113
|
env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
|
|
114
|
-
- rvm: 2.6.
|
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
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.
|
|
132
|
+
- rvm: 2.6.4
|
|
130
133
|
gemfile: gemfiles/sequel.gemfile
|
|
131
134
|
env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
|
|
132
|
-
- rvm: 2.6.
|
|
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.
|
|
138
|
+
- rvm: 2.6.4
|
|
136
139
|
gemfile: gemfiles/sinatra.gemfile
|
|
137
140
|
env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
|
|
138
|
-
- rvm: 2.6.
|
|
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,8 +1,44 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 2.9.18 (Beta)
|
|
4
|
+
- Bump agent to v-c348132
|
|
5
|
+
- Improve transmitter logging on timeout
|
|
6
|
+
- Improve queued payloads transmitter. Should prevent payloads being sent
|
|
7
|
+
multiple times.
|
|
8
|
+
- Add transaction debug mode
|
|
9
|
+
- Wrap Option in Mutex in TransactionInProgess
|
|
10
|
+
|
|
11
|
+
## 2.9.17
|
|
12
|
+
- Handle missing file and load errors from `application.rb` in `appsignal
|
|
13
|
+
install` for Rails apps. PR #568
|
|
14
|
+
- Support minutely probes for Puma in clustered mode. PR #570
|
|
15
|
+
See the installation instructions for the Puma plugin:
|
|
16
|
+
https://docs.appsignal.com/ruby/integrations/puma.html
|
|
17
|
+
|
|
18
|
+
## 2.9.16
|
|
19
|
+
- Check set_error arguments for Exceptions. PR #565
|
|
20
|
+
- Bump agent to v-1d8917f - commit 737d6b1b8fc9cd2c0564050bb04246d9267dceb7
|
|
21
|
+
- Only attempt to send queued payloads if we have a successful transmission.
|
|
22
|
+
|
|
23
|
+
## 2.9.15
|
|
24
|
+
- Bump agent to v-690f4b8 - commit cf4f3787395c8524079f3bed3b2c2367296482a9
|
|
25
|
+
- Validate transmission_interval option.
|
|
26
|
+
|
|
27
|
+
## 2.9.14
|
|
28
|
+
- Support mirrors when downloading the agent & extension. PR #558
|
|
29
|
+
- Support Que's upcoming 1.0.0 release. PR #557
|
|
30
|
+
|
|
31
|
+
## 2.9.13
|
|
32
|
+
- Bump agent to v-e1c9363
|
|
33
|
+
- Detect revision from Heroku dynos automatically when Dyno Metadata is
|
|
34
|
+
turned on.
|
|
35
|
+
|
|
3
36
|
## 2.9.12
|
|
4
|
-
- Bump agent to a3e0f83
|
|
5
|
-
-
|
|
37
|
+
- Bump agent to v-a3e0f83 - commit 3d94dd42645922214fc2f5bc09cfa7c597323198
|
|
38
|
+
- Better detect zombie/defunct processes on containers and consider the
|
|
39
|
+
processes dead. This should improve the appsignal-agent start behavior.
|
|
40
|
+
- Fix Sequel install hook version detection mismatch. PR #553
|
|
41
|
+
- Improve support for older Sidekiq versions. PR #555
|
|
6
42
|
|
|
7
43
|
## 2.9.11
|
|
8
44
|
- Bump agent to v-a718022
|
data/appsignal.gemspec
CHANGED
|
@@ -5,7 +5,8 @@ require File.expand_path("../lib/appsignal/version", __FILE__)
|
|
|
5
5
|
Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
|
|
6
6
|
gem.authors = [
|
|
7
7
|
"Robert Beekman",
|
|
8
|
-
"Thijs Cadier"
|
|
8
|
+
"Thijs Cadier",
|
|
9
|
+
"Tom de Bruijn"
|
|
9
10
|
]
|
|
10
11
|
gem.email = ["support@appsignal.com"]
|
|
11
12
|
gem.description = "The official appsignal.com gem"
|
|
@@ -37,10 +38,10 @@ Gem::Specification.new do |gem| # rubocop:disable Metrics/BlockLength
|
|
|
37
38
|
gem.add_dependency "rack"
|
|
38
39
|
|
|
39
40
|
gem.add_development_dependency "rake", "~> 11"
|
|
40
|
-
gem.add_development_dependency "rspec", "~> 3.
|
|
41
|
+
gem.add_development_dependency "rspec", "~> 3.8"
|
|
41
42
|
gem.add_development_dependency "pry"
|
|
42
43
|
gem.add_development_dependency "timecop"
|
|
43
44
|
gem.add_development_dependency "webmock"
|
|
44
45
|
gem.add_development_dependency "rubocop", "0.50.0"
|
|
45
|
-
gem.add_development_dependency "yard"
|
|
46
|
+
gem.add_development_dependency "yard", ">= 0.9.20"
|
|
46
47
|
end
|
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.
|
|
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:
|
|
@@ -49,7 +49,6 @@ matrix:
|
|
|
49
49
|
minimal:
|
|
50
50
|
- "no_dependencies"
|
|
51
51
|
- "rails-5.2"
|
|
52
|
-
- "rails-6.2"
|
|
53
52
|
|
|
54
53
|
ruby:
|
|
55
54
|
- ruby: "2.0.0"
|
|
@@ -66,7 +65,7 @@ matrix:
|
|
|
66
65
|
gems: "none"
|
|
67
66
|
- ruby: "2.5.3"
|
|
68
67
|
gems: "minimal"
|
|
69
|
-
- ruby: "2.6.
|
|
68
|
+
- ruby: "2.6.4"
|
|
70
69
|
- ruby: "jruby-19mode"
|
|
71
70
|
gems: "minimal"
|
|
72
71
|
gems:
|
|
@@ -77,16 +76,20 @@ matrix:
|
|
|
77
76
|
- gem: "padrino"
|
|
78
77
|
bundler: "1.17.3"
|
|
79
78
|
- gem: "que"
|
|
79
|
+
- gem: "que_beta"
|
|
80
|
+
exclude:
|
|
81
|
+
ruby:
|
|
82
|
+
- "2.0.0"
|
|
80
83
|
- gem: "rails-3.2"
|
|
81
84
|
bundler: "1.17.3"
|
|
82
85
|
exclude:
|
|
83
86
|
ruby:
|
|
84
|
-
- "2.6.
|
|
87
|
+
- "2.6.4"
|
|
85
88
|
- gem: "rails-4.2"
|
|
86
89
|
bundler: "1.17.3"
|
|
87
90
|
exclude:
|
|
88
91
|
ruby:
|
|
89
|
-
- "2.6.
|
|
92
|
+
- "2.6.4"
|
|
90
93
|
- gem: "rails-5.0"
|
|
91
94
|
exclude:
|
|
92
95
|
ruby:
|
|
@@ -103,6 +106,10 @@ matrix:
|
|
|
103
106
|
exclude:
|
|
104
107
|
ruby:
|
|
105
108
|
- "2.0.0"
|
|
109
|
+
- "2.1.8"
|
|
110
|
+
- "2.2.4"
|
|
111
|
+
- "2.3.8"
|
|
112
|
+
- "2.4.5"
|
|
106
113
|
- gem: "resque"
|
|
107
114
|
bundler: "1.17.3"
|
|
108
115
|
- gem: "sequel"
|
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(
|
|
22
|
+
archive = download_archive(library_type)
|
|
24
23
|
next unless archive
|
|
25
|
-
next unless verify_archive(archive,
|
|
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:
|
|
2
|
+
version: c348132
|
|
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:
|
|
7
|
-
|
|
9
|
+
checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
|
|
10
|
+
filename: appsignal-x86_64-darwin-all-static.tar.gz
|
|
8
11
|
dynamic:
|
|
9
|
-
checksum:
|
|
10
|
-
|
|
12
|
+
checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
|
|
13
|
+
filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
|
|
11
14
|
universal-darwin:
|
|
12
15
|
static:
|
|
13
|
-
checksum:
|
|
14
|
-
|
|
16
|
+
checksum: cb287c8e2072fe5b8cf14449bd6892989c392d0c651ce339895ae0302cb69785
|
|
17
|
+
filename: appsignal-x86_64-darwin-all-static.tar.gz
|
|
15
18
|
dynamic:
|
|
16
|
-
checksum:
|
|
17
|
-
|
|
19
|
+
checksum: af1ed2e9d29859ffbfc8e6903e4c51764dee94d7b4877ca8d30270b6f133a10f
|
|
20
|
+
filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
|
|
18
21
|
i686-linux:
|
|
19
22
|
static:
|
|
20
|
-
checksum:
|
|
21
|
-
|
|
23
|
+
checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
|
|
24
|
+
filename: appsignal-i686-linux-all-static.tar.gz
|
|
22
25
|
dynamic:
|
|
23
|
-
checksum:
|
|
24
|
-
|
|
26
|
+
checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
|
|
27
|
+
filename: appsignal-i686-linux-all-dynamic.tar.gz
|
|
25
28
|
x86-linux:
|
|
26
29
|
static:
|
|
27
|
-
checksum:
|
|
28
|
-
|
|
30
|
+
checksum: 2c3bcd102592bf38fbdb27e7c70502dccbe54a0dc2739a9d54aaa694fcfb41fb
|
|
31
|
+
filename: appsignal-i686-linux-all-static.tar.gz
|
|
29
32
|
dynamic:
|
|
30
|
-
checksum:
|
|
31
|
-
|
|
33
|
+
checksum: 1c037b8370b755d706340e25d3e4b2f4acb279dd03873cc53bcf0a6ec0832653
|
|
34
|
+
filename: appsignal-i686-linux-all-dynamic.tar.gz
|
|
32
35
|
i686-linux-musl:
|
|
33
36
|
static:
|
|
34
|
-
checksum:
|
|
35
|
-
|
|
37
|
+
checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
|
|
38
|
+
filename: appsignal-i686-linux-musl-all-static.tar.gz
|
|
36
39
|
x86-linux-musl:
|
|
37
40
|
static:
|
|
38
|
-
checksum:
|
|
39
|
-
|
|
41
|
+
checksum: 0add9eed4452feda7fc5e1bbd0acdff32c353e4ea0b5d527959df57deb1bdcb2
|
|
42
|
+
filename: appsignal-i686-linux-musl-all-static.tar.gz
|
|
40
43
|
x86_64-linux:
|
|
41
44
|
static:
|
|
42
|
-
checksum:
|
|
43
|
-
|
|
45
|
+
checksum: d11221c127c00128da16b419c503281407e429c0ea6f5bfe1691640b8e995e4e
|
|
46
|
+
filename: appsignal-x86_64-linux-all-static.tar.gz
|
|
44
47
|
dynamic:
|
|
45
|
-
checksum:
|
|
46
|
-
|
|
48
|
+
checksum: 6869ab461fde55487d55805c396d55f36cb881998556f44236035b949939b0af
|
|
49
|
+
filename: appsignal-x86_64-linux-all-dynamic.tar.gz
|
|
47
50
|
x86_64-linux-musl:
|
|
48
51
|
static:
|
|
49
|
-
checksum:
|
|
50
|
-
|
|
52
|
+
checksum: 7ce44dc23c578933ca37a79d244bc367fdc2438408c2a61558adb92bcfebb1fa
|
|
53
|
+
filename: appsignal-x86_64-linux-musl-all-static.tar.gz
|
|
51
54
|
dynamic:
|
|
52
|
-
checksum:
|
|
53
|
-
|
|
55
|
+
checksum: 78d98f468e3a12cc09baff9e68bc4d9cd3b79f4a3bbe744036bff685415546a4
|
|
56
|
+
filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
|
|
54
57
|
x86_64-freebsd:
|
|
55
58
|
static:
|
|
56
|
-
checksum:
|
|
57
|
-
|
|
59
|
+
checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
|
|
60
|
+
filename: appsignal-x86_64-freebsd-all-static.tar.gz
|
|
58
61
|
dynamic:
|
|
59
|
-
checksum:
|
|
60
|
-
|
|
62
|
+
checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
|
|
63
|
+
filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
|
|
61
64
|
amd64-freebsd:
|
|
62
65
|
static:
|
|
63
|
-
checksum:
|
|
64
|
-
|
|
66
|
+
checksum: df5f8b61e6ecca40f349cf5c83d5f37f031850d367793dee90dc56f13974431d
|
|
67
|
+
filename: appsignal-x86_64-freebsd-all-static.tar.gz
|
|
65
68
|
dynamic:
|
|
66
|
-
checksum:
|
|
67
|
-
|
|
69
|
+
checksum: 30d0303e97386014640c5b8194b777a5741e08ab5497ba58a7d8229bd4890fc5
|
|
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(
|
|
106
|
+
def download_archive(type)
|
|
106
107
|
report["build"]["source"] = "remote"
|
|
107
|
-
|
|
108
|
-
|
|
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 '#{
|
|
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,
|
|
122
|
-
if Digest::SHA256.hexdigest(archive.read) ==
|
|
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 '#{
|
|
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(
|
|
18
|
+
archive = download_archive(library_type)
|
|
20
19
|
return unless archive
|
|
21
|
-
return unless verify_archive(archive,
|
|
20
|
+
return unless verify_archive(archive, library_type)
|
|
22
21
|
unarchive(archive)
|
|
23
22
|
end
|
|
24
23
|
|
data/gemfiles/rails-6.0.gemfile
CHANGED