appsignal 3.0.6 → 3.0.10

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/.gitmodules +3 -0
  3. data/.rubocop.yml +2 -2
  4. data/.semaphore/semaphore.yml +460 -39
  5. data/CHANGELOG.md +23 -0
  6. data/README.md +22 -16
  7. data/Rakefile +11 -10
  8. data/build_matrix.yml +106 -32
  9. data/ext/agent.yml +24 -17
  10. data/ext/base.rb +7 -5
  11. data/lib/appsignal/cli/diagnose.rb +10 -5
  12. data/lib/appsignal/config.rb +1 -0
  13. data/lib/appsignal/hooks/puma.rb +1 -16
  14. data/lib/appsignal/probes.rb +0 -1
  15. data/lib/appsignal/system.rb +30 -3
  16. data/lib/appsignal/transaction.rb +1 -1
  17. data/lib/appsignal/version.rb +1 -1
  18. data/lib/puma/plugin/appsignal.rb +146 -17
  19. data/script/install_lintje +18 -0
  20. data/spec/lib/appsignal/cli/diagnose_spec.rb +4 -2
  21. data/spec/lib/appsignal/hooks/puma_spec.rb +0 -46
  22. data/spec/lib/appsignal/system_spec.rb +30 -0
  23. data/spec/lib/appsignal/transaction_spec.rb +7 -0
  24. data/spec/lib/puma/appsignal_spec.rb +246 -66
  25. data/spec/support/helpers/wait_for_helper.rb +16 -4
  26. metadata +4 -5
  27. data/lib/appsignal/probes/puma.rb +0 -61
  28. data/spec/lib/appsignal/probes/puma_spec.rb +0 -180
data/CHANGELOG.md CHANGED
@@ -1,5 +1,28 @@
1
1
  # AppSignal for Ruby gem Changelog
2
2
 
3
+ ## 3.0.10
4
+
5
+ - [88f7d585](https://github.com/appsignal/appsignal-ruby/commit/88f7d5850f57777c98f56190dc35ff37eface542) patch - Bump agent to c2024bf with appsignal-agent diagnose timing issue fix when reading the report and improved filtering for HTTP request transmission logs.
6
+
7
+ ## 3.0.9
8
+
9
+ - [44dd4bdc](https://github.com/appsignal/appsignal-ruby/commit/44dd4bdc824ec88337b75791c1870358a4aa274f) patch - Check Rails.backtrace_cleaner method before calling the method. This prevents a NoMethodError from being raised in some edge cases.
10
+
11
+ ## 3.0.8
12
+
13
+ - [5f94712d](https://github.com/appsignal/appsignal-ruby/commit/5f94712d3406898f58bea133b8bf3578d6fbbe22) patch - Add the `APPSIGNAL_BUILD_FOR_LINUX_ARM` flag to allow users to enable the experimental Linux ARM build for 64-bit hosts. Usage: `export APPSIGNAL_BUILD_FOR_LINUX_ARM=1 bundle install`. Please be aware this is an experimental build. Please report any issue you may encounter at our [support email](mailto:support@appsignal.com).
14
+
15
+ ## 3.0.7
16
+
17
+ - [27f9b178](https://github.com/appsignal/appsignal-ruby/commit/27f9b178c20006ee15e69bdf878f3a0c9975b1f4) patch - Bump agent to 6caf6d0. Replaces curl HTTP client and includes various other maintenance updates.
18
+ - [665d883a](https://github.com/appsignal/appsignal-ruby/commit/665d883a529e5c14b28e73eeb3ae6410deb3e182) patch - Improve Puma plugin stats collection. Instead of starting the AppSignal gem in the main process we send the stats to the AppSignal agent directly using StatsD. This should improve compatibility with phased restarts. If you use `prune_bundler`, you will need to add AppSignal to the extra `extra_runtime_dependencies` list.
19
+
20
+ ```
21
+ # config/puma.rb
22
+ plugin :appsignal
23
+ extra_runtime_dependencies ["appsignal"]
24
+ ```
25
+
3
26
  ## 3.0.6
4
27
 
5
28
  - [d354d79b](https://github.com/appsignal/appsignal-ruby/commit/d354d79b293fd549e66cae60d805d1b1e9e9d2d8) patch - Add Excon integration. Track requests and responses from the Excon gem.
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # AppSignal for Ruby
1
+ # AppSignal apm for Ruby
2
2
 
3
3
  AppSignal solves all your Ruby monitoring needs in a single tool. You and your
4
4
  team can focus on writing code and we'll provide the alerts if your app has any
@@ -161,9 +161,13 @@ systems][supported-systems] page.
161
161
 
162
162
  Following the process below to release a new version of the Ruby gem.
163
163
 
164
- 1. Run: `rake publish`
165
- 1. Update the Ruby gem version number when prompted.
166
- 1. Update the `CHANGELOG` file with the changes since the last release.
164
+ 1. Make sure [mono](https://github.com/appsignal/mono/) is installed by
165
+ following the installation instructions.
166
+ 1. Run: `mono publish`
167
+ - Mono will automatically bump the version number based on the
168
+ `.changesets/`.
169
+ - Mono will automatically update the `CHANGELOG.md` file based on the
170
+ `.changesets/`.
167
171
  1. Confirm with your two-factor authentication token for Rubygems.org, _twice_.
168
172
 
169
173
  ## Development
@@ -176,6 +180,8 @@ install all possible dependencies.
176
180
  ```bash
177
181
  # Install Bundler
178
182
  gem install bundler
183
+ # Bootstrap the project
184
+ mono bootstrap
179
185
  # Install the AppSignal extension and _all_ gems we support.
180
186
  bundle exec rake install
181
187
  # Only install the AppSignal extension.
@@ -285,22 +291,22 @@ the most out of using AppSignal.
285
291
 
286
292
  Also see our [SUPPORT.md file](SUPPORT.md).
287
293
 
288
- [appsignal]: https://appsignal.com
294
+ [appsignal]: https://www.appsignal.com/ruby
289
295
  [appsignal-sign-up]: https://appsignal.com/users/sign_up
290
296
  [contact]: mailto:support@appsignal.com
291
297
  [coc]: https://docs.appsignal.com/appsignal/code-of-conduct.html
292
- [waffles-page]: https://appsignal.com/waffles
293
- [docs]: http://docs.appsignal.com
298
+ [waffles-page]: https://www.appsignal.com/waffles
299
+ [docs]: https://docs.appsignal.com
294
300
  [ruby-doc]: https://www.rubydoc.info/gems/appsignal
295
- [contributing-guide]: http://docs.appsignal.com/appsignal/contributing.html
296
- [supported-systems]: http://docs.appsignal.com/support/operating-systems.html
297
- [integrations]: http://docs.appsignal.com/ruby/integrations/index.html
298
- [custom-instrumentation]: http://docs.appsignal.com/ruby/instrumentation/
299
- [front-end-monitoring]: http://docs.appsignal.com/front-end/error-handling.html
300
- [exception-handling]: http://docs.appsignal.com/ruby/instrumentation/exception-handling.html
301
- [tagging]: http://docs.appsignal.com/ruby/instrumentation/tagging.html
302
- [host-metrics]: http://docs.appsignal.com/metrics/host.html
303
- [custom-metrics]: http://docs.appsignal.com/metrics/custom.html
301
+ [contributing-guide]: https://docs.appsignal.com/appsignal/contributing.html
302
+ [supported-systems]: https://docs.appsignal.com/support/operating-systems.html
303
+ [integrations]: https://docs.appsignal.com/ruby/integrations/index.html
304
+ [custom-instrumentation]: https://docs.appsignal.com/ruby/instrumentation/
305
+ [front-end-monitoring]: https://docs.appsignal.com/front-end/error-handling.html
306
+ [exception-handling]: https://docs.appsignal.com/ruby/instrumentation/exception-handling.html
307
+ [tagging]: https://docs.appsignal.com/ruby/instrumentation/tagging.html
308
+ [host-metrics]: https://docs.appsignal.com/metrics/host.html
309
+ [custom-metrics]: https://docs.appsignal.com/metrics/custom.html
304
310
 
305
311
  [semver]: http://semver.org/
306
312
  [rvm]: http://rvm.io/
data/Rakefile CHANGED
@@ -24,16 +24,17 @@ def env_map(key, value)
24
24
  }
25
25
  end
26
26
 
27
- def build_task(ruby_version, type = nil)
27
+ def build_task(matrix, ruby_version, type = nil)
28
28
  {
29
29
  "name" => "Ruby #{ruby_version}#{type ? " - #{type}" : nil}",
30
30
  "dependencies" => ["Validation"],
31
31
  "task" => {
32
- "prologue" => {
33
- "commands" => [
32
+ "prologue" => matrix["prologue"].merge(
33
+ "commands" => matrix["prologue"]["commands"] + [
34
34
  "./support/bundler_wrapper exec rake extension:install"
35
35
  ]
36
- },
36
+ ),
37
+ "epilogue" => matrix["epilogue"],
37
38
  "jobs" => []
38
39
  }
39
40
  }
@@ -54,14 +55,14 @@ namespace :build_matrix do
54
55
  builds = []
55
56
  matrix["ruby"].each do |ruby|
56
57
  ruby_version = ruby["ruby"]
57
- ruby_primary_block = build_task(ruby_version)
58
- ruby_secondary_block = build_task(ruby_version, "Gems").tap do |t|
58
+ ruby_primary_block = build_task(matrix, ruby_version)
59
+ ruby_secondary_block = build_task(matrix, ruby_version, "Gems").tap do |t|
59
60
  t["dependencies"] = ["Ruby #{ruby_version}"]
60
61
  end
61
62
  gemset_for_ruby(ruby, matrix).each do |gem|
62
63
  next if excluded_for_ruby?(gem, ruby)
63
64
 
64
- env = [
65
+ env = matrix["env_vars"] + [
65
66
  env_map("RUBY_VERSION", ruby_version),
66
67
  env_map("GEMSET", gem["gem"]),
67
68
  env_map("BUNDLE_GEMFILE", "gemfiles/#{gem["gem"]}.gemfile")
@@ -73,7 +74,7 @@ namespace :build_matrix do
73
74
 
74
75
  job = {
75
76
  "name" => "Ruby #{ruby_version} for #{gem["gem"]}",
76
- "env_vars" => env,
77
+ "env_vars" => env + ruby.fetch("env_vars", []),
77
78
  "commands" => [
78
79
  "./support/bundler_wrapper exec rake test",
79
80
  "./support/bundler_wrapper exec rake test:failure"
@@ -104,8 +105,8 @@ namespace :build_matrix do
104
105
  end
105
106
 
106
107
  task :validate => :generate do
107
- `git status | grep .semaphore/semaphore.yml 2>&1`
108
- if $?.exitstatus.zero? # rubocop:disable Style/SpecialGlobalVars
108
+ output = `git status`
109
+ if output.include? ".semaphore/semaphore.yml"
109
110
  puts "The `.semaphore/semaphore.yml` is modified. The changes were not committed."
110
111
  puts "Please run `rake build_matrix:semaphore:generate` and commit the changes."
111
112
  exit 1
data/build_matrix.yml CHANGED
@@ -11,49 +11,43 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
11
11
  auto_cancel:
12
12
  running:
13
13
  # Ignore main AND develop branch as we want it to build all workflows
14
- when: "branch != 'main' AND branch != 'develop'"
14
+ when: "branch != 'main' AND branch != 'develop' AND branch != 'diagnose-testing'"
15
15
 
16
16
  global_job_config:
17
17
  env_vars:
18
+ - name: RUNNING_IN_CI
19
+ value: "true"
18
20
  - name: _BUNDLER_CACHE
19
21
  value: "v2"
20
22
  - name: _GEMS_CACHE
21
23
  value: "v2"
22
- - name: BUNDLE_PATH
23
- value: "../.bundle/"
24
- - name: RUNNING_IN_CI
25
- value: "true"
26
- - name: RAILS_ENV
27
- value: "test"
28
- - name: JRUBY_OPTS
29
- value: ""
30
- - name: COV
31
- value: "1"
32
24
  prologue:
33
25
  commands:
34
26
  - checkout
35
27
  - rm -f $HOME/.rbenv/plugins/rbenv-gem-rehash/etc/rbenv.d/exec/~gem-rehash.bash
36
- - sem-version ruby $RUBY_VERSION
37
- - ./support/check_versions
38
- - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
39
- - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)
40
- - ./support/install_deps
41
- - bundle config set clean 'true'
42
- - ./support/bundler_wrapper install --jobs=3 --retry=3
43
- epilogue:
44
- on_pass:
45
- commands:
46
- - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
47
- - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
48
- on_fail:
49
- commands:
50
- - "[ -e ext/install.report ] && cat ext/install.report || echo 'No ext/install.report file found'"
51
- - "[ -f ext/mkmf.log ] && cat ext/mkmf.log || echo 'No ext/mkmf.log file found'"
28
+ - |
29
+ if [ -n "$_C_VERSION" ]; then
30
+ sem-version c $_C_VERSION
31
+ else
32
+ echo Skipping C-lang install
33
+ fi
34
+ - |
35
+ if [ -n "$RUBY_VERSION" ]; then
36
+ sem-version ruby $RUBY_VERSION
37
+ ./support/check_versions
38
+ else
39
+ echo Skipping Ruby install
40
+ fi
52
41
 
53
42
  blocks:
54
43
  - name: Validation
55
44
  dependencies: []
56
45
  task:
46
+ prologue:
47
+ commands:
48
+ - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
49
+ - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
50
+ - ./support/bundler_wrapper install --jobs=3 --retry=3
57
51
  jobs:
58
52
  - name: Validate CI setup
59
53
  env_vars:
@@ -62,12 +56,22 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
62
56
  - name: GEMSET
63
57
  value: no_dependencies
64
58
  - name: BUNDLE_GEMFILE
65
- value: gemfiles/no_dependencies.gemfile
59
+ value: Gemfile
66
60
  commands:
67
61
  - ./support/bundler_wrapper exec rake build_matrix:semaphore:validate
68
- - name: Linters
62
+ epilogue:
63
+ on_pass:
64
+ commands:
65
+ - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
66
+ - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
67
+ - name: Ruby linters
69
68
  dependencies: []
70
69
  task:
70
+ prologue:
71
+ commands:
72
+ - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
73
+ - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
74
+ - ./support/bundler_wrapper install --jobs=3 --retry=3
71
75
  jobs:
72
76
  - name: RuboCop
73
77
  env_vars:
@@ -76,11 +80,79 @@ semaphore: # Default `.semaphore/semaphore.yml` contents
76
80
  - name: GEMSET
77
81
  value: no_dependencies
78
82
  - name: BUNDLE_GEMFILE
79
- value: gemfiles/no_dependencies.gemfile
83
+ value: Gemfile
80
84
  commands:
81
85
  - ./support/bundler_wrapper exec rubocop
86
+ epilogue:
87
+ on_pass:
88
+ commands:
89
+ - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
90
+ - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
91
+ - name: Other linters
92
+ dependencies: []
93
+ task:
94
+ jobs:
95
+ - name: Git Lint (Lintje)
96
+ env_vars:
97
+ - name: LINTJE_VERSION
98
+ value: 0.3.0
99
+ commands:
100
+ - script/install_lintje
101
+ - $HOME/bin/lintje $SEMAPHORE_GIT_COMMIT_RANGE
102
+ - name: Integration tests
103
+ dependencies:
104
+ - Validation
105
+ task:
106
+ prologue:
107
+ commands:
108
+ - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-diagnose-$(checksum Gemfile)
109
+ - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-diagnose-$(checksum Gemfile)
110
+ - ./support/bundler_wrapper install --jobs=3 --retry=3
111
+ - ./support/bundler_wrapper exec rake extension:install
112
+ - git submodule init
113
+ - git submodule update
114
+ jobs:
115
+ - name: Diagnose
116
+ env_vars:
117
+ - name: RUBY_VERSION
118
+ value: 2.6.6
119
+ - name: LANGUAGE
120
+ value: ruby
121
+ commands:
122
+ - spec/integration/diagnose/bin/test
123
+ epilogue:
124
+ on_pass:
125
+ commands:
126
+ - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-diagnose-$(checksum Gemfile) .bundle
127
+ - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-diagnose-$(checksum Gemfile) $HOME/.gem
82
128
 
83
129
  matrix:
130
+ env_vars: # Shared for all jobs in the build matrix
131
+ - name: BUNDLE_PATH
132
+ value: "../.bundle/"
133
+ - name: RAILS_ENV
134
+ value: "test"
135
+ - name: JRUBY_OPTS
136
+ value: ""
137
+ - name: COV
138
+ value: "1"
139
+ prologue: # Shared for all jobs in the build matrix
140
+ commands:
141
+ - cache restore $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE)
142
+ - cache restore $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE)
143
+ - ./support/install_deps
144
+ - bundle config set clean 'true'
145
+ - ./support/bundler_wrapper install --jobs=3 --retry=3
146
+ epilogue: # Shared for all jobs in the build matrix
147
+ on_pass:
148
+ commands:
149
+ - cache store $_BUNDLER_CACHE-bundler-$RUBY_VERSION-$GEMSET-$(checksum $BUNDLE_GEMFILE) .bundle
150
+ - cache store $_GEMS_CACHE-gems-$RUBY_VERSION-$(checksum $BUNDLE_GEMFILE) $HOME/.gem
151
+ on_fail:
152
+ commands:
153
+ - "[ -e ext/install.report ] && cat ext/install.report || echo 'No ext/install.report file found'"
154
+ - "[ -f ext/mkmf.log ] && cat ext/mkmf.log || echo 'No ext/mkmf.log file found'"
155
+
84
156
  defaults:
85
157
  rubygems: "latest"
86
158
  bundler: "latest"
@@ -119,8 +191,11 @@ matrix:
119
191
  - ruby: "2.6.6"
120
192
  - ruby: "2.7.3"
121
193
  - ruby: "3.0.1"
122
- - ruby: "jruby-9.1.17.0"
194
+ - ruby: "jruby-9.2.19.0"
123
195
  gems: "minimal"
196
+ env_vars:
197
+ - name: "_C_VERSION"
198
+ value: "8"
124
199
  gems:
125
200
  - gem: "no_dependencies"
126
201
  - gem: "capistrano2"
@@ -162,7 +237,6 @@ matrix:
162
237
  - "2.2.10"
163
238
  - "2.3.8"
164
239
  - "2.4.10"
165
- - "jruby-9.1.17.0"
166
240
  - gem: "resque-1"
167
241
  bundler: "1.17.3"
168
242
  exclude:
data/ext/agent.yml CHANGED
@@ -1,62 +1,69 @@
1
1
  ---
2
- version: 75e76ad
2
+ version: c2024bf
3
3
  mirrors:
4
4
  - https://appsignal-agent-releases.global.ssl.fastly.net
5
5
  - https://d135dj0rjqvssy.cloudfront.net
6
6
  triples:
7
7
  x86_64-darwin:
8
8
  static:
9
- checksum: 81edea50b934fe5b42c0081a1de5782bc477c321c1c76127d7fa525917f70a04
9
+ checksum: 4d705a05a9ebfcb5d592728f7ff002f939a89a63dca26c7db0c812a95f4c9902
10
10
  filename: appsignal-x86_64-darwin-all-static.tar.gz
11
11
  dynamic:
12
- checksum: 60befd59ac704ee21d5881ca0aef6b38caa50b1d1972425bf8f40b4f9710ec1e
12
+ checksum: 86686cd0da13d40a0b9b2b1df8531ab5443f49580b0cc6d68eb11dd43031137c
13
13
  filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
14
14
  universal-darwin:
15
15
  static:
16
- checksum: 81edea50b934fe5b42c0081a1de5782bc477c321c1c76127d7fa525917f70a04
16
+ checksum: 4d705a05a9ebfcb5d592728f7ff002f939a89a63dca26c7db0c812a95f4c9902
17
17
  filename: appsignal-x86_64-darwin-all-static.tar.gz
18
18
  dynamic:
19
- checksum: 60befd59ac704ee21d5881ca0aef6b38caa50b1d1972425bf8f40b4f9710ec1e
19
+ checksum: 86686cd0da13d40a0b9b2b1df8531ab5443f49580b0cc6d68eb11dd43031137c
20
20
  filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
21
+ aarch64-linux:
22
+ static:
23
+ checksum: 41e48b23ad55b55e49ec5940458c6a76f1e646311c0cfe56c8b4533bc60d7d97
24
+ filename: appsignal-aarch64-linux-all-static.tar.gz
25
+ dynamic:
26
+ checksum: ea5ee757b2638c07f8132c2faa8339c2b79a88b8f690c1aa2bb1e0568a431d5a
27
+ filename: appsignal-aarch64-linux-all-dynamic.tar.gz
21
28
  i686-linux:
22
29
  static:
23
- checksum: 60ad6a1f69c8f89b5642f49fbf794409e8ada7d63a9126b2c59832c2a92d5b22
30
+ checksum: 7b7f20576e77f8bd4e55e51804d5c60bf22bf1464ecf883b3fc43e8de5984f9b
24
31
  filename: appsignal-i686-linux-all-static.tar.gz
25
32
  dynamic:
26
- checksum: aedf259de392ea00fd17bc30924cde70d9a1d82a62c6eeefc881cd5ea5dcce63
33
+ checksum: c99d95f7a957d4cfdaa5f64d4e20339f3d3bf5ec0795de693ff9acdcf9dc32ff
27
34
  filename: appsignal-i686-linux-all-dynamic.tar.gz
28
35
  x86-linux:
29
36
  static:
30
- checksum: 60ad6a1f69c8f89b5642f49fbf794409e8ada7d63a9126b2c59832c2a92d5b22
37
+ checksum: 7b7f20576e77f8bd4e55e51804d5c60bf22bf1464ecf883b3fc43e8de5984f9b
31
38
  filename: appsignal-i686-linux-all-static.tar.gz
32
39
  dynamic:
33
- checksum: aedf259de392ea00fd17bc30924cde70d9a1d82a62c6eeefc881cd5ea5dcce63
40
+ checksum: c99d95f7a957d4cfdaa5f64d4e20339f3d3bf5ec0795de693ff9acdcf9dc32ff
34
41
  filename: appsignal-i686-linux-all-dynamic.tar.gz
35
42
  x86_64-linux:
36
43
  static:
37
- checksum: 7e3cf760f9bd364a6602f05e5014ce1c8e8ac9a97f7a533769711e0fb21e1f45
44
+ checksum: c738a4daa41c9f068986e495625f732c5494b1458d1ef8a5d58da34fe3911c7d
38
45
  filename: appsignal-x86_64-linux-all-static.tar.gz
39
46
  dynamic:
40
- checksum: 4a9a4ea22abc93c3afa7d5bfd6f442cd69bf4d672e8db2df1aa2157cfb3fcc4b
47
+ checksum: 34c416ab54f9ca61e2c576e6f5cfd4aef01b408a7b0c3db2e36aab6219abc02d
41
48
  filename: appsignal-x86_64-linux-all-dynamic.tar.gz
42
49
  x86_64-linux-musl:
43
50
  static:
44
- checksum: 4d4dd00607cbe0fb4d14a15e74990f207eba90134c2d1a079b58f0d50f1ab76b
51
+ checksum: e6834abfcf1a3a99301f3184705c1d79602d76c63712e089abd53f44c1734962
45
52
  filename: appsignal-x86_64-linux-musl-all-static.tar.gz
46
53
  dynamic:
47
- checksum: 067a6d821e220c9c88ceb8f936390ce458fa94f41c13d32603d773485a8cdfd2
54
+ checksum: 2b1002ef3d0be8b473db9fda91ad5f0ccd0742445d353e623757c2fae41d4bb0
48
55
  filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
49
56
  x86_64-freebsd:
50
57
  static:
51
- checksum: 176bc1ff1ad40a585ea10456a8ae3f6502c614d713dcbb957d550fa1ae44e7ca
58
+ checksum: decd1f7c7c8b8854bd9b32a993f5c2cea6076244f648bcfeccc063a608f7b5ea
52
59
  filename: appsignal-x86_64-freebsd-all-static.tar.gz
53
60
  dynamic:
54
- checksum: 88c6f3e03f8f6c25a4705f7d6c4286eaa563069a9fb8fad3c0a19e5b9a09f80b
61
+ checksum: d81ae343e224cdf828887a60f8f10be2b1039f2fc2045e8335c57194a1796d35
55
62
  filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
56
63
  amd64-freebsd:
57
64
  static:
58
- checksum: 176bc1ff1ad40a585ea10456a8ae3f6502c614d713dcbb957d550fa1ae44e7ca
65
+ checksum: decd1f7c7c8b8854bd9b32a993f5c2cea6076244f648bcfeccc063a608f7b5ea
59
66
  filename: appsignal-x86_64-freebsd-all-static.tar.gz
60
67
  dynamic:
61
- checksum: 88c6f3e03f8f6c25a4705f7d6c4286eaa563069a9fb8fad3c0a19e5b9a09f80b
68
+ checksum: d81ae343e224cdf828887a60f8f10be2b1039f2fc2045e8335c57194a1796d35
62
69
  filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
data/ext/base.rb CHANGED
@@ -11,8 +11,9 @@ EXT_PATH = File.expand_path("..", __FILE__).freeze
11
11
  AGENT_CONFIG = YAML.load(File.read(File.join(EXT_PATH, "agent.yml"))).freeze
12
12
 
13
13
  AGENT_PLATFORM = Appsignal::System.agent_platform
14
- ARCH = "#{RbConfig::CONFIG["host_cpu"]}-#{AGENT_PLATFORM}".freeze
15
- ARCH_CONFIG = AGENT_CONFIG["triples"][ARCH].freeze
14
+ AGENT_ARCHITECTURE = Appsignal::System.agent_architecture
15
+ TARGET_TRIPLE = "#{AGENT_ARCHITECTURE}-#{AGENT_PLATFORM}".freeze
16
+ ARCH_CONFIG = AGENT_CONFIG["triples"][TARGET_TRIPLE].freeze
16
17
  CA_CERT_PATH = File.join(EXT_PATH, "../resources/cacert.pem").freeze
17
18
 
18
19
  def ext_path(path)
@@ -38,9 +39,10 @@ def report
38
39
  "build" => {
39
40
  "time" => Time.now.utc,
40
41
  "package_path" => File.dirname(EXT_PATH),
41
- "architecture" => rbconfig["host_cpu"],
42
+ "architecture" => AGENT_ARCHITECTURE,
42
43
  "target" => AGENT_PLATFORM,
43
44
  "musl_override" => Appsignal::System.force_musl_build?,
45
+ "linux_arm_override" => Appsignal::System.force_linux_arm_build?,
44
46
  "dependencies" => {},
45
47
  "flags" => {}
46
48
  },
@@ -94,11 +96,11 @@ def installation_succeeded?
94
96
  end
95
97
 
96
98
  def check_architecture
97
- if AGENT_CONFIG["triples"].key?(ARCH)
99
+ if AGENT_CONFIG["triples"].key?(TARGET_TRIPLE)
98
100
  true
99
101
  else
100
102
  abort_installation(
101
- "AppSignal currently does not support your system architecture (#{ARCH})." \
103
+ "AppSignal currently does not support your system architecture (#{TARGET_TRIPLE})." \
102
104
  "Please let us know at support@appsignal.com, we aim to support everything our customers run."
103
105
  )
104
106
  end