elastic-apm 4.5.0 → 4.6.2

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.0'
+  VERSION = '4.6.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.0
+  version: 4.6.2
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire:
+- Emily Stolfo
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -38,9 +39,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
+- !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: []
@@ -48,8 +63,9 @@ files:
 - ".ci/.jenkins_codecov.yml"
 - ".ci/.jenkins_exclude.yml"
 - ".ci/.jenkins_framework.yml"
-- ".ci/.jenkins_master_framework.yml"
+- ".ci/.jenkins_main_framework.yml"
 - ".ci/.jenkins_ruby.yml"
+- ".ci/.jenkins_ruby_benchmarks.yml"
 - ".ci/Jenkinsfile"
 - ".ci/docker/jruby/11-jdk/Dockerfile"
 - ".ci/docker/jruby/12-jdk/Dockerfile"
@@ -66,6 +82,8 @@ files:
 - ".ci/jobs/defaults.yml"
 - ".ci/linting.groovy"
 - ".ci/packer_cache.sh"
+- ".ci/snapshoty.yml"
+- ".ci/update-specs.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
@@ -73,6 +91,7 @@ files:
 - ".github/labeler-config.yml"
 - ".github/workflows/addToProject.yml"
 - ".github/workflows/labeler.yml"
+- ".github/workflows/update-specs.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -136,6 +155,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 +212,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 +227,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
@@ -258,7 +281,7 @@ licenses:
 - Apache-2.0
 metadata:
   source_code_uri: https://github.com/elastic/apm-agent-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -273,8 +296,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: The official Elastic APM agent for Ruby
 test_files: []

data/.ci/.jenkins_master_framework.yml

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