elastic-apm 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 657222b35d3baf548263821c1ce816d645e1c459d20cdde35a51d9bc68dae039
-  data.tar.gz: 6fec8c47194a0f9fc0cab8b1a8dbd88a3623ae72e314f34ca2084ec5aaee3b9e
+  metadata.gz: 7026cd778a6226802c4bb0b0c384b67c86df3a60430a4283f7b48f45da16e8a6
+  data.tar.gz: c415bff2b4c720a3a5b981a27c1ca91500233be95d6f1a73c6bb46ba5d2e2344
 SHA512:
-  metadata.gz: 97c3a679256e705f97ab509e446eecd521b80628e31ce219f709ab323544d5c62ee05895c69e6e8bad13501c4d90bd4a6dd8640cb827a2c462b18c56139371a9
-  data.tar.gz: f0f25a8bf6bbe7a49561774936bda79d7cebb54682483e37345081e446fc5b30c405dac66ef60f29683a7944b66f5246e903de6af737312a49bb80f59df2334d
+  metadata.gz: 6e6db8df5ab8e2d7313813b3ca4524c8b32a11e9fe14940cb6d7b55483847015b0716bd760124be452ff4d17708a926edd242f715ab887820a5e0f24eb85d4ac
+  data.tar.gz: 7a9e88ef324250a4715b7e60e7c5f32256eea3965556a3b77535c6bd6673dce72c3f8fea92dac321976f1a75ee81ab4174d4502b9655ddfcecabb114f518ee83

data/CHANGELOG.md

@@ -4,6 +4,14 @@ 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).
 
+## 2.1.2 (2018-12-07)
+
+### Fixed
+
+- Fix truncation of `transaction.request.url` values ([#267](https://github.com/elastic/apm-agent-ruby/pull/267))
+- Fix Faraday calls with `url_prefix` ([#263](https://github.com/elastic/apm-agent-ruby/pull/263))
+- Force `span.context.http.status_code` to be an integer
+
 ## 2.1.1 (2018-12-04)
 
 ### Fixed

data/Rakefile

@@ -2,6 +2,13 @@
 
 require 'bundler/gem_tasks'
 
+Rake::Task[:release].enhance do
+  `git checkout 2.x &&
+  git rebase master &&
+  git push origin 2.x &&
+  git checkout master`
+end
+
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/elastic_apm/spies/faraday.rb

@@ -15,7 +15,11 @@ module ElasticAPM
               return run_request_without_apm(method, url, body, headers, &block)
             end
 
-            host = URI(url).host
+            host = if url_prefix.is_a?(URI) && url_prefix.host
+                     url_prefix.host
+                   else
+                     URI(url).host
+                   end
 
             name = "#{method.upcase} #{host}"
             type = "ext.faraday.#{method}"

data/lib/elastic_apm/transport/serializers.rb

@@ -28,6 +28,8 @@ module ElasticAPM
         end
 
         def keyword_object(hash)
+          return unless hash
+
           hash.tap do |h|
             h.each { |k, v| hash[k] = keyword_field(v) }
           end

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

@@ -29,7 +29,7 @@ module ElasticAPM
             http_version: keyword_field(request.http_version),
             method: keyword_field(request.method),
             socket: build_socket(request.socket),
-            url: request.url
+            url: build_url(request.url)
           }
         end
         # rubocop:enable Metrics/MethodLength
@@ -63,6 +63,20 @@ module ElasticAPM
             encrypted: socket.encrypted
           }
         end
+
+        def build_url(url)
+          return unless url
+
+          {
+            protocol: keyword_field(url.protocol),
+            full: keyword_field(url.full),
+            hostname: keyword_field(url.hostname),
+            port: keyword_field(url.port),
+            pathname: keyword_field(url.pathname),
+            search: keyword_field(url.search),
+            hash: keyword_field(url.hash)
+          }
+        end
       end
     end
   end

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

@@ -62,7 +62,7 @@ module ElasticAPM
 
             {
               url: http.url,
-              status_code: http.status_code,
+              status_code: http.status_code.to_i,
               method: keyword_field(http.method)
             }
           end

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby