elastic-apm 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1714ce04cac580fae85d1db089aad12a44e6ae719ae4c077c695ed19331d1862
-  data.tar.gz: 2d2dc08bec25deca316844d1d4f8e878bf552ea473b27447f4476a82cf03872d
+  metadata.gz: b9c57d8f754de9ab6d024f95f2822b0eae82f17a00cd3edae13d290c9b850393
+  data.tar.gz: 4d32a175d46dac86cabdf97de023a49e7e5eb155a21be11eb227bf61afdb8ffc
 SHA512:
-  metadata.gz: b1fba467b1fffb405b354511485b373d3e25bf141b6ab4404d80f4b9e431b4defc640b2f4c3edbc5e9253914844b09949ad6d617e3a5f0efe0c9f496ea7444ee
-  data.tar.gz: dd749fc5782ab61ae5fe489fbe1d69dec7a33fac44a0a26fbd1c8b95b03f2f372c1e9350987e266f4098ec18cc3d409712a23ac92edfe0a1f25cef5760f64ebb
+  metadata.gz: '09cddb89d0d5265c7c12e8838702cde336754e197d8f4e6647f3885ccde3f6fc806f91b22ab054cf8c5c465373e34bf0f46580a2ab01513da5246d9ea443bb2c'
+  data.tar.gz: 10732912f09d131204363dd0191e59f689d9560935af8df0b195cd4a145e9402c4a5f3cc3ed136399471f1a406efd7202a7d8384772bc6356b4a64752333cd03

data/.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: sucker_punch
+    versions:
+    - "> 2.0"
+  - dependency-name: i18n
+    versions:
+    - 1.8.10
+    - 1.8.8
+    - 1.8.9

data/CHANGELOG.asciidoc

@@ -35,6 +35,26 @@ endif::[]
 [[release-notes-4.x]]
 === Ruby Agent version 4.x
 
+[[release-notes-4.1.0]]
+==== 4.1.0
+
+[float]
+===== Added
+
+- Azure App Services instance metadata {pull}1007[#1007]
+
+[float]
+===== Changed
+
+- `hostname` is now reported split by `configured_hostname` and `detected_hostname` {pull}1009[#1009]
+
+[float]
+===== Fixed
+- `service_node_name` is now correctly reported as `service.node.configured_name` {pull}1009[#1009]
+- Fix JSON parsing when using yajl-ruby {pull}1012[#1012]
+- Fix SpanHelpers when methods take blocks {pull}1013[#1013]
+- Fix missing `environment` param when fetching from Central Config {pull}1014[#1014]
+
 [[release-notes-4.0.0]]
 ==== 4.0.0
 

data/lib/elastic_apm/central_config.rb

@@ -164,7 +164,8 @@ module ElasticAPM
       @server_url ||=
         config.server_url +
         '/config/v1/agents' \
-        "?service.name=#{CGI.escape(config.service_name)}"
+        "?service.name=#{CGI.escape(config.service_name)}" \
+        "&service.environment=#{CGI.escape(config.environment || '')}"
     end
 
     def headers

data/lib/elastic_apm/metadata/cloud_info.rb

@@ -57,9 +57,9 @@ module ElasticAPM
         when "gcp"
           fetch_gcp
         when "azure"
-          fetch_azure
+          fetch_azure || read_azure_app_services
         when "auto"
-          fetch_aws || fetch_gcp || fetch_azure
+          fetch_aws || fetch_gcp || fetch_azure || read_azure_app_services
         when "none"
           nil
         else
@@ -76,7 +76,7 @@ module ElasticAPM
         resp = @client.get(AWS_URI)
 
         return unless resp.status == 200
-        return unless (metadata = JSON.parse(resp.body))
+        return unless (metadata = JSON.parse(resp.body.to_s))
 
         self.provider = "aws"
         self.account_id = metadata["accountId"]
@@ -92,7 +92,7 @@ module ElasticAPM
         resp = @client.headers("Metadata-Flavor" => "Google").get(GCP_URI)
 
         return unless resp.status == 200
-        return unless (metadata = JSON.parse(resp.body))
+        return unless (metadata = JSON.parse(resp.body.to_s))
 
         zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
 
@@ -112,7 +112,7 @@ module ElasticAPM
         resp = @client.headers("Metadata" => "true").get(AZURE_URI)
 
         return unless resp.status == 200
-        return unless (metadata = JSON.parse(resp.body))
+        return unless (metadata = JSON.parse(resp.body.to_s))
 
         self.provider = 'azure'
         self.account_id = metadata["subscriptionId"]
@@ -125,6 +125,33 @@ module ElasticAPM
       rescue HTTP::TimeoutError, HTTP::ConnectionError
         nil
       end
+
+      def read_azure_app_services
+        owner_name, instance_id, site_name, resource_group =
+          ENV.values_at(
+            'WEBSITE_OWNER_NAME',
+            'WEBSITE_INSTANCE_ID',
+            'WEBSITE_SITE_NAME',
+            'WEBSITE_RESOURCE_GROUP'
+          )
+
+        return unless owner_name && instance_id && site_name && resource_group
+
+        self.provider = 'azure'
+        self.instance_id = instance_id
+        self.instance_name = site_name
+        self.project_name = resource_group
+        self.account_id, self.region = parse_azure_app_services_owner_name(owner_name)
+      end
+
+      private
+
+      def parse_azure_app_services_owner_name(owner_name)
+        id, rest = owner_name.split('+')
+        *_, region = rest.split('-')
+        region.gsub!(/webspace.*$/, '')
+        [id, region]
+      end
     end
   end
 end

data/lib/elastic_apm/metadata/system_info.rb

@@ -24,7 +24,8 @@ module ElasticAPM
       def initialize(config)
         @config = config
 
-        @hostname = @config.hostname || self.class.system_hostname
+        @configured_hostname = @config.hostname
+        @detected_hostname = detect_hostname
         @architecture = gem_platform.cpu
         @platform = gem_platform.os
 
@@ -33,14 +34,23 @@ module ElasticAPM
         @kubernetes = container_info.kubernetes
       end
 
-      attr_reader :hostname, :architecture, :platform, :container, :kubernetes
+      attr_reader(
+        :detected_hostname,
+        :configured_hostname,
+        :architecture,
+        :platform,
+        :container,
+        :kubernetes
+      )
 
       def gem_platform
         @gem_platform ||= Gem::Platform.local
       end
 
-      def self.system_hostname
-        @system_hostname ||= `hostname`.chomp
+      private
+
+      def detect_hostname
+        `hostname`.chomp
       end
     end
   end

data/lib/elastic_apm/span_helpers.rb

@@ -37,13 +37,13 @@ module ElasticAPM
         type ||= Span::DEFAULT_TYPE
 
         klass.prepend(Module.new do
-          define_method(method) do |*args|
+          define_method(method) do |*args, &block|
             unless ElasticAPM.current_transaction
-              return super(*args)
+              return super(*args, &block)
             end
 
             ElasticAPM.with_span name.to_s, type.to_s do
-              super(*args)
+              super(*args, &block)
             end
           end
         end)

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

@@ -65,7 +65,7 @@ module ElasticAPM
             }
 
           if (node_name = service.node_name)
-            base[:node] = { name: keyword_field(node_name) }
+            base[:node] = { configured_name: keyword_field(node_name) }
           end
 
           base
@@ -81,7 +81,8 @@ module ElasticAPM
 
         def build_system(system)
           {
-            hostname: keyword_field(system.hostname),
+            detected_hostname: keyword_field(system.detected_hostname),
+            configured_hostname: keyword_field(system.configured_hostname),
             architecture: keyword_field(system.architecture),
             platform: keyword_field(system.platform),
             kubernetes: keyword_object(system.kubernetes),

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - mikkel@elastic.co
 executables: []
@@ -69,6 +69,7 @@ files:
 - ".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/addToProject.yml"
 - ".github/workflows/labeler.yml"
@@ -253,7 +254,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
@@ -268,8 +269,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: The official Elastic APM agent for Ruby
 test_files: []