elastic-apm 3.3.0 → 3.4.0

data/lib/elastic_apm/sql/tokens.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  module Sql
+    # @api private
+    module Tokens
+      OTHER = :OTHER
+      COMMENT = :COMMENT
+      IDENT = :IDENT
+      NUMBER = :NUMBER
+      STRING = :STRING
+
+      PERIOD = :PERIOD
+      COMMA = :COMMA
+      LPAREN = :LPAREN
+      RPAREN = :RPAREN
+
+      AS = :AS
+      CALL = :CALL
+      DELETE = :DELETE
+      FROM = :FROM
+      INSERT = :INSERT
+      INTO = :INTO
+      OR = :OR
+      REPLACE = :REPLACE
+      SELECT = :SELECT
+      SET = :SET
+      TABLE = :TABLE
+      TRUNCATE = :TRUNCATE
+      UPDATE = :UPDATE
+
+      KEYWORDS = {
+        2 => [AS, OR],
+        3 => [SET],
+        4 => [CALL, FROM, INTO],
+        5 => [TABLE],
+        6 => [DELETE, INSERT, SELECT, UPDATE],
+        7 => [REPLACE],
+        8 => [TRUNCATE]
+      }.freeze
+
+      KEYWORD_MIN_LENGTH = KEYWORDS.keys.first
+      KEYWORD_MAX_LENGTH = KEYWORDS.keys.last
+    end
+  end
+end

data/lib/elastic_apm/sql_summarizer.rb

@@ -18,14 +18,13 @@ module ElasticAPM
     }.freeze
 
     FORMAT = '%s%s'
-    UTF8 = 'UTF-8'
 
     def self.cache
       @cache ||= Util::LruCache.new
     end
 
     def summarize(sql)
-      sql = sql.encode(UTF8, invalid: :replace, undef: :replace)
+      sql = sql.encode('utf-8', invalid: :replace, undef: :replace)
       self.class.cache[sql] ||=
         REGEXES.find do |regex, sig|
           if (match = sql[0...1000].match(regex))

data/lib/elastic_apm/transaction.rb

@@ -10,6 +10,7 @@ module ElasticAPM
       :trace_id, :parent_id, :id, :ensure_parent_id
 
     DEFAULT_TYPE = 'custom'
+    MUTEX = Mutex.new
 
     # rubocop:disable Metrics/ParameterLists
     def initialize(
@@ -78,21 +79,20 @@ module ElasticAPM
     # spans
 
     def inc_started_spans!
-      @started_spans += 1
-    end
-
-    def inc_dropped_spans!
-      @dropped_spans += 1
-    end
-
-    def max_spans_reached?
-      started_spans > config.transaction_max_spans
+      MUTEX.synchronize do
+        @started_spans += 1
+        if @started_spans > config.transaction_max_spans
+          @dropped_spans += 1
+          return false
+        end
+      end
+      true
     end
 
     # context
 
-    def add_response(*args)
-      context.response = Context::Response.new(*args)
+    def add_response(status = nil, **args)
+      context.response = Context::Response.new(status, **args)
     end
 
     def set_user(user)

data/lib/elastic_apm/transport/connection/proxy_pipe.rb

@@ -62,8 +62,8 @@ module ElasticAPM
           end
         end
 
-        def self.pipe(*args)
-          pipe = new(*args)
+        def self.pipe(**args)
+          pipe = new(**args)
           [pipe.read, pipe.write]
         end
       end

data/lib/elastic_apm/transport/headers.rb

@@ -55,6 +55,10 @@ module ElasticAPM
           headers[:Authorization] = "Bearer #{token}"
         end
 
+        if (api_key = @config.api_key)
+          headers[:Authorization] = "ApiKey #{api_key}"
+        end
+
         headers
       end
     end

data/lib/elastic_apm/transport/serializers/span_serializer.rb

@@ -12,6 +12,7 @@ module ElasticAPM
         end
 
         attr_reader :context_serializer
+
         def build(span)
           {
             span: {
@@ -31,20 +32,28 @@ module ElasticAPM
 
         # @api private
         class ContextSerializer < Serializer
+          # rubocop:disable Metrics/CyclomaticComplexity
           def build(context)
             return unless context
 
-            { sync: context.sync }.tap do |base|
-              base[:db] = build_db(context.db) if context.db
-              base[:http] = build_http(context.http) if context.http
+            base = {}
+
+            base[:tags] = mixed_object(context.labels) if context.labels.any?
+            base[:sync] = context.sync unless context.sync.nil?
+            base[:db] = build_db(context.db) if context.db
+            base[:http] = build_http(context.http) if context.http
+
+            if context.destination
+              base[:destination] = build_destination(context.destination)
             end
+
+            base
           end
+          # rubocop:enable Metrics/CyclomaticComplexity
 
           private
 
           def build_db(db)
-            return unless db
-
             {
               instance: db.instance,
               statement: Util.truncate(db.statement, max_length: 10_000),
@@ -54,14 +63,22 @@ module ElasticAPM
           end
 
           def build_http(http)
-            return unless http
-
             {
               url: http.url,
               status_code: http.status_code.to_i,
               method: keyword_field(http.method)
             }
           end
+
+          def build_destination(destination)
+            {
+              service: {
+                name: keyword_field(destination.name),
+                resource: keyword_field(destination.resource),
+                type: keyword_field(destination.type)
+              }
+            }
+          end
         end
 
         private

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -59,7 +59,9 @@ files:
 - ".ci/jobs/defaults.yml"
 - ".ci/linting.groovy"
 - ".ci/prepare-git-context.sh"
-- ".github/workflows/main.yml"
+- ".github/ISSUE_TEMPLATE/Bug_report.md"
+- ".github/ISSUE_TEMPLATE/Feature_request.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -78,6 +80,7 @@ files:
 - bench/benchmark.rb
 - bench/report.rb
 - bench/rubyprof.rb
+- bench/sql.rb
 - bench/stackprof.rb
 - bench/tmp/.gitkeep
 - bin/build_docs
@@ -86,6 +89,7 @@ files:
 - bin/run-tests
 - bin/setup
 - bin/with_framework
+- codecov.yml
 - docker-compose.yml
 - docs/advanced.asciidoc
 - docs/api.asciidoc
@@ -162,6 +166,9 @@ files:
 - lib/elastic_apm/sinatra.rb
 - lib/elastic_apm/span.rb
 - lib/elastic_apm/span/context.rb
+- lib/elastic_apm/span/context/db.rb
+- lib/elastic_apm/span/context/destination.rb
+- lib/elastic_apm/span/context/http.rb
 - lib/elastic_apm/span_helpers.rb
 - lib/elastic_apm/spies.rb
 - lib/elastic_apm/spies/action_dispatch.rb
@@ -175,9 +182,15 @@ files:
 - lib/elastic_apm/spies/rake.rb
 - lib/elastic_apm/spies/redis.rb
 - lib/elastic_apm/spies/sequel.rb
+- lib/elastic_apm/spies/shoryuken.rb
 - lib/elastic_apm/spies/sidekiq.rb
 - lib/elastic_apm/spies/sinatra.rb
+- lib/elastic_apm/spies/sneakers.rb
 - lib/elastic_apm/spies/tilt.rb
+- lib/elastic_apm/sql.rb
+- lib/elastic_apm/sql/signature.rb
+- lib/elastic_apm/sql/tokenizer.rb
+- lib/elastic_apm/sql/tokens.rb
 - lib/elastic_apm/sql_summarizer.rb
 - lib/elastic_apm/stacktrace.rb
 - lib/elastic_apm/stacktrace/frame.rb

data/.github/workflows/main.yml

@@ -1,14 +0,0 @@
-name: Lint
-
-on: [push]
-
-jobs:
-  build:
-    name: Rubocop
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - name: Rubocop checks
-      uses: mikker/rubocop-action@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}