appsignal 3.13.3 → 4.0.0.beta.1

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 (126) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +499 -488
  3. data/CHANGELOG.md +86 -36
  4. data/Rakefile +31 -7
  5. data/benchmark.rake +4 -6
  6. data/build_matrix.yml +46 -40
  7. data/ext/agent.rb +30 -30
  8. data/ext/appsignal_extension.c +25 -0
  9. data/gemfiles/grape.gemfile +1 -5
  10. data/gemfiles/rails-6.0.gemfile +0 -4
  11. data/gemfiles/rails-6.1.gemfile +0 -4
  12. data/gemfiles/rails-7.1.gemfile +1 -6
  13. data/gemfiles/rails-7.2.gemfile +11 -0
  14. data/lib/appsignal/check_in/cron.rb +2 -15
  15. data/lib/appsignal/cli/diagnose.rb +37 -28
  16. data/lib/appsignal/cli/install.rb +5 -1
  17. data/lib/appsignal/config.rb +57 -119
  18. data/lib/appsignal/demo.rb +2 -2
  19. data/lib/appsignal/extension/jruby.rb +14 -0
  20. data/lib/appsignal/helpers/instrumentation.rb +139 -417
  21. data/lib/appsignal/helpers/metrics.rb +0 -16
  22. data/lib/appsignal/hooks/action_cable.rb +8 -8
  23. data/lib/appsignal/hooks/active_job.rb +2 -2
  24. data/lib/appsignal/hooks/at_exit.rb +37 -0
  25. data/lib/appsignal/hooks.rb +1 -16
  26. data/lib/appsignal/integrations/action_cable.rb +2 -2
  27. data/lib/appsignal/integrations/capistrano/appsignal.cap +2 -4
  28. data/lib/appsignal/integrations/capistrano/capistrano_2_tasks.rb +1 -4
  29. data/lib/appsignal/integrations/delayed_job_plugin.rb +3 -3
  30. data/lib/appsignal/integrations/que.rb +2 -2
  31. data/lib/appsignal/integrations/railtie.rb +26 -59
  32. data/lib/appsignal/integrations/rake.rb +2 -2
  33. data/lib/appsignal/integrations/resque.rb +2 -2
  34. data/lib/appsignal/integrations/shoryuken.rb +4 -4
  35. data/lib/appsignal/integrations/sidekiq.rb +3 -3
  36. data/lib/appsignal/integrations/webmachine.rb +2 -2
  37. data/lib/appsignal/loaders.rb +1 -1
  38. data/lib/appsignal/probes.rb +0 -9
  39. data/lib/appsignal/rack/abstract_middleware.rb +4 -26
  40. data/lib/appsignal/rack/body_wrapper.rb +0 -12
  41. data/lib/appsignal/rack/event_handler.rb +4 -4
  42. data/lib/appsignal/rack/rails_instrumentation.rb +1 -1
  43. data/lib/appsignal/rack.rb +0 -25
  44. data/lib/appsignal/sample_data.rb +95 -0
  45. data/lib/appsignal/transaction.rb +235 -361
  46. data/lib/appsignal/utils/rails_helper.rb +4 -0
  47. data/lib/appsignal/version.rb +1 -1
  48. data/lib/appsignal.rb +19 -71
  49. data/resources/cacert.pem +1046 -528
  50. data/spec/lib/appsignal/auth_check_spec.rb +1 -1
  51. data/spec/lib/appsignal/capistrano2_spec.rb +1 -1
  52. data/spec/lib/appsignal/capistrano3_spec.rb +53 -13
  53. data/spec/lib/appsignal/check_in_spec.rb +1 -207
  54. data/spec/lib/appsignal/cli/demo_spec.rb +7 -27
  55. data/spec/lib/appsignal/cli/diagnose_spec.rb +148 -121
  56. data/spec/lib/appsignal/config_spec.rb +304 -379
  57. data/spec/lib/appsignal/extension_install_failure_spec.rb +5 -1
  58. data/spec/lib/appsignal/extension_spec.rb +5 -1
  59. data/spec/lib/appsignal/hooks/active_support_notifications/instrument_shared_examples.rb +1 -1
  60. data/spec/lib/appsignal/hooks/active_support_notifications/start_finish_shared_examples.rb +1 -2
  61. data/spec/lib/appsignal/hooks/active_support_notifications_spec.rb +1 -0
  62. data/spec/lib/appsignal/hooks/activejob_spec.rb +7 -12
  63. data/spec/lib/appsignal/hooks/at_exit_spec.rb +72 -0
  64. data/spec/lib/appsignal/hooks/gvl_spec.rb +10 -5
  65. data/spec/lib/appsignal/hooks/http_spec.rb +3 -3
  66. data/spec/lib/appsignal/hooks/net_http_spec.rb +3 -3
  67. data/spec/lib/appsignal/hooks/rake_spec.rb +6 -9
  68. data/spec/lib/appsignal/hooks/redis_client_spec.rb +5 -10
  69. data/spec/lib/appsignal/hooks/redis_spec.rb +4 -7
  70. data/spec/lib/appsignal/hooks/resque_spec.rb +3 -5
  71. data/spec/lib/appsignal/hooks_spec.rb +0 -41
  72. data/spec/lib/appsignal/integrations/data_mapper_spec.rb +29 -20
  73. data/spec/lib/appsignal/integrations/delayed_job_plugin_spec.rb +4 -9
  74. data/spec/lib/appsignal/integrations/railtie_spec.rb +179 -157
  75. data/spec/lib/appsignal/integrations/shoryuken_spec.rb +3 -5
  76. data/spec/lib/appsignal/integrations/sidekiq_spec.rb +48 -62
  77. data/spec/lib/appsignal/loaders/hanami_spec.rb +6 -9
  78. data/spec/lib/appsignal/loaders/padrino_spec.rb +6 -10
  79. data/spec/lib/appsignal/loaders/sinatra_spec.rb +6 -9
  80. data/spec/lib/appsignal/loaders_spec.rb +8 -1
  81. data/spec/lib/appsignal/marker_spec.rb +1 -1
  82. data/spec/lib/appsignal/probes_spec.rb +4 -83
  83. data/spec/lib/appsignal/rack/abstract_middleware_spec.rb +4 -63
  84. data/spec/lib/appsignal/rack/body_wrapper_spec.rb +0 -48
  85. data/spec/lib/appsignal/rack/event_handler_spec.rb +18 -15
  86. data/spec/lib/appsignal/rack/rails_instrumentation_spec.rb +3 -11
  87. data/spec/lib/appsignal/rack/sinatra_instrumentation_spec.rb +4 -5
  88. data/spec/lib/appsignal/sample_data_spec.rb +174 -0
  89. data/spec/lib/appsignal/transaction_spec.rb +791 -1031
  90. data/spec/lib/appsignal/transmitter_spec.rb +6 -8
  91. data/spec/lib/appsignal_spec.rb +294 -643
  92. data/spec/spec_helper.rb +1 -3
  93. data/spec/support/fixtures/projects/valid/config/appsignal.yml +4 -7
  94. data/spec/support/fixtures/projects/valid_with_rails_app/config/application.rb +16 -0
  95. data/spec/support/fixtures/projects/valid_with_rails_app/config/appsignal.yml +56 -0
  96. data/spec/support/fixtures/projects/valid_with_rails_app/config/environment.rb +5 -0
  97. data/spec/support/helpers/api_request_helper.rb +3 -2
  98. data/spec/support/helpers/config_helpers.rb +40 -10
  99. data/spec/support/helpers/dependency_helper.rb +8 -0
  100. data/spec/support/helpers/log_helpers.rb +1 -0
  101. data/spec/support/helpers/rails_helper.rb +6 -6
  102. data/spec/support/helpers/transaction_helpers.rb +2 -24
  103. data/spec/support/matchers/transaction.rb +3 -3
  104. data/spec/support/mocks/appsignal_mock.rb +3 -3
  105. data/spec/support/mocks/mock_probe.rb +2 -0
  106. data/spec/support/testing.rb +2 -2
  107. metadata +15 -22
  108. data/gemfiles/que_beta.gemfile +0 -5
  109. data/lib/appsignal/helpers/heartbeat.rb +0 -20
  110. data/lib/appsignal/integrations/grape.rb +0 -35
  111. data/lib/appsignal/integrations/hanami.rb +0 -13
  112. data/lib/appsignal/integrations/padrino.rb +0 -13
  113. data/lib/appsignal/integrations/sinatra.rb +0 -13
  114. data/lib/appsignal/rack/generic_instrumentation.rb +0 -22
  115. data/lib/appsignal/rack/streaming_listener.rb +0 -28
  116. data/spec/lib/appsignal/integrations/grape_spec.rb +0 -36
  117. data/spec/lib/appsignal/integrations/hanami_spec.rb +0 -17
  118. data/spec/lib/appsignal/integrations/padrino_spec.rb +0 -15
  119. data/spec/lib/appsignal/integrations/sinatra_spec.rb +0 -15
  120. data/spec/lib/appsignal/rack/generic_instrumentation_spec.rb +0 -81
  121. data/spec/lib/appsignal/rack/streaming_listener_spec.rb +0 -69
  122. data/spec/support/fixtures/projects/valid/config/environments/development.rb +0 -0
  123. data/spec/support/fixtures/projects/valid/config/environments/production.rb +0 -0
  124. data/spec/support/fixtures/projects/valid/config/environments/test.rb +0 -0
  125. data/spec/support/rails/my_app.rb +0 -6
  126. /data/spec/support/fixtures/projects/{valid/config/application.rb → valid_with_rails_app/log/.gitkeep} +0 -0
@@ -15,6 +15,10 @@ module Appsignal
15
15
  def self.application_config_path
16
16
  File.expand_path(File.join(Dir.pwd, "config/application.rb"))
17
17
  end
18
+
19
+ def self.environment_config_path
20
+ File.expand_path(File.join(Dir.pwd, "config/environment.rb"))
21
+ end
18
22
  end
19
23
  end
20
24
  end
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Appsignal
4
- VERSION = "3.13.3"
4
+ VERSION = "4.0.0.beta.1"
5
5
  end
data/lib/appsignal.rb CHANGED
@@ -6,7 +6,6 @@ require "stringio"
6
6
 
7
7
  require "appsignal/logger"
8
8
  require "appsignal/utils/stdout_and_logger_message"
9
- require "appsignal/helpers/heartbeat"
10
9
  require "appsignal/helpers/instrumentation"
11
10
  require "appsignal/helpers/metrics"
12
11
 
@@ -18,7 +17,6 @@ require "appsignal/helpers/metrics"
18
17
  # {Appsignal::Helpers::Metrics}) for ease of use.
19
18
  module Appsignal
20
19
  class << self
21
- include Helpers::Heartbeat
22
20
  include Helpers::Instrumentation
23
21
  include Helpers::Metrics
24
22
 
@@ -36,26 +34,6 @@ module Appsignal
36
34
  # @see Config
37
35
  attr_reader :config
38
36
 
39
- # Set the AppSignal config.
40
- #
41
- # @deprecated Use {Appsignal.configure} instead.
42
- # @param conf [Appsignal::Config]
43
- # @return [void]
44
- # @see Config
45
- def config=(conf)
46
- Appsignal::Utils::StdoutAndLoggerMessage.warning \
47
- "Configuring AppSignal with `Appsignal.config=` is deprecated. " \
48
- "Use `Appsignal.configure { |config| ... }` to configure AppSignal. " \
49
- "https://docs.appsignal.com/ruby/configuration.html\n" \
50
- "#{caller.first}"
51
- @config = conf
52
- end
53
-
54
- # @api private
55
- def _config=(conf)
56
- @config = conf
57
- end
58
-
59
37
  # Accessor for toggle if the AppSignal C-extension is loaded.
60
38
  #
61
39
  # Can be `nil` if extension has not been loaded yet. See
@@ -113,7 +91,17 @@ module Appsignal
113
91
  #
114
92
  # @return [void]
115
93
  # @since 0.7.0
116
- def start
94
+ def start # rubocop:disable Metrics/AbcSize
95
+ if ENV.fetch("_APPSIGNAL_DIAGNOSE", false)
96
+ internal_logger.warn("Skipping start in diagnose context")
97
+ return
98
+ end
99
+
100
+ if started?
101
+ internal_logger.warn("Ignoring call to Appsignal.start after AppSignal has started")
102
+ return
103
+ end
104
+
117
105
  unless extension_loaded?
118
106
  internal_logger.info("Not starting AppSignal, extension is not loaded")
119
107
  return
@@ -122,6 +110,7 @@ module Appsignal
122
110
  internal_logger.debug("Loading AppSignal gem")
123
111
 
124
112
  @config ||= Config.new(Config.determine_root_path, Config.determine_env)
113
+ @config.validate
125
114
 
126
115
  _start_logger
127
116
 
@@ -143,6 +132,7 @@ module Appsignal
143
132
  Appsignal::Probes.start if config[:enable_minutely_probes]
144
133
 
145
134
  collect_environment_metadata
135
+ @config.freeze
146
136
  else
147
137
  internal_logger.info("Not starting, not active for #{config.env}")
148
138
  end
@@ -251,20 +241,15 @@ module Appsignal
251
241
  @config = Config.new(
252
242
  root_path || Config.determine_root_path,
253
243
  Config.determine_env(env),
254
- {},
255
- Appsignal.internal_logger,
256
- nil,
257
- false
244
+ Appsignal.internal_logger
258
245
  )
259
- config.load_config
260
246
  end
261
247
 
262
248
  config_dsl = Appsignal::Config::ConfigDSL.new(config)
263
- if block_given?
264
- yield config_dsl
265
- config.merge_dsl_options(config_dsl.dsl_options)
266
- end
267
- config.validate
249
+ return unless block_given?
250
+
251
+ yield config_dsl
252
+ config.merge_dsl_options(config_dsl.dsl_options)
268
253
  end
269
254
 
270
255
  def forked
@@ -334,18 +319,6 @@ module Appsignal
334
319
  end
335
320
  end
336
321
 
337
- # @deprecated Only {.start} has to be called.
338
- # @return [void]
339
- # @since 0.7.0
340
- def start_logger
341
- callers = caller
342
- Appsignal::Utils::StdoutAndLoggerMessage.warning \
343
- "Calling 'Appsignal.start_logger' is deprecated. " \
344
- "The logger will be started when calling 'Appsignal.start'. " \
345
- "Remove the 'Appsignal.start_logger' call in the following file to " \
346
- "remove this message.\n#{callers.first}"
347
- end
348
-
349
322
  # Start the AppSignal internal logger.
350
323
  #
351
324
  # Sets the log level and sets the logger. Uses a file-based logger or the
@@ -449,36 +422,11 @@ module Appsignal
449
422
  end
450
423
  Appsignal::Environment.report_supported_gems
451
424
  end
452
-
453
- # Alias constants that have moved with a warning message that points to the
454
- # place to update the reference.
455
- def const_missing(name)
456
- case name
457
- when :Minutely
458
- callers = caller
459
- Appsignal::Utils::StdoutAndLoggerMessage.warning \
460
- "The constant Appsignal::Minutely has been deprecated. " \
461
- "Please update the constant name to Appsignal::Probes " \
462
- "in the following file to remove this message.\n#{callers.first}"
463
- Appsignal::Probes
464
- when :Heartbeat
465
- unless @heartbeat_constant_deprecation_warning_emitted
466
- callers = caller
467
- Appsignal::Utils::StdoutAndLoggerMessage.warning \
468
- "The constant Appsignal::Heartbeat has been deprecated. " \
469
- "Please update the constant name to Appsignal::CheckIn::Cron " \
470
- "in the following file and elsewhere to remove this message.\n#{callers.first}"
471
- @heartbeat_constant_deprecation_warning_emitted = true
472
- end
473
- Appsignal::CheckIn::Cron
474
- else
475
- super
476
- end
477
- end
478
425
  end
479
426
  end
480
427
 
481
428
  require "appsignal/loaders"
429
+ require "appsignal/sample_data"
482
430
  require "appsignal/environment"
483
431
  require "appsignal/system"
484
432
  require "appsignal/utils"