liveqa 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8348917e29e6010dc71be47847b9dba0f8816616
-  data.tar.gz: 7faba417c10c83120d8c4add967647c6a3d8202e
+  metadata.gz: '09aa604e7e84377ff259a8d5cf24eee8b130e188'
+  data.tar.gz: 5b54f896360e16c32f6125a5e91d5808002b7262
 SHA512:
-  metadata.gz: 9a0e27f2ed96eb61db14ae29d083c408fd0f945611f3d6e77bda0ab15a7c1f2a791c23e474c77c0122d4d8f2284732244fecb5500190cd81b07d4d94220064e2
-  data.tar.gz: '01792b83eb999086046d19812ec1deb642a4c6680e4867cd467b49cb29f563ee854a5015e3d22b6b08c4c06220ea29ab01cf2754e7375b87c8d8622fb7246d3a'
+  metadata.gz: fa2416a0f721914d1d61bd5dcefd712434c52588266b1fbf7e67128d508765e3958040e6d9d59b361fbf67bd7309fd171291a33e7ee4cfd3974858635bb171ad
+  data.tar.gz: 790d47c0e5ffb8368d8a97426d18897c80cc1848b2ffb76ce8d53f56b5b630a607f4e0c0a2e69649331b66a9379393927b0d7930b93acdef34337d7aee481f22

data/lib/liveqa.rb

@@ -141,7 +141,7 @@ module LiveQA
       payload = Message.base.merge(payload)
 
       if configurations.async
-        payload[:id] = group_id
+        payload[:external_id] = group_id
 
         return processor.enqueue(
           action: GROUPS_UPDATE_ACTION,
@@ -168,7 +168,7 @@ module LiveQA
       payload = Message.base.merge(payload)
 
       if configurations.async
-        payload[:id] = user_id
+        payload[:external_id] = user_id
 
         return processor.enqueue(
           action: IDENTITIES_UPDATE_ACTION,

data/lib/liveqa/message.rb

@@ -11,7 +11,6 @@ module LiveQA
           message_id: SecureRandom.uuid,
           timestamp: Time.now.utc.iso8601(3),
           session_tracker_id: session_tracker_id,
-          metadata: metadata
         )
       end
 
@@ -21,7 +20,8 @@ module LiveQA
           server: server,
           request: LiveQA::Store.get(:request),
           worker: LiveQA::Store.get(:worker),
-          environment: LiveQA::Store.get(:environment)
+          environment: LiveQA::Store.get(:environment) || LiveQA.configurations.environment_name,
+          metadata: metadata
         ).merge(base)
       end
 
@@ -45,10 +45,18 @@ module LiveQA
         {
           host: Socket.gethostname,
           pid: Process.pid,
-          software: LiveQA::Store.get(:server_software),
+          software: LiveQA::Store.get(:server_software) || program_name,
         }
       end
 
+      def program_name
+        name = $PROGRAM_NAME
+
+        name.split('/').last
+      rescue StandardError => _e
+        name
+      end
+
       def metadata
         return nil if LiveQA.configurations.metadata.nil?
 

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

@@ -10,6 +10,7 @@ module LiveQA
 
         def call(_worker, job, _queue)
           LiveQA::Store.set(:session_tracker_id, job['liveqa_session_tracker_id'] || SecureRandom.uuid)
+          LiveQA::Store.set(:server_software, "Sidekiq #{::Sidekiq::VERSION}")
           store_worker_data(job)
           yield
         ensure

data/lib/liveqa/version.rb

@@ -1,3 +1,3 @@
 module LiveQA # :nodoc:
-  VERSION = '1.9.5'.freeze
+  VERSION = '1.9.6'.freeze
 end

data/spec/lib/liveqa/message_spec.rb

@@ -25,51 +25,6 @@ describe LiveQA::Message do
 
       it { expect(base.base).to match(expected_hash) }
     end
-
-    context 'with metadata' do
-
-
-      let(:expected_hash) {{
-        message_id: kind_of(String),
-        timestamp: kind_of(String),
-        session_tracker_id: kind_of(String),
-        metadata: {
-          deployment_id: 42
-        }
-      }}
-
-      context 'hash type' do
-        before do
-          LiveQA.configurations.metadata = {
-            deployment_id: 42
-          }
-        end
-
-        it { expect(base.base).to match(expected_hash) }
-      end
-
-      context 'proc type' do
-        before do
-          LiveQA.configurations.metadata = {
-            deployment_id: lambda { 84 / 2 }
-          }
-        end
-
-        it { expect(base.base).to match(expected_hash) }
-      end
-
-      context 'proc & raise type' do
-        before do
-          LiveQA.configurations.metadata = {
-            deployment_id: -> { 84 / 2 },
-            other_id: -> { hello }
-          }
-        end
-
-        it { expect(base.base).to match(expected_hash) }
-      end
-    end
-
   end
 
   describe '#extended' do
@@ -77,6 +32,7 @@ describe LiveQA::Message do
       message_id: kind_of(String),
       timestamp: kind_of(String),
       session_tracker_id: kind_of(String),
+      environment: 'test',
       library: {
         name: "liveqa",
         language: "ruby",
@@ -84,7 +40,8 @@ describe LiveQA::Message do
       },
       server: {
         host: kind_of(String),
-        pid: kind_of(Numeric)
+        pid: kind_of(Numeric),
+        software: 'rspec'
       }
     }}
 
@@ -163,6 +120,59 @@ describe LiveQA::Message do
 
       it { expect(base.extended).to match(expected_hash) }
     end
+
+    context 'with metadata' do
+      let(:expected_hash) {{
+        message_id: kind_of(String),
+        timestamp: kind_of(String),
+        session_tracker_id: kind_of(String),
+        environment: 'test',
+        library: {
+          name: "liveqa",
+          language: "ruby",
+          version: kind_of(String)
+        },
+        server: {
+          host: kind_of(String),
+          pid: kind_of(Numeric),
+          software: 'rspec'
+        },
+        metadata: {
+          deployment_id: 42
+        },
+      }}
+
+      context 'hash type' do
+        before do
+          LiveQA.configurations.metadata = {
+            deployment_id: 42
+          }
+        end
+
+        it { expect(base.extended).to match(expected_hash) }
+      end
+
+      context 'proc type' do
+        before do
+          LiveQA.configurations.metadata = {
+            deployment_id: lambda { 84 / 2 }
+          }
+        end
+
+        it { expect(base.extended).to match(expected_hash) }
+      end
+
+      context 'proc & raise type' do
+        before do
+          LiveQA.configurations.metadata = {
+            deployment_id: -> { 84 / 2 },
+            other_id: -> { hello }
+          }
+        end
+
+        it { expect(base.extended).to match(expected_hash) }
+      end
+    end
   end
 
 end

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

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

data/spec/lib/liveqa_spec.rb

@@ -24,7 +24,8 @@ describe LiveQA::Event do
       },
       server: {
         host: kind_of(String),
-        pid: kind_of(Numeric)
+        pid: kind_of(Numeric),
+        software: 'rspec',
       },
     }}
     let(:response) { double('LiveQA::Event', successful?: true) }
@@ -77,7 +78,8 @@ describe LiveQA::Event do
       },
       server: {
         host: kind_of(String),
-        pid: kind_of(Numeric)
+        pid: kind_of(Numeric),
+        software: 'rspec',
       },
     }}
     let(:response) { double('LiveQA::Event', successful?: true) }
@@ -130,7 +132,7 @@ describe LiveQA::Event do
         LiveQA.set_group(42, { properties: { name: 'John Group' }}, no_ssl: true, space_name: 'test')
       end
 
-      it { expect(processor_mock).to have_received(:enqueue).with(action: 'groups:update', payload: hash_including(expected_arg.merge(id: 42)), options: { space_name: 'test' }) }
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'groups:update', payload: hash_including(expected_arg.merge(external_id: 42)), options: { space_name: 'test' }) }
     end
 
     context 'without async' do
@@ -171,7 +173,7 @@ describe LiveQA::Event do
         LiveQA.set_identity(42, { properties: { name: 'John Doe' }}, no_ssl: true, space_name: 'test')
       end
 
-      it { expect(processor_mock).to have_received(:enqueue).with(action: 'identities:update', payload: hash_including(expected_arg.merge(id: 42)), options: { space_name: 'test' }) }
+      it { expect(processor_mock).to have_received(:enqueue).with(action: 'identities:update', payload: hash_including(expected_arg.merge(external_id: 42)), options: { space_name: 'test' }) }
     end
 
     context 'without async' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: liveqa
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - LiveQA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-05 00:00:00.000000000 Z
+date: 2018-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby