appsignal 3.0.7-java → 3.0.11-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) 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 +16 -0
  6. data/README.md +13 -13
  7. data/Rakefile +11 -10
  8. data/build_matrix.yml +106 -32
  9. data/ext/agent.yml +38 -17
  10. data/ext/base.rb +7 -5
  11. data/lib/appsignal/cli/diagnose.rb +10 -5
  12. data/lib/appsignal/system.rb +30 -3
  13. data/lib/appsignal/transaction.rb +1 -1
  14. data/lib/appsignal/version.rb +1 -1
  15. data/script/install_lintje +18 -0
  16. data/spec/lib/appsignal/cli/diagnose_spec.rb +4 -2
  17. data/spec/lib/appsignal/system_spec.rb +30 -0
  18. data/spec/lib/appsignal/transaction_spec.rb +7 -0
  19. data/spec/lib/puma/appsignal_spec.rb +43 -39
  20. data/spec/support/helpers/wait_for_helper.rb +16 -4
  21. metadata +4 -2
data/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # AppSignal for Ruby gem Changelog
2
2
 
3
+ ## 3.0.11
4
+
5
+ - [8e3ec789](https://github.com/appsignal/appsignal-ruby/commit/8e3ec78943acf7c533c3703c3961e19c49dcd5aa) patch - Bump agent to v-891c6b0. Add experimental Apple Silicon M1 ARM64 build.
6
+
7
+ ## 3.0.10
8
+
9
+ - [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.
10
+
11
+ ## 3.0.9
12
+
13
+ - [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.
14
+
15
+ ## 3.0.8
16
+
17
+ - [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).
18
+
3
19
  ## 3.0.7
4
20
 
5
21
  - [27f9b178](https://github.com/appsignal/appsignal-ruby/commit/27f9b178c20006ee15e69bdf878f3a0c9975b1f4) patch - Bump agent to 6caf6d0. Replaces curl HTTP client and includes various other maintenance updates.
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
@@ -291,22 +291,22 @@ the most out of using AppSignal.
291
291
 
292
292
  Also see our [SUPPORT.md file](SUPPORT.md).
293
293
 
294
- [appsignal]: https://appsignal.com
294
+ [appsignal]: https://www.appsignal.com/ruby
295
295
  [appsignal-sign-up]: https://appsignal.com/users/sign_up
296
296
  [contact]: mailto:support@appsignal.com
297
297
  [coc]: https://docs.appsignal.com/appsignal/code-of-conduct.html
298
- [waffles-page]: https://appsignal.com/waffles
299
- [docs]: http://docs.appsignal.com
298
+ [waffles-page]: https://www.appsignal.com/waffles
299
+ [docs]: https://docs.appsignal.com
300
300
  [ruby-doc]: https://www.rubydoc.info/gems/appsignal
301
- [contributing-guide]: http://docs.appsignal.com/appsignal/contributing.html
302
- [supported-systems]: http://docs.appsignal.com/support/operating-systems.html
303
- [integrations]: http://docs.appsignal.com/ruby/integrations/index.html
304
- [custom-instrumentation]: http://docs.appsignal.com/ruby/instrumentation/
305
- [front-end-monitoring]: http://docs.appsignal.com/front-end/error-handling.html
306
- [exception-handling]: http://docs.appsignal.com/ruby/instrumentation/exception-handling.html
307
- [tagging]: http://docs.appsignal.com/ruby/instrumentation/tagging.html
308
- [host-metrics]: http://docs.appsignal.com/metrics/host.html
309
- [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
310
310
 
311
311
  [semver]: http://semver.org/
312
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,83 @@
1
1
  ---
2
- version: 3ecd06f
2
+ version: 891c6b0
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: 39839e64832d7964fad51d9acc95374654446ade04d06cbba4d052e4483a8516
9
+ checksum: 17203c5edae2463684f271216d32c9d5c57923c9730254b4a050392fea4e74a8
10
10
  filename: appsignal-x86_64-darwin-all-static.tar.gz
11
11
  dynamic:
12
- checksum: 841b82677aaf553219f689b92b6dc6988278420e2e72dcab28a6c5915a0e4158
12
+ checksum: e9cbd39d6620792540453ced34cf348ca6560d292952d2b152da24fc22fc38d5
13
13
  filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
14
14
  universal-darwin:
15
15
  static:
16
- checksum: 39839e64832d7964fad51d9acc95374654446ade04d06cbba4d052e4483a8516
16
+ checksum: 17203c5edae2463684f271216d32c9d5c57923c9730254b4a050392fea4e74a8
17
17
  filename: appsignal-x86_64-darwin-all-static.tar.gz
18
18
  dynamic:
19
- checksum: 841b82677aaf553219f689b92b6dc6988278420e2e72dcab28a6c5915a0e4158
19
+ checksum: e9cbd39d6620792540453ced34cf348ca6560d292952d2b152da24fc22fc38d5
20
20
  filename: appsignal-x86_64-darwin-all-dynamic.tar.gz
21
+ aarch64-darwin:
22
+ static:
23
+ checksum: 70db73144a1ee9475636512e6f55b0c7189ee6d2d390341d33fcaaece10b5a13
24
+ filename: appsignal-aarch64-darwin-all-static.tar.gz
25
+ dynamic:
26
+ checksum: 13c646d2a98719f0ef9bb15f4e06b5b58bd8b938f1efb6e6cdfd999fe2872a38
27
+ filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
28
+ arm64-darwin:
29
+ static:
30
+ checksum: 70db73144a1ee9475636512e6f55b0c7189ee6d2d390341d33fcaaece10b5a13
31
+ filename: appsignal-aarch64-darwin-all-static.tar.gz
32
+ dynamic:
33
+ checksum: 13c646d2a98719f0ef9bb15f4e06b5b58bd8b938f1efb6e6cdfd999fe2872a38
34
+ filename: appsignal-aarch64-darwin-all-dynamic.tar.gz
35
+ aarch64-linux:
36
+ static:
37
+ checksum: 0ff967bd1d2d117cdc5a988adfd6083352f0ff3e3a18d8e85360b998ed08997e
38
+ filename: appsignal-aarch64-linux-all-static.tar.gz
39
+ dynamic:
40
+ checksum: 0b22089409e3c59e77edfcc8a9c4e87250fc2021aade730475db60c5d88b1362
41
+ filename: appsignal-aarch64-linux-all-dynamic.tar.gz
21
42
  i686-linux:
22
43
  static:
23
- checksum: fdf923153992816c813f938f41feadafbf80d8fa10a785123ee23184945047a0
44
+ checksum: 5653c81adebbf7533a714556efae82bd6ed538e3fa44e880aa5630b72d266668
24
45
  filename: appsignal-i686-linux-all-static.tar.gz
25
46
  dynamic:
26
- checksum: d2b8635199a73a1769ee7495acac0cdc69c4f964fef9ec7749fde517d789e1dd
47
+ checksum: b621f0a7d717ba3aa079df699d75eeca19500008d3906e7d1ff78d4ad01628b2
27
48
  filename: appsignal-i686-linux-all-dynamic.tar.gz
28
49
  x86-linux:
29
50
  static:
30
- checksum: fdf923153992816c813f938f41feadafbf80d8fa10a785123ee23184945047a0
51
+ checksum: 5653c81adebbf7533a714556efae82bd6ed538e3fa44e880aa5630b72d266668
31
52
  filename: appsignal-i686-linux-all-static.tar.gz
32
53
  dynamic:
33
- checksum: d2b8635199a73a1769ee7495acac0cdc69c4f964fef9ec7749fde517d789e1dd
54
+ checksum: b621f0a7d717ba3aa079df699d75eeca19500008d3906e7d1ff78d4ad01628b2
34
55
  filename: appsignal-i686-linux-all-dynamic.tar.gz
35
56
  x86_64-linux:
36
57
  static:
37
- checksum: d81383dedb228f484e1d1e28a76ddc017d788fa62270b6e3f5a55765a4fb89d9
58
+ checksum: b07919c0a18c8ed1b658dbf2717268d61ab88d1cc4665438e68d73a54334e1f8
38
59
  filename: appsignal-x86_64-linux-all-static.tar.gz
39
60
  dynamic:
40
- checksum: f98948600345ee4726712937b13059fe7145d9b83273fc6efc6e0fd6a255381a
61
+ checksum: 409e5d3536f7f97cbe7eaca124fcadab9ac0e86f73299b1890e4833724a842e1
41
62
  filename: appsignal-x86_64-linux-all-dynamic.tar.gz
42
63
  x86_64-linux-musl:
43
64
  static:
44
- checksum: be2c414da7eb0837f23a8791b369e650aea26afbf9d3be9f530bc2de11fc888f
65
+ checksum: 23dc0715fed704ef65365cbc385aa8135c317d53844e3102e989dd8144b37039
45
66
  filename: appsignal-x86_64-linux-musl-all-static.tar.gz
46
67
  dynamic:
47
- checksum: 3d04b9dcfbfe7696e028f9205dcae08e41bd87d162f7f37d04cc3d4a7442a9ec
68
+ checksum: e6bd1a149042d8ab8c316575beb37ef3c9b46f553aa04aa151a6966d7e048c77
48
69
  filename: appsignal-x86_64-linux-musl-all-dynamic.tar.gz
49
70
  x86_64-freebsd:
50
71
  static:
51
- checksum: fcbfabaa51f9004ed697e9000bfc1a7d71f48f40c04f9c9588a5c8f09cddf0ea
72
+ checksum: c9758318ea45461f3cede1d232f730914eb115ea2c34199cf9031a45af8d2776
52
73
  filename: appsignal-x86_64-freebsd-all-static.tar.gz
53
74
  dynamic:
54
- checksum: ffc261d6d2a799e9bbf1cee3f9134da60cd72cd6b47a72e8c63a5a11e4d0b472
75
+ checksum: 03ab564b9613a17d3b972f98eb359588b9e69120fc4191222e769aa266613029
55
76
  filename: appsignal-x86_64-freebsd-all-dynamic.tar.gz
56
77
  amd64-freebsd:
57
78
  static:
58
- checksum: fcbfabaa51f9004ed697e9000bfc1a7d71f48f40c04f9c9588a5c8f09cddf0ea
79
+ checksum: c9758318ea45461f3cede1d232f730914eb115ea2c34199cf9031a45af8d2776
59
80
  filename: appsignal-x86_64-freebsd-all-static.tar.gz
60
81
  dynamic:
61
- checksum: ffc261d6d2a799e9bbf1cee3f9134da60cd72cd6b47a72e8c63a5a11e4d0b472
82
+ checksum: 03ab564b9613a17d3b972f98eb359588b9e69120fc4191222e769aa266613029
62
83
  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