hawkei 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 519333f18c5cd49c3f527ccdcd32aab016ed0cab420b34fd6beea68846894da0
-  data.tar.gz: 3ab8e90d94b056ea8c9e9193de8d43111263628e0c0435d4f12fb897af0e7831
+  metadata.gz: 893522c1632805ef73162ae330ff9d75b6d5bf478db747b8e8eb97007079fd26
+  data.tar.gz: afc3533d6b8145e67a8a749f2c8c862db1bba1bd5ad1ef2b30cc9a7459bfb9c6
 SHA512:
-  metadata.gz: da169662f01c97bfadb06c1058803e6f63e9036301c94b7bf90a6728a24cc2c7b29368b97f706b791989554b3b916822d404c169560cf64e3f30041d3ad8e9ea
-  data.tar.gz: ea4d6c964a1620361e7cfcbd5692a88d5f20cbb72494d13e637a08534d077822633517072c34240ea41da72d857fa9f5057030e525a4ed0643bae704306e647b
+  metadata.gz: c6f40b5d43f90c145517e017271ade3102e93dcec519643a912268745e5f5fca6d96cc54d551ca445393471aefb320f1961b96155050708912dc31269ffafe90
+  data.tar.gz: 695e5ff9f92f062adba51344d654aa205320df30d5cf33ae74990fac6a4cd929c3dd1cd8838ee9b5d6674fa505dcae6749d6a2a0e442c443d6f2f345afa93475

data/.rubocop.yml

@@ -4,7 +4,7 @@ Metrics/LineLength:
   Max: 120
 Metrics/ClassLength:
   CountComments: false
-  Max: 120
+  Max: 200
 Metrics/MethodLength:
   CountComments: false
   Max: 20

data/Makefile

@@ -1,6 +1,9 @@
 export FORCE_COLOR = true
 
-.PHONY: lint test
+.PHONY: lint test build
+
+build:
+	@gem build hawkei.gemspec
 
 test:
 	@bundle exec rspec spec/

data/README.md

@@ -1,11 +1,12 @@
+[![npm version](https://img.shields.io/gem/v/hawkei.svg?style=flat-square)](https://rubygems.org/gems/hawkei)
+[![build status](https://img.shields.io/travis/hawkei-io/hawkei-ruby.svg?style=flat-square)](https://travis-ci.org/hawkei-io/hawkei-ruby)
+
 # Hawkei
 
 [Hawkei](https://hawkei.io) Ruby library
 
 Interact easily with our API using our Ruby library.
 
-[![Build Status](https://travis-ci.org/hawkei-io/hawkei-ruby.svg?branch=master)](https://travis-ci.org/hawkei-io/hawkei-ruby)
-
 ## Setup
 
 - [Start by creating an account](https://app.hawkei.io/registration)

data/lib/hawkei.rb

@@ -10,6 +10,7 @@ require 'concurrent'
 
 # Base
 require 'hawkei/version'
+require 'hawkei/const'
 require 'hawkei/formated_logger'
 require 'hawkei/library_name'
 require 'hawkei/util'
@@ -77,7 +78,11 @@ module Hawkei
     def track(name, payload = {}, options = {})
       return true unless configurations.enabled
 
-      payload[:name] = name
+      payload = {
+        name: name,
+        type: 'track',
+      }.merge(payload)
+
       Hawkei::Plugins::Rails::Data.store_data if defined?(Hawkei::Plugins::Rails::Data)
 
       payload = Message.extended.merge(payload)

data/lib/hawkei/const.rb

@@ -0,0 +1,8 @@
+module Hawkei
+  module Const
+
+    SESSION_TRACKER_ID = '_hawkei_stid'.freeze
+    FOLLOW = '_hawkei_f'.freeze
+
+  end
+end

data/lib/hawkei/message.rb

@@ -11,6 +11,7 @@ module Hawkei
           message_id: SecureRandom.uuid,
           timestamp: Time.now.utc.iso8601(3),
           session_tracker_id: session_tracker_id,
+          auto_id: Hawkei::Store.get(:auto_id),
         )
       end
 

data/lib/hawkei/plugins/rack/middleware.rb

@@ -3,6 +3,7 @@ require 'uri'
 module Hawkei
   module Plugins
     module Rack
+
       ##
       # Hawkei \Plugins \Rack \Middleware
       #
@@ -19,11 +20,15 @@ module Hawkei
 
           store_tracker(request)
           store_request_data(request, env)
+          store_and_send_track_request(request)
 
           Hawkei::Plugins::Rails::MiddlewareData.store_data(request) if defined?(::Rails)
+
           status, headers, body = @app.call(env)
 
           write_cookie_session_tracker_id!(headers)
+          send_track_response(request, status)
+
           [status, headers, body]
         ensure
           Hawkei::Store.clear! unless env['hawkei_test']
@@ -31,14 +36,37 @@ module Hawkei
 
         private
 
-        def session_tracker_id_name
-          '_hawkei_stid'.freeze
+        def store_and_send_track_request(request)
+          auto_id = request.cookies[Hawkei::Const::FOLLOW]
+          return unless auto_id
+
+          Hawkei::Store.set(:auto_id, auto_id)
+
+          Hawkei.track(
+            nil,
+            sub_type: 'request',
+            url_path: request.path,
+          )
+        end
+
+        def send_track_response(request, status)
+          auto_id = request.cookies[Hawkei::Const::FOLLOW]
+          return unless auto_id
+
+          Hawkei.track(
+            nil,
+            sub_type: 'response',
+            url_path: request.path,
+            properties: {
+              status: status,
+            },
+          )
         end
 
         def store_tracker(request)
           Hawkei::Store.set(
             :session_tracker_id,
-            request.cookies[session_tracker_id_name] || SecureRandom.uuid
+            request.cookies[Hawkei::Const::SESSION_TRACKER_ID] || SecureRandom.uuid
           )
         end
 
@@ -68,7 +96,7 @@ module Hawkei
         def write_cookie_session_tracker_id!(headers)
           ::Rack::Utils.set_cookie_header!(
             headers || {},
-            session_tracker_id_name,
+            Hawkei::Const::SESSION_TRACKER_ID,
             Util.deep_compact(
               value: Hawkei::Store.get(:session_tracker_id),
               path: '/',

data/lib/hawkei/plugins/sidekiq/client_middleware.rb

@@ -9,7 +9,9 @@ module Hawkei
       class ClientMiddleware
 
         def call(_worker_class, job, _queue, _redis_pool)
-          job['_hawkei_stid'] = Hawkei::Store.store[:session_tracker_id]
+          job[Hawkei::Const::SESSION_TRACKER_ID] = Hawkei::Store.store[:session_tracker_id]
+          job[Hawkei::Const::FOLLOW] = Hawkei::Store.store[:auto_id]
+
           yield
         end
 

data/lib/hawkei/plugins/sidekiq/server_middleware.rb

@@ -9,9 +9,14 @@ module Hawkei
       class ServerMiddleware
 
         def call(_worker, job, _queue)
-          Hawkei::Store.set(:session_tracker_id, job['_hawkei_stid'] || SecureRandom.uuid)
-          Hawkei::Store.set(:server_software, "Sidekiq #{::Sidekiq::VERSION}")
+          Hawkei::Store.bulk_set(
+            session_tracker_id: job[Hawkei::Const::SESSION_TRACKER_ID] || SecureRandom.uuid,
+            server_software: "Sidekiq #{::Sidekiq::VERSION}",
+            auto_id: job[Hawkei::Const::FOLLOW],
+          )
+
           store_worker_data(job)
+
           yield
         ensure
           Hawkei::Store.clear!

data/lib/hawkei/version.rb

@@ -1,3 +1,3 @@
 module Hawkei # :nodoc:
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/lib/hawkei/message_spec.rb

@@ -15,12 +15,14 @@ describe Hawkei::Message do
     context 'with store' do
       before do
        Hawkei::Store.set(:session_tracker_id, 'hello')
+       Hawkei::Store.set(:auto_id, 'auto')
      end
 
       let(:expected_hash) {{
         message_id: kind_of(String),
         timestamp: kind_of(String),
         session_tracker_id: 'hello',
+        auto_id: 'auto',
       }}
 
       it { expect(base.base).to match(expected_hash) }
@@ -50,6 +52,7 @@ describe Hawkei::Message do
     context 'with store' do
       before do
        Hawkei::Store.set(:session_tracker_id, 'hello')
+       Hawkei::Store.set(:auto_id, 'auto')
        Hawkei::Store.set(:request,
         url:        'http://www.test.com/',
         ssl:        true,
@@ -83,6 +86,7 @@ describe Hawkei::Message do
         message_id: kind_of(String),
         timestamp: kind_of(String),
         session_tracker_id: 'hello',
+        auto_id: 'auto',
         library: {
           name: 'hawkei',
           language: 'ruby',

data/spec/lib/hawkei/plugins/sidekiq/server_middleware_spec.rb

@@ -36,6 +36,7 @@ describe Hawkei::Plugins::Sidekiq::ServerMiddleware do
       let(:expected) {{
         session_tracker_id: '06a09f70-6219-4860-babc-18aa47a62f7f',
         server_software: include("Sidekiq"),
+        auto_id: nil,
         worker:  {
           name: 'sidekiq',
           version: kind_of(String),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hawkei
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Hawkei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -119,6 +119,7 @@ files:
 - lib/hawkei/api_resource.rb
 - lib/hawkei/batch.rb
 - lib/hawkei/config.rb
+- lib/hawkei/const.rb
 - lib/hawkei/errors.rb
 - lib/hawkei/formated_logger.rb
 - lib/hawkei/hawkei_object.rb