oneapm_rpm 1.3.4 → 1.3.5.rc1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWFmMDAxNzQ4ZTFhMGRhNDk5Y2ViZjViODM2NzE3NWFmNzRjYTAwNA==
+    NTMzMTkyOWI5YTM1ZTAzZWQ4YjQ1Njk0YmNmZjlkNjdiMGRlMGNlOQ==
   data.tar.gz: !binary |-
-    YjAzYjdkODQxMTkyMjMyZDVjNGUyOGExZTAzNDc1N2ZjYmYwYjJlZg==
+    ZDdhMTBiMmE4YjA5Y2VjMTUxNDQ4ODY2ZDFjYTU3MTcxOTlhYzhmOA==
 SHA512:
   metadata.gz: !binary |-
-    MzljMjJlOGJkMWJkMWU1OWMxNTBkNWRjMjI3ODBhYWM1YzYzNGEzN2FiZGU0
-    ZDkxMTFmYjU5MzFiNmE4OTllNzRjMzczMzA3MDg1N2VkM2RhMmQ0MjNkZjdm
-    YzFkZTJiM2QwZjE4ZWRhNWFlMmEyMTUwZWRlZGYxZDIyMTAzYzU=
+    NGQwN2U5MmQyNzE2MmI1MzBmNjEyZGE0NGI3OTIzN2M4ODljMDU0MjJiNTg2
+    MmU3NzhkZDI2ZDM0OTJmODE1NTk0MzJhNzcxM2RkOTRkMGU0NDk5ZDBlMTMx
+    Yzk4Nzg2MzAzOWYwMjI4NDMzYjY5OGQzNmM4ODZmNjhlNjQ2MmE=
   data.tar.gz: !binary |-
-    OTgxZWZmYzM4OGMyOGZlNWZmZjIxMGZkZDI1MmRjOGQxM2ZhYjJjODczYjFl
-    OWQ0NTA5MDE0ZjFlN2MyYTBmMWM1MmRhZWM1YmQxNDI5OTMzMjI5ZjNjODY1
-    ZDcwYmJkZmU1NTE2NzYzZTEzZWM3MzM0M2IwMTE1NTU4OWMyNWQ=
+    ZGQwMGY3OWQ4NDY0NjE0NTE5YjFkNzMwMjA3M2NiZThiZjA3YmQ5NzYwMmI2
+    YzE1MTFiY2ZiNjk3ZWI1YmZiNGUwYTFhMTI2MTM1M2Q0MWE5NDMxZTkyMWIw
+    ZWZiNzQwYTk5MTFhYzFiOTRhOTkwYzlhOGQzMDAzMjA1NGU3NGE=

data/lib/one_apm/collector/collector/http_connection.rb

@@ -18,7 +18,7 @@ module OneApm
           end
           serialize_finish_ts = Time.now
 
-          data, encoding = compress_request_if_needed(data)
+          data, encoding = compress_request(data)
           size = data.size
 
           uri = remote_method_uri(method, @marshaller.format)
@@ -61,8 +61,8 @@ module OneApm
         def send_request(opts)
           request = Net::HTTP::Post.new(opts[:uri], 'CONTENT-ENCODING' => opts[:encoding], 'HOST' => opts[:collector].name)
           request['user-agent'] = user_agent
-          request.content_type = "application/octet-stream"
           request.body = opts[:data]
+          request.content_type = "multipart/form-data; boundary=-oneapm-#{request.object_id}-"
 
           response     = nil
           attempts     = 0
@@ -84,7 +84,6 @@ module OneApm
               raise ServerConnectionException, "Recoverable error talking to #{@collector} after #{attempts} attempts: #{e}"
             end
           end
-
           log_and_return_response response
         end
 
@@ -214,15 +213,10 @@ module OneApm
           end
         end
 
-        # We do not compress if content is smaller than 64kb.  There are
-        # problems with bugs in Ruby in some versions that expose us
-        # to a risk of segfaults if we compress aggressively.
-        def compress_request_if_needed(data)
-          encoding = 'identity'
-          if data.size > 64 * 1024
-            data = OneApm::Support::Encoders::Compressed.encode(data)
-            encoding = 'deflate'
-          end
+        # Compress request data
+        def compress_request(data)
+          encoding = 'deflate'
+          data = OneApm::Support::Encoders::Compressed.encode(data)
           check_post_size(data)
           [data, encoding]
         end

data/lib/one_apm/collector/collector_service.rb

@@ -54,7 +54,7 @@ module OneApm
           @collector = server_from_host(host)
         end
         response = invoke_remote(:connect, [settings])
-        @agent_id = response['agent_run_id']
+        @agent_id = response['agent_run_id'] if response
         response
       end
 

data/lib/one_apm/version.rb

@@ -5,10 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 4
-    
+    TINY  = 5
+    TAG   = 'rc1'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake