elastic-apm 4.5.1 → 4.7.2

data/lib/elastic_apm/spies/racecar.rb

@@ -0,0 +1,77 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+begin
+require 'active_support/notifications'
+require 'active_support/subscriber'
+
+  # frozen_string_literal: true
+  module ElasticAPM
+    # @api private
+    module Spies
+      # @api private
+      class RacecarSpy
+        TYPE = 'kafka'
+        SUBTYPE = 'racecar'
+
+        # @api private
+        class ConsumerSubscriber < ActiveSupport::Subscriber
+          def start_process_message(event)
+            start_process_transaction(event: event, kind: 'process_message')
+          end
+          def process_message(_event)
+            ElasticAPM.end_transaction
+          end
+
+          def start_process_batch(event)
+            start_process_transaction(event: event, kind: 'process_batch')
+          end
+          def process_batch(_event)
+            ElasticAPM.end_transaction
+          end
+
+          private # only public methods will be subscribed
+
+          def start_process_transaction(event:, kind:)
+            ElasticAPM.start_transaction(kind, TYPE)
+            ElasticAPM.current_transaction.context.set_service(framework_name: 'racecar', framework_version: Racecar::VERSION)
+          end
+        end
+
+        class ProducerSubscriber < ActiveSupport::Subscriber
+          def start_deliver_message(event)
+            ElasticAPM.start_transaction('deliver_message',TYPE)
+            ElasticAPM.current_transaction.context.set_service(framework_name: 'racecar', framework_version: Racecar::VERSION)
+          end
+
+          def deliver_message(_event)
+            ElasticAPM.end_transaction
+          end
+        end
+
+        def install
+          ConsumerSubscriber.attach_to(:racecar)
+          ProducerSubscriber.attach_to(:racecar)
+        end
+      end
+      register 'Racecar', 'racecar', RacecarSpy.new
+    end
+  end
+
+rescue LoadError
+  # no active support available
+end

data/lib/elastic_apm/spies/redis.rb

@@ -25,7 +25,7 @@ module ElasticAPM
       # @api private
       module Ext
         def call(command, &block)
-          name = command[0].upcase
+          name = command[0].to_s.upcase
 
           return super(command, &block) if command[0] == :auth
 

data/lib/elastic_apm/spies/sequel.rb

@@ -44,8 +44,17 @@ module ElasticAPM
           name =
             ElasticAPM::Spies::SequelSpy.summarizer.summarize sql
 
+          db_name = ''
+          # postgresql shows current database
+          db_name = connection&.db.to_s if connection.respond_to?(:db)
+          # sqlite may expose a filename
+          db_name = connection&.filename.to_s if db_name == '' && connection.respond_to?(:filename)
+          # fall back to adapter class name
+          db_name = connection.class.to_s if db_name == ''
+
           context = ElasticAPM::Span::Context.new(
             db: { statement: sql, type: 'sql', user: opts[:user] },
+            service: {target: {type: subtype, name: db_name }},
             destination: { service: { resource: subtype } }
           )
 

data/lib/elastic_apm/spies/sqs.rb

@@ -56,6 +56,7 @@ module ElasticAPM
             service: { resource: "#{SUBTYPE}/#{queue_name}" },
             cloud: { region: region }
           }
+          # span links added here?
         )
       end
 

data/lib/elastic_apm/trace_context/tracestate.rb

@@ -92,6 +92,8 @@ module ElasticAPM
 
       extend Forwardable
 
+      ENTRY_SPLIT_REGEX = /\s*[\n,]+\s*/
+
       def initialize(entries: {}, sample_rate: nil)
         @entries = entries
 
@@ -107,7 +109,7 @@ module ElasticAPM
           split_by_nl_and_comma(header)
           .each_with_object({}) do |entry, hsh|
             k, v = entry.split('=')
-
+            next unless k && v && !k.empty? && !v.empty?
             hsh[k] =
               case k
               when 'es' then EsEntry.new(v)
@@ -140,7 +142,7 @@ module ElasticAPM
           # Rack handles this by joining the headers under the same key,
           # separated by newlines.
           # See https://www.rubydoc.info/github/rack/rack/file/SPEC
-          String(str).split("\n").map { |s| s.split(',') }.flatten
+          String(str).split(ENTRY_SPLIT_REGEX).flatten
         end
       end
     end

data/lib/elastic_apm/trace_context.rb

@@ -96,7 +96,7 @@ module ElasticAPM
     def apply_headers
       yield 'Traceparent', traceparent.to_header
 
-      if tracestate
+      if tracestate && !tracestate.to_header.empty?
         yield 'Tracestate', tracestate.to_header
       end
 

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

@@ -75,7 +75,15 @@ module ElasticAPM
           @closed.make_true
 
           @wr&.close
-          return if @request.nil? || @request&.join(5)
+
+          if @request&.join(5)
+            @rd&.close
+            return
+          end
+
+          @rd&.close
+
+          return if @request.nil?
 
           error(
             '%s: APM Server not responding in time, terminating request',
@@ -117,8 +125,6 @@ module ElasticAPM
               error(
                 "Couldn't establish connection to APM Server:\n%p", e.inspect
               )
-            ensure
-              @rd&.close
             end
           end
         end

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

@@ -69,6 +69,14 @@ module ElasticAPM
               base[:message] = build_message(context.message)
             end
 
+            if context.service
+              base[:service] = build_service(context.service)
+            end
+
+            if context.links && !context.links.empty?
+              base[:links] = build_links(context.links)
+            end
+
             base
           end
 
@@ -121,6 +129,23 @@ module ElasticAPM
               }
             }
           end
+
+          def build_service(service)
+            {
+              target: {
+                name: keyword_field(service.target&.name),
+                type: keyword_field(service.target&.type)
+              }
+            }
+          end
+
+          def build_links(links)
+            {
+              links: links.map do |link|
+                {"trace_id" => link.trace_id, "span_id" => link.span_id}
+              end
+            }
+          end
         end
 
         private

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '4.5.1'
+  VERSION = '4.7.2'
 end

data/lib/elastic_apm.rb

@@ -26,6 +26,7 @@ require 'logger'
 require 'concurrent'
 require 'forwardable'
 require 'securerandom'
+require 'ruby2_keywords'
 
 require 'elastic_apm/version'
 require 'elastic_apm/internal_error'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.7.2
 platform: ruby
 authors:
 - Mikkel Malmberg
+- Emily Stolfo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-17 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -38,19 +39,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
-- mikkel@elastic.co
+- info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ci/.jenkins_codecov.yml"
-- ".ci/.jenkins_exclude.yml"
-- ".ci/.jenkins_framework.yml"
-- ".ci/.jenkins_main_framework.yml"
-- ".ci/.jenkins_ruby.yml"
-- ".ci/Jenkinsfile"
+- ".ci/.codecov.yml"
+- ".ci/.exclude.yml"
+- ".ci/.framework.yml"
+- ".ci/.main_framework.yml"
+- ".ci/.ruby.yml"
 - ".ci/docker/jruby/11-jdk/Dockerfile"
 - ".ci/docker/jruby/12-jdk/Dockerfile"
 - ".ci/docker/jruby/13-jdk/Dockerfile"
@@ -59,20 +73,30 @@ files:
 - ".ci/docker/jruby/README.md"
 - ".ci/docker/jruby/run.sh"
 - ".ci/docker/jruby/test.sh"
-- ".ci/jobs/apm-agent-ruby-downstream.yml"
-- ".ci/jobs/apm-agent-ruby-linting-mbp.yml"
-- ".ci/jobs/apm-agent-ruby-mbp.yml"
-- ".ci/jobs/apm-agent-ruby.yml"
-- ".ci/jobs/defaults.yml"
-- ".ci/linting.groovy"
-- ".ci/packer_cache.sh"
+- ".ci/scripts/bench.sh"
+- ".ci/scripts/install-build-system.sh"
+- ".ci/snapshoty.yml"
+- ".ci/updatecli.d/update-gherkin-specs.yml"
+- ".ci/updatecli.d/update-json-specs.yml"
+- ".ci/updatecli.d/update-specs.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/dependabot.yml"
 - ".github/labeler-config.yml"
+- ".github/workflows/README.md"
 - ".github/workflows/addToProject.yml"
+- ".github/workflows/ci-docs.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/coverage-reporter.yml"
 - ".github/workflows/labeler.yml"
+- ".github/workflows/microbenchmark.yml"
+- ".github/workflows/opentelemetry.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/run-matrix.yml"
+- ".github/workflows/snapshoty.yml"
+- ".github/workflows/test-reporter.yml"
+- ".github/workflows/updatecli.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -114,10 +138,11 @@ files:
 - docs/images/dynamic-config.svg
 - docs/index.asciidoc
 - docs/introduction.asciidoc
-- docs/log-correlation.asciidoc
+- docs/logs.asciidoc
 - docs/metrics.asciidoc
 - docs/opentracing.asciidoc
 - docs/performance-tuning.asciidoc
+- docs/redirects.asciidoc
 - docs/release-notes.asciidoc
 - docs/set-up.asciidoc
 - docs/supported-technologies.asciidoc
@@ -136,6 +161,7 @@ files:
 - lib/elastic_apm/config/options.rb
 - lib/elastic_apm/config/regexp_list.rb
 - lib/elastic_apm/config/round_float.rb
+- lib/elastic_apm/config/server_info.rb
 - lib/elastic_apm/config/wildcard_pattern_list.rb
 - lib/elastic_apm/context.rb
 - lib/elastic_apm/context/request.rb
@@ -192,7 +218,9 @@ files:
 - 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/context/links.rb
 - lib/elastic_apm/span/context/message.rb
+- lib/elastic_apm/span/context/service.rb
 - lib/elastic_apm/span_helpers.rb
 - lib/elastic_apm/spies.rb
 - lib/elastic_apm/spies/action_dispatch.rb
@@ -205,6 +233,7 @@ files:
 - lib/elastic_apm/spies/json.rb
 - lib/elastic_apm/spies/mongo.rb
 - lib/elastic_apm/spies/net_http.rb
+- lib/elastic_apm/spies/racecar.rb
 - lib/elastic_apm/spies/rake.rb
 - lib/elastic_apm/spies/redis.rb
 - lib/elastic_apm/spies/resque.rb

data/.ci/.jenkins_exclude.yml

@@ -1,134 +0,0 @@
-exclude:
-  # Ruby 2.4
-  # Only includes rails-5.2, sinatra-2.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.0
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-master
-
-  # rails-4.2 exclusions
-  # Only test on ruby 2.6, 2.5, 2.4, 2.3
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: ruby:2.7
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: rails-4.2
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: rails-4.2
-  # sinatra-1.4 exclusions
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: ruby:2.7
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: sinatra-1.4
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: sinatra-1.4
-
-  # rails-6.0 and rails-6.1 exclusions
-  # Don't test on ruby 2.4
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-6.0
-
-  # Only test rails master on ruby 2.7 and ruby 3.0
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: rails-main
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: rails-main
-
-  # Only test sinatra master on ruby 2.7 and ruby 3.0
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: sinatra-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: sinatra-master
-
-  # Only test grape master on ruby 2.7 and ruby 3.0
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-master
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-master
-
-  # grape 1.5 doesn't support ruby 3.0
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: grape-1.6
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-
-  # only test ruby 3.0 with rails 6.0 and rails 6.1
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-5.2
-  - RUBY_VERSION: ruby:3.0
-    FRAMEWORK: rails-5.1
-
-  # Unsupported
-  - RUBY_VERSION: ruby:2.6
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: ruby:2.5
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: ruby:2.4
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: jruby:9.2
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1
-  - RUBY_VERSION: docker.elastic.co/observability-ci/jruby:9.2-8-jdk
-    FRAMEWORK: grape-1.6,sinatra-2.0,rails-6.1

data/.ci/.jenkins_main_framework.yml

@@ -1,4 +0,0 @@
-FRAMEWORK:
-  - rails-main
-  - sinatra-master
-  - grape-master

data/.ci/.jenkins_ruby.yml

@@ -1,10 +0,0 @@
-RUBY_VERSION:
-  - ruby:3.0
-  - ruby:2.7
-  - ruby:2.6
-  - ruby:2.5
-  - ruby:2.4
-  - jruby:9.2
-  - docker.elastic.co/observability-ci/jruby:9.2-13-jdk
-  - docker.elastic.co/observability-ci/jruby:9.2-11-jdk
-  - docker.elastic.co/observability-ci/jruby:9.2-8-jdk