apptrail-application-events-sdk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6577d90aff851fc6436c50a0b30264b3c453c4290f2f0a336a8e0bf3fa7dc8
-  data.tar.gz: 6dc2dc70b4f05cf188a755925f1e50e08e277eeacc49efeb7d82aefb8cc4359d
+  metadata.gz: 033ced91d5d347d03c478bfd99656e901920d6eadb8823b19fd0b5751ac3b736
+  data.tar.gz: 38f63305471ef6aa3ea25392df9c5b72676b3410ab4d6ec5055c8d1597f655e2
 SHA512:
-  metadata.gz: bc49132efe676aa804cdc41f4d4da3a26bd565d107d69342f341ead0bb9f049a9a5b20cdcc6797892294f40fcc1db24383890a1c5d73ef901f891d2e23d6d142
-  data.tar.gz: f8abe7ba65ff9d5a3e080a5a7cc230c6a19247340a77fcfd8d51e7034ba239b343308f61c5360b2fdbd1504e8858e70241fdc5dfdf8d449d5b3d60009750e060
+  metadata.gz: efe5076ba194024da52d8b9305fcaf7319717243eab7f2bba2320cfdb31eb353b194d4ee7fd350295e43520dfaedfa8cf5b4c881a3c2aecccc602527e82e31e9
+  data.tar.gz: 288c4f04e2508aaa7636d685dc14c873382f597ab96a7a83db99f0e2097580671cff16ff6c7bf7ade18e457757d0145c7593a60d10982a9176ce457091accf1c

data/lib/apptrail-application-events-sdk.rb

@@ -37,6 +37,15 @@ module Apptrail
       max_elapsed_time: 4,
       rand_factor: 0.2
     }
+    c.contexts[:session] = {
+      tries: 3,
+      base_interval: 0.04,
+      on: Apptrail::ApptrailRetryableError,
+      on_retry: proc { Apptrail.logger.debug('Retrying refresh session.') },
+      max_interval: 0.12,
+      max_elapsed_time: 4,
+      rand_factor: 0.2
+    }
   end
 
   # You can use the Apptrail Application Events Client to send
@@ -44,9 +53,6 @@ module Apptrail
   #
   # See [Sending events](https://apptrail.com/docs/applications/guide/working-with-events/overview).
   class ApptrailEventsClient
-    @_form_data = nil
-    @_upload_url = nil
-
     SCHEMA = JSON.parse(File.read(
                           File.expand_path('raw-event-schema.json', __dir__)
                         )).freeze
@@ -72,6 +78,14 @@ module Apptrail
 
       @_base_api_url = "https://events.#{region}.apptrail.com/applications/session"
       @_api_key = api_key
+      @_session_client = HTTP.persistent @_base_api_url
+
+      @_form_data = nil
+      @_upload_url = nil
+      @_upload_client = nil
+
+      @_finalize_id = SecureRandom.uuid
+      ObjectSpace.define_finalizer(@_finalize_id, proc { close })
     end
 
     # Send a single audit event to log to Apptrail.
@@ -94,18 +108,18 @@ module Apptrail
         raise Apptrail::ApptrailError, e.message
       end
 
-      _refresh_post_policy() if @_upload_url.nil? || @_form_data.nil?
+      _refresh_post_policy() if @_upload_url.nil? || @_form_data.nil? || @_upload_client.nil?
 
-      content = ''
+      content = StringIO.new
       events.each do |evt|
-        content << JSON.generate(evt)
+        content << JSON.fast_generate(evt)
         content << "\n"
       end
 
       filename = "#{SecureRandom.uuid}.jsonl"
       s3_key = File.join(@_application_id, filename)
 
-      form_file = HTTP::FormData::File.new(StringIO.new(content), filename: filename)
+      form_file = HTTP::FormData::File.new(StringIO.new(content.string), filename: filename)
 
       new_form_opts = {
         **@_form_data,
@@ -113,9 +127,10 @@ module Apptrail
         file: form_file
       }
 
+      resp = nil
       begin
         Retriable.with_context(:s3) do
-          resp = HTTP.post(@_upload_url, form: new_form_opts)
+          resp = @_upload_client.post(@_upload_url, form: new_form_opts)
           unless resp.status.success?
             if resp.status.server_error?
               raise ApptrailRetryableError, 'Server Error while putting events.'
@@ -135,20 +150,54 @@ module Apptrail
         raise ApptrailError, "Failed to put #{events.length} events. Encountered error."
       else
         Apptrail.logger.info("Successfully wrote #{events.length} events.")
+      ensure
+        resp.flush if resp
       end
     end
 
+    def close
+      # https://github.com/appsignal/rdkafka-ruby/pull/160/files
+      ObjectSpace.undefine_finalizer(@_finalize_id)
+      @_session_client.close if @_session_client
+      @_upload_client.close if @_upload_client
+    end
+
     private
 
     def _refresh_post_policy
-      resp = HTTP
+      fail_default = -> { raise ApptrailError, "Error refreshing credentials." }
+      resp = nil
+
+      begin
+        Retriable.with_context(:session) do
+          resp = @_session_client
              .auth("Bearer #{@_api_key}")
              .get(@_base_api_url)
-      raise ApptrailError, "Error refreshing credentials, status code: #{resp.code}" unless resp.status.success?
 
-      result = JSON.parse(resp.body.to_s)
-      @_upload_url = result['uploadUrl']
-      @_form_data = result['form']
+          unless resp.status.success?
+            if resp.status.server_error?
+              raise ApptrailRetryableError, 'Server Error refreshing session.'
+            elsif resp.status.client_error?
+              if resp.status.code == 429
+                raise ApptrailRetryableError, 'Throttling'
+              else
+                fail_default.call
+              end
+            else
+              fail_default.call
+            end
+          end
+
+          result = JSON.parse(resp.body.to_s)
+          @_upload_url = result['uploadUrl']
+          @_form_data = result['form']
+          @_upload_client = HTTP.persistent @_upload_url
+        end
+      rescue StandardError => e
+        fail_default.call
+      ensure
+        resp.flush if resp
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apptrail-application-events-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Apptrail Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-28 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http