elastic-apm 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bd7ac091a4707acf9c1467710981f195ab13698202e1ae22343de2715a4be9
-  data.tar.gz: 48fbd8f2300884f71c5ce2baa922f0c07635041e9312fbe6c4b51c0bc26cb815
+  metadata.gz: 21a3aac2c28d8806a3f8703746bc0cfb81620680c4daba5393bc27f88b15b213
+  data.tar.gz: 18faebc9de42ca039c12d5ce97791c51186d5bdabbf0276078a4906c415741dc
 SHA512:
-  metadata.gz: 6803e50e7b20f742aa3557343052b6eff4def7ae4cc51996a21deb31da5d4bb228183ffd29fb345a841165b262cdb4d42730e1ca4568499d0908ff43a36bb952
-  data.tar.gz: bb276941095c06b64b9108262aa8c9459c57e5f10ac8e0d95eba54ad7d2de564c9d28ce2f23a52e9295c815dabbe7c39105da11d1c2f583dddf0b5ec254e09dc
+  metadata.gz: 7fff60cded68fdac8b9b3dfdd0cbd88a2e7fc91007cfd80c78278281493c152ab0115e4145665e4b6bd3c946f4fd8956e5b4c4036a4bf14a6f7f1dd00024dce0
+  data.tar.gz: 7d87ef00a486b5bcc7d84f1c98ade6a3eb997f042685f608de3c6421762706ce20309aa8e1b6a9ac3a87b23f7d21a555ef9a5f87270ead7c0bb04290e87ea7d6

data/CHANGELOG.md

@@ -4,7 +4,17 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 1.0.0.beta1
+## 1.0.0.beta2 (2018-06-21)
+
+### Added
+
+- Added config.disable_send ([#156](https://github.com/elastic/apm-agent-ruby/pulls/156))
+
+### Fixed
+
+- Fixed some Elasticsearch spans not validating JSON Schema ([#157](https://github.com/elastic/apm-agent-ruby/pulls/157))
+
+## 1.0.0.beta1 (2018-06-14)
 
 ## 0.8.0 (2018-06-13)
 

data/README.md

@@ -1,9 +1,23 @@
 # elastic-apm
-## Elastic APM agent for ♦️Ruby (🚧 BETA)
+## Elastic APM agent for ♦️Ruby
 
 [![Jenkins](https://img.shields.io/jenkins/s/https/apm-ci.elastic.co/job/elastic+apm-agent-ruby+master.svg)](https://apm-ci.elastic.co/job/elastic+apm-agent-ruby+master/) [![Gem](https://img.shields.io/gem/v/elastic-apm.svg)](https://rubygems.org/gems/elastic-apm)
 
-This is the official Rubygem for [Elastic][] [APM][].
+The official Rubygem for [Elastic][] [APM][].
+
+**🚧 NB:** The current version of the agent is `1.0.0.beta1`. This means we're really close to `1.0.0`. The API is stable and the only remaining thing to do is testing. Thank you if you've already been testing the agent!
+
+To test the prerelease:
+
+```sh
+gem install elastic-apm --pre
+```
+
+or in your `Gemfile`:
+
+```ruby
+gem 'elastic-apm', '~> 1.0.0.beta1'
+```
 
 💡 We'd love to get feedback and information about you setup – please answer this [☑ short survey](https://goo.gl/forms/LQktvn4rkLWBNSWy1).
 
@@ -13,22 +27,20 @@ This is the official Rubygem for [Elastic][] [APM][].
 
 [Full documentation at Elasti.co](https://www.elastic.co/guide/en/apm/agent/ruby/index.html).
 
-<div>
 <ul>
-<li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/_introduction.html">Introduction</a></li>
+<li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/introduction.html">Introduction</a></li>
 <li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/getting-started-rails.html">Getting started with Rails</a></li>
 <li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/getting-started-rack.html">Getting started with Rack</a></li>
 <li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/configuration.html">Configuration</a></li>
-<li class="collapsible">
+<li>
 <a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/advanced.html">Advanced Topics</a>
 <ul>
 <li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/custom-instrumentation.html">Custom instrumentation</a></li>
-<li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/injectors.html">Injectors — automatic integrations with third-party libraries</a></li>
+<li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/spies.html">Spies — instrumented libraries</a></li>
 </ul>
 </li>
 <li><a href="https://www.elastic.co/guide/en/apm/agent/ruby/1.x/api.html">Public API</a></li>
 </ul>
-</div>
 
 ---
 

data/docs/configuration.asciidoc

@@ -284,10 +284,10 @@ storage use in your Elasticsearch cluster.
 [[config-span-frames-min-duration-ms]]
 ==== `span_frames_min_duration`
 
-| ============
-| Environment                            | `Config` keys              | Default
+|============
+| Environment                            | `Config` key               | Default
 | `ELASTIC_APM_SPAN_FRAMES_MIN_DURATION` | `span_frames_min_duration` | `-1`
-| ============
+|============
 
 In its default settings, the APM agent will collect a stack trace with every recorded span.
 While this is very helpful to find the exact place in your code that causes the span,
@@ -433,3 +433,13 @@ Eg. `ELASTIC_APM_IGNORE_URL_PATTERNS="a,b" # => [/a/, /b/]`
 
 Use this to filter error tracking for specific error constants.
 
+[float]
+[[config-disable-send]]
+==== `disable_send`
+|============
+| Environment | `Config` key   | Default
+| N/A         | `disable_send` | `false`
+|============
+
+Disables sending payloads to APM Server.
+

data/lib/elastic_apm/config.rb

@@ -25,6 +25,7 @@ module ElasticAPM
       transaction_max_spans: 500,
       filter_exception_types: [],
 
+      disable_send: false,
       http_read_timeout: 120,
       http_open_timeout: 60,
       debug_transactions: false,
@@ -93,6 +94,7 @@ module ElasticAPM
       'ELASTIC_APM_VERIFY_SERVER_CERT' => [:bool, 'verify_server_cert'],
       'ELASTIC_APM_TRANSACTION_MAX_SPANS' => [:int, 'transaction_max_spans'],
 
+      'ELASTIC_APM_DISABLE_SEND' => [:bool, 'disable_send'],
       'ELASTIC_APM_DISABLED_SPIES' => [:list, 'disabled_spies']
     }.freeze
 
@@ -135,6 +137,7 @@ module ElasticAPM
     attr_accessor :verify_server_cert
     attr_accessor :filter_exception_types
 
+    attr_accessor :disable_send
     attr_accessor :http_read_timeout
     attr_accessor :http_open_timeout
     attr_accessor :debug_transactions
@@ -164,6 +167,7 @@ module ElasticAPM
 
     alias :disable_environment_warning? :disable_environment_warning
     alias :verify_server_cert? :verify_server_cert
+    alias :disable_send? :disable_send
 
     def app=(app)
       case app_type?(app)

data/lib/elastic_apm/http.rb

@@ -40,6 +40,7 @@ module ElasticAPM
       request = prepare_request path, payload.to_json
       response = @adapter.perform request
 
+      return nil if response == HttpAdapter::DISABLED
       return response if response.is_a?(Net::HTTPSuccess)
 
       error 'POST returned an unsuccessful status code (%d)', response.code
@@ -85,6 +86,8 @@ module ElasticAPM
 
   # @api private
   class HttpAdapter
+    DISABLED = 'disabled'.freeze
+
     def initialize(conf)
       @config = conf
     end
@@ -96,6 +99,8 @@ module ElasticAPM
     end
 
     def perform(req)
+      return DISABLED if @config.disable_send?
+
       http.start do |http|
         http.request req
       end

data/lib/elastic_apm/normalizers/active_record.rb

@@ -20,7 +20,7 @@ module ElasticAPM
           return :skip if %w[SCHEMA CACHE].include?(payload[:name])
 
           name = summarize(payload[:sql]) || payload[:name]
-          context = Span::Context.new(statement: payload[:sql].to_s)
+          context = Span::Context.new(statement: payload[:sql], type: 'sql')
           [name, @type, context]
         end
 

data/lib/elastic_apm/span/context.rb

@@ -6,7 +6,7 @@ module ElasticAPM
     class Context
       include NaivelyHashable
 
-      def initialize(**args)
+      def initialize(args)
         args.each do |key, val|
           send(:"#{key}=", val)
         end

data/lib/elastic_apm/spies/elasticsearch.rb

@@ -8,13 +8,15 @@ module ElasticAPM
       NAME_FORMAT = '%s %s'.freeze
       TYPE = 'db.elasticsearch'.freeze
 
+      # rubocop:disable Metrics/MethodLength
       def install
         ::Elasticsearch::Transport::Client.class_eval do
           alias perform_request_without_apm perform_request
 
           def perform_request(method, path, *args, &block)
             name = format(NAME_FORMAT, method, path)
-            context = Span::Context.new(statement: args[0])
+            statement = args[0].is_a?(String) ? args[0] : args[0].to_json
+            context = Span::Context.new(statement: statement)
 
             ElasticAPM.span name, TYPE, context: context do
               perform_request_without_apm(method, path, *args, &block)
@@ -22,6 +24,7 @@ module ElasticAPM
           end
         end
       end
+      # rubocop:enable Metrics/MethodLength
     end
 
     register(

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '1.0.0.beta1'.freeze
+  VERSION = '1.0.0.beta2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby