appsignal 2.10.3-java → 2.10.4-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (25) hide show
  1. checksums.yaml +4 -4
  2. data/.semaphore/semaphore.yml +818 -0
  3. data/CHANGELOG.md +6 -0
  4. data/README.md +1 -1
  5. data/Rakefile +59 -20
  6. data/build_matrix.yml +84 -49
  7. data/gemfiles/capistrano2.gemfile +0 -5
  8. data/gemfiles/capistrano3.gemfile +0 -5
  9. data/gemfiles/grape.gemfile +0 -5
  10. data/gemfiles/no_dependencies.gemfile +0 -5
  11. data/gemfiles/padrino.gemfile +0 -5
  12. data/gemfiles/que.gemfile +0 -5
  13. data/gemfiles/que_beta.gemfile +0 -5
  14. data/gemfiles/rails-3.2.gemfile +0 -5
  15. data/gemfiles/rails-4.0.gemfile +0 -5
  16. data/gemfiles/rails-4.1.gemfile +0 -5
  17. data/gemfiles/rails-4.2.gemfile +0 -5
  18. data/gemfiles/resque.gemfile +0 -5
  19. data/lib/appsignal/transaction.rb +1 -1
  20. data/lib/appsignal/version.rb +1 -1
  21. data/spec/lib/appsignal/transaction_spec.rb +19 -13
  22. data/support/check_versions +22 -0
  23. data/support/install_deps +6 -4
  24. metadata +4 -3
  25. data/.travis.yml +0 -197
data/gemfiles/resque.gemfile CHANGED
@@ -9,8 +9,3 @@ gemspec :path => '../'
9
9
  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
10
10
  gem 'nokogiri', '~> 1.6.0'
11
11
  end
12
- if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("2.1.0")
13
- gem 'public_suffix', "~> 2.0.0"
14
- else
15
- gem 'public_suffix'
16
- end
data/lib/appsignal/transaction.rb CHANGED
@@ -218,7 +218,7 @@ module Appsignal
218
218
  from[:controller] || from[:class],
219
219
  from[:action] || from[:method]
220
220
  ]
221
- set_action(group_and_action.compact.join("#"))
221
+ set_action_if_nil(group_and_action.compact.join("#"))
222
222
  end
223
223
 
224
224
  def set_queue_start(start)
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.10.3".freeze
4
+ VERSION = "2.10.4".freeze
5
5
  end
data/spec/lib/appsignal/transaction_spec.rb CHANGED
@@ -441,30 +441,36 @@ describe Appsignal::Transaction do
441
441
 
442
442
  describe "#set_http_or_background_action" do
443
443
  context "for a hash with controller and action" do
444
- let(:from) { { :controller => "HomeController", :action => "show" } }
445
-
446
- it "should set the action" do
447
- expect(transaction).to receive(:set_action).with("HomeController#show")
444
+ it "sets the action" do
445
+ transaction.set_http_or_background_action(
446
+ :controller => "HomeController",
447
+ :action => "show"
448
+ )
449
+ expect(transaction.to_h["action"]).to eql("HomeController#show")
448
450
  end
449
451
  end
450
452
 
451
453
  context "for a hash with just action" do
452
- let(:from) { { :action => "show" } }
453
-
454
- it "should set the action" do
455
- expect(transaction).to receive(:set_action).with("show")
454
+ it "sets the action" do
455
+ transaction.set_http_or_background_action(:action => "show")
456
+ expect(transaction.to_h["action"]).to eql("show")
456
457
  end
457
458
  end
458
459
 
459
460
  context "for a hash with class and method" do
460
- let(:from) { { :class => "Worker", :method => "perform" } }
461
-
462
- it "should set the action" do
463
- expect(transaction).to receive(:set_action).with("Worker#perform")
461
+ it "sets the action" do
462
+ transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
463
+ expect(transaction.to_h["action"]).to eql("Worker#perform")
464
464
  end
465
465
  end
466
466
 
467
- after { transaction.set_http_or_background_action(from) }
467
+ context "when action is already set" do
468
+ it "does not overwrite the set action" do
469
+ transaction.set_action("MyCustomAction#perform")
470
+ transaction.set_http_or_background_action(:class => "Worker", :method => "perform")
471
+ expect(transaction.to_h["action"]).to eql("MyCustomAction#perform")
472
+ end
473
+ end
468
474
  end
469
475
 
470
476
  describe "set_queue_start" do
data/support/check_versions ADDED
@@ -0,0 +1,22 @@
1
+ #!/bin/bash
2
+
3
+ set -eu
4
+
5
+ actual_ruby_version=$(ruby --version)
6
+ if [[ "$actual_ruby_version" == *"jruby"* ]]; then
7
+ # Replace "-" from specified RUBY_VERSION string. Semaphore/rbenv version uses
8
+ # a dash, where `jruby --version` uses a space.
9
+ sanitized_ruby_version="${RUBY_VERSION//-/ }"
10
+ else
11
+ # Strip "-" from specified RUBY_VERSION string. Semaphore/rbenv version uses
12
+ # a dash, where `ruby --version` does not.
13
+ sanitized_ruby_version="${RUBY_VERSION//-}"
14
+ fi
15
+ if [[ "$actual_ruby_version" == *"$sanitized_ruby_version"* ]]; then
16
+ echo "Ruby version is $RUBY_VERSION"
17
+ exit 0
18
+ else
19
+ echo "Ruby version is: $actual_ruby_version"
20
+ echo "Ruby version should be: $sanitized_ruby_version"
21
+ exit 1
22
+ fi
data/support/install_deps CHANGED
@@ -2,20 +2,22 @@
2
2
 
3
3
  set -eu
4
4
 
5
+ gem_args="--no-document --no-verbose"
6
+
5
7
  case "${_RUBYGEMS_VERSION-"latest"}" in
6
8
  "latest")
7
- gem update --no-document --system
9
+ gem update $gem_args --system
8
10
  ;;
9
11
  *)
10
- gem update --no-document --system $_RUBYGEMS_VERSION
12
+ gem update $gem_args --system $_RUBYGEMS_VERSION
11
13
  ;;
12
14
  esac
13
15
 
14
16
  case "${_BUNDLER_VERSION-"latest"}" in
15
17
  "latest")
16
- gem update bundler --no-document
18
+ gem update bundler $gem_args
17
19
  ;;
18
20
  *)
19
- gem install bundler --no-document --version $_BUNDLER_VERSION
21
+ gem install bundler $gem_args --version $_BUNDLER_VERSION
20
22
  ;;
21
23
  esac
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.10.3
4
+ version: 2.10.4
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: 2020-02-21 00:00:00.000000000 Z
13
+ date: 2020-02-28 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rack
@@ -153,7 +153,7 @@ files:
153
153
  - ".rspec"
154
154
  - ".rubocop.yml"
155
155
  - ".rubocop_todo.yml"
156
- - ".travis.yml"
156
+ - ".semaphore/semaphore.yml"
157
157
  - ".yardopts"
158
158
  - CHANGELOG.md
159
159
  - CODE_OF_CONDUCT.md
@@ -382,6 +382,7 @@ files:
382
382
  - spec/support/stubs/sidekiq/api.rb
383
383
  - spec/support/testing.rb
384
384
  - support/bundler_wrapper
385
+ - support/check_versions
385
386
  - support/install_deps
386
387
  homepage: https://github.com/appsignal/appsignal-ruby
387
388
  licenses:
data/.travis.yml DELETED
@@ -1,197 +0,0 @@
1
- # DO NOT EDIT
2
- # This is a generated file by the `rake build_matrix:travis:generate` task.
3
- # See `build_matrix.yml` for the build matrix.
4
- # Generate this file with `rake build_matrix:travis:generate`.
5
- ---
6
- sudo: false
7
- branches:
8
- only:
9
- - master
10
- - develop
11
- language: ruby
12
- cache:
13
- directories:
14
- - "$TRAVIS_BUILD_DIR/vendor/cache"
15
- env:
16
- global:
17
- - BUNDLE_PATH=$TRAVIS_BUILD_DIR/vendor/cache
18
- - RUNNING_IN_CI=true
19
- - RAILS_ENV=test
20
- - JRUBY_OPTS=''
21
- before_install:
22
- - "./support/install_deps"
23
- install: "./support/bundler_wrapper install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-$TRAVIS_BUILD_DIR/vendor/cache}"
24
- before_script:
25
- - "./support/bundler_wrapper exec rake extension:install"
26
- script: "./support/bundler_wrapper exec rake test"
27
- after_failure:
28
- - find ./ext -name install.report -exec cat {} \;
29
- - find ./ext -name mkmf.log -exec cat {} \;
30
- matrix:
31
- fast_finish: true
32
- include:
33
- - rvm: 2.6.5
34
- gemfile: gemfiles/no_dependencies.gemfile
35
- before_script: ''
36
- script:
37
- - "./support/bundler_wrapper exec rake build_matrix:travis:validate"
38
- - "./support/bundler_wrapper exec rubocop"
39
- - rvm: 2.0.0
40
- gemfile: gemfiles/no_dependencies.gemfile
41
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
42
- - rvm: 2.0.0
43
- gemfile: gemfiles/capistrano2.gemfile
44
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
45
- - rvm: 2.0.0
46
- gemfile: gemfiles/capistrano3.gemfile
47
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
48
- - rvm: 2.0.0
49
- gemfile: gemfiles/grape.gemfile
50
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
51
- - rvm: 2.0.0
52
- gemfile: gemfiles/padrino.gemfile
53
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
54
- - rvm: 2.0.0
55
- gemfile: gemfiles/que.gemfile
56
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
57
- - rvm: 2.0.0
58
- gemfile: gemfiles/rails-3.2.gemfile
59
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
60
- - rvm: 2.0.0
61
- gemfile: gemfiles/rails-4.2.gemfile
62
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
63
- - rvm: 2.0.0
64
- gemfile: gemfiles/resque.gemfile
65
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=1.17.3
66
- - rvm: 2.0.0
67
- gemfile: gemfiles/sequel.gemfile
68
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
69
- - rvm: 2.0.0
70
- gemfile: gemfiles/sequel-435.gemfile
71
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
72
- - rvm: 2.0.0
73
- gemfile: gemfiles/sinatra.gemfile
74
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
75
- - rvm: 2.0.0
76
- gemfile: gemfiles/webmachine.gemfile
77
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
78
- - rvm: 2.1.8
79
- gemfile: gemfiles/no_dependencies.gemfile
80
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
81
- - rvm: 2.2.4
82
- gemfile: gemfiles/no_dependencies.gemfile
83
- env: _RUBYGEMS_VERSION=2.7.8 _BUNDLER_VERSION=latest
84
- - rvm: 2.3.8
85
- gemfile: gemfiles/no_dependencies.gemfile
86
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
87
- - rvm: 2.4.5
88
- gemfile: gemfiles/no_dependencies.gemfile
89
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
90
- - rvm: 2.5.3
91
- gemfile: gemfiles/no_dependencies.gemfile
92
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
93
- - rvm: 2.5.3
94
- gemfile: gemfiles/rails-5.2.gemfile
95
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
96
- - rvm: 2.6.5
97
- gemfile: gemfiles/no_dependencies.gemfile
98
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
99
- - rvm: 2.6.5
100
- gemfile: gemfiles/capistrano2.gemfile
101
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
102
- - rvm: 2.6.5
103
- gemfile: gemfiles/capistrano3.gemfile
104
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
105
- - rvm: 2.6.5
106
- gemfile: gemfiles/grape.gemfile
107
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
108
- - rvm: 2.6.5
109
- gemfile: gemfiles/padrino.gemfile
110
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
111
- - rvm: 2.6.5
112
- gemfile: gemfiles/que.gemfile
113
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
114
- - rvm: 2.6.5
115
- gemfile: gemfiles/que_beta.gemfile
116
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
117
- - rvm: 2.6.5
118
- gemfile: gemfiles/rails-5.0.gemfile
119
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
120
- - rvm: 2.6.5
121
- gemfile: gemfiles/rails-5.1.gemfile
122
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
123
- - rvm: 2.6.5
124
- gemfile: gemfiles/rails-5.2.gemfile
125
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
126
- - rvm: 2.6.5
127
- gemfile: gemfiles/rails-6.0.gemfile
128
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
129
- - rvm: 2.6.5
130
- gemfile: gemfiles/resque.gemfile
131
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
132
- - rvm: 2.6.5
133
- gemfile: gemfiles/sequel.gemfile
134
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
135
- - rvm: 2.6.5
136
- gemfile: gemfiles/sequel-435.gemfile
137
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
138
- - rvm: 2.6.5
139
- gemfile: gemfiles/sinatra.gemfile
140
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
141
- - rvm: 2.6.5
142
- gemfile: gemfiles/webmachine.gemfile
143
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
144
- - rvm: 2.7.0
145
- gemfile: gemfiles/no_dependencies.gemfile
146
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
147
- - rvm: 2.7.0
148
- gemfile: gemfiles/capistrano2.gemfile
149
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
150
- - rvm: 2.7.0
151
- gemfile: gemfiles/capistrano3.gemfile
152
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
153
- - rvm: 2.7.0
154
- gemfile: gemfiles/grape.gemfile
155
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
156
- - rvm: 2.7.0
157
- gemfile: gemfiles/padrino.gemfile
158
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
159
- - rvm: 2.7.0
160
- gemfile: gemfiles/que.gemfile
161
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
162
- - rvm: 2.7.0
163
- gemfile: gemfiles/que_beta.gemfile
164
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
165
- - rvm: 2.7.0
166
- gemfile: gemfiles/rails-5.0.gemfile
167
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
168
- - rvm: 2.7.0
169
- gemfile: gemfiles/rails-5.1.gemfile
170
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
171
- - rvm: 2.7.0
172
- gemfile: gemfiles/rails-5.2.gemfile
173
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
174
- - rvm: 2.7.0
175
- gemfile: gemfiles/rails-6.0.gemfile
176
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
177
- - rvm: 2.7.0
178
- gemfile: gemfiles/resque.gemfile
179
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=1.17.3
180
- - rvm: 2.7.0
181
- gemfile: gemfiles/sequel.gemfile
182
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
183
- - rvm: 2.7.0
184
- gemfile: gemfiles/sequel-435.gemfile
185
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
186
- - rvm: 2.7.0
187
- gemfile: gemfiles/sinatra.gemfile
188
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
189
- - rvm: 2.7.0
190
- gemfile: gemfiles/webmachine.gemfile
191
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
192
- - rvm: jruby-19mode
193
- gemfile: gemfiles/no_dependencies.gemfile
194
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest
195
- - rvm: jruby-19mode
196
- gemfile: gemfiles/rails-5.2.gemfile
197
- env: _RUBYGEMS_VERSION=latest _BUNDLER_VERSION=latest