union_station_hooks_core 2.0.0 → 2.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGUzYzY0ODI2NjJhZTdjZDliOWJjOWQyZTFhZDM3MzVjODFhYWUzYw==
+    Mjg3MGI3ZWUzZTk0NDRmMWQyMTI5ZDJiY2JiN2U1NDk0ZjFiYTRjZA==
   data.tar.gz: !binary |-
-    NjBjOGIzYjU3NmYwYjkzNzJhOTA4ZTU1MWJkNDQ2MmFhYzIyODZiMQ==
+    ZDExODg5NjdjYWVlYjNiYmYyY2ZiNTlmYTZlNGQyOTgyMTEzMTMyOQ==
 SHA512:
   metadata.gz: !binary |-
-    ODhmNDg4NTgwNDNjMjgwNjIyYjIwY2VjNzI1ZjZiZTI4MGUxOWE1NTZlODYy
-    NTI1N2U4MzJkYzk0NDdkZGJhN2U5MzNjOTg3NDY5YmI2MWQwNDFlMmRhMGJk
-    MTQyMzFiNmM0NmEyOTU1NTcyOGY4NjNhOGU3YWFjNzEzNWRlYmU=
+    NzRlYTIyZDc5ZTE5Zjc1ODZkNzg3YjhjMmM1MTJmZjk4OWMwZWUwMzNiOTVl
+    NDViNDM2ZjFmMTdjZTk5MjkzNzg0NjliM2U4MTBmOWQ1Nzg5OGE2ZDRlOTUz
+    YWI0NTIzNjI5NjZlYjBkMTE2NGJiYjFiZDAyMzk3MzU4MGEzOWE=
   data.tar.gz: !binary |-
-    OTJhNDI4YzJkNjhhYTkyODc2NjNmOTllMzM2NWUwNjlhY2IxNzhhMzlkNWVj
-    MzY0ZmJjZDlmYWVmYmRkMzNhMWRiMGFlNTAzMDRjMGI5ODJiMDk4NmFjYzAy
-    ZTk5MzE0ZjgwZTliOTQ1NTI5YjM2OTQ3NWRiNDQyODJkZTVjNTA=
+    ZjEyNWM2MGVjNjg5Zjk3OGYxOWIzZTQ4NjJjMDY2ODY3NGI5N2JiYmMxNWZl
+    ZDM3MjdhMGVhZWY5NzU4MjQ5NzY0ZjA0MWQzNWVlZjEwNTNlNTk4ZWRlNDky
+    Y2Q5NWQ2ZTgzYTcyOTZmNzgxZjI1ZTQyNmE3ZmRhYjM5YWNhN2M=

data/lib/union_station_hooks_core/api.rb

@@ -151,6 +151,16 @@ module UnionStationHooks
         config[:node_name])
     end
 
+    def install_postfork_hook
+      if defined?(PhusionPassenger)
+        PhusionPassenger.on_event(:starting_worker_process) do |forked|
+          if forked
+            UnionStationHooks.context.clear_connection
+          end
+        end
+      end
+    end
+
     def install_event_pre_hook
       preprocessor = @@config[:event_preprocessor]
       if preprocessor

data/lib/union_station_hooks_core/context.rb

@@ -64,7 +64,6 @@ module UnionStationHooks
       else
         @node_name = `hostname`.strip
       end
-      @random_dev = File.open('/dev/urandom')
 
       # This mutex protects the following instance variables, but
       # not the contents of @connection.
@@ -89,7 +88,6 @@ module UnionStationHooks
     def clear_connection
       @mutex.synchronize do
         @connection.synchronize do
-          @random_dev = File.open('/dev/urandom') if @random_dev.closed?
           @connection.unref
           @connection = Connection.new(nil)
         end
@@ -99,7 +97,6 @@ module UnionStationHooks
     def close
       @mutex.synchronize do
         @connection.synchronize do
-          @random_dev.close
           @connection.unref
           @connection = nil
         end
@@ -113,8 +110,6 @@ module UnionStationHooks
         raise ArgumentError, 'Group name may not be empty'
       end
 
-      txn_id = create_txn_id
-
       Lock.new(@mutex).synchronize do |_lock|
         if Time.now < @next_reconnect_time
           return Transaction.new(nil, nil)
@@ -140,7 +135,7 @@ module UnionStationHooks
 
           begin
             @connection.channel.write('openTransaction',
-              txn_id, group_name, '', category,
+              '', group_name, '', category,
               Utils.encoded_timestamp,
               key,
               true,
@@ -149,20 +144,21 @@ module UnionStationHooks
             if result[0] != 'status'
               raise "Expected UstRouter to respond with 'status', " \
                 "but got #{result.inspect} instead"
-            elsif result[1] == 'ok'
-              # Do nothing
             elsif result[1] == 'error'
               if result[2]
                 raise "Unable to close transaction: #{result[2]}"
               else
                 raise 'Unable to close transaction (no server message given)'
               end
-            else
+            elsif result[1] != 'ok'
               raise "Expected UstRouter to respond with 'ok' or 'error', " \
                 "but got #{result.inspect} instead"
+            elsif result.size < 3
+              raise 'Expected UstRouter to respond with an autogenerated ' \
+                'transaction ID, but got none'
             end
 
-            return Transaction.new(@connection, txn_id)
+            return Transaction.new(@connection, result[2])
           rescue SystemCallError, IOError
             @connection.disconnect
             UnionStationHooks::Log.warn(
@@ -279,19 +275,5 @@ module UnionStationHooks
       process_ust_router_reply(channel,
         'UstRouter client initialization error')
     end
-
-    def random_token(length)
-      token = ''
-      @random_dev.read(length).each_byte do |c|
-        token << RANDOM_CHARS[c % RANDOM_CHARS.size]
-      end
-      token
-    end
-
-    def create_txn_id
-      result = (Time.now.to_i / 60).to_s(36)
-      result << "-#{random_token(11)}"
-      result
-    end
   end
 end

data/lib/union_station_hooks_core/request_reporter/basics.rb

@@ -148,7 +148,7 @@ module UnionStationHooks
     # @return An ID to be passed later to {#log_writing_rack_body_end}.
     def log_writing_rack_body_begin
       return do_nothing_on_null(:log_writing_rack_body_begin) if null?
-      @transaction.log_activity_begin('writing out response body')
+      @transaction.log_activity_begin('app writing out response body')
       nil
     end
 
@@ -162,7 +162,7 @@ module UnionStationHooks
     # @private
     def log_writing_rack_body_end(id)
       return do_nothing_on_null(:log_writing_rack_body_end) if null?
-      @transaction.log_activity_end('writing out response body')
+      @transaction.log_activity_end('app writing out response body')
       nil
     end
 

data/lib/union_station_hooks_core/request_reporter/misc.rb

@@ -159,7 +159,8 @@ module UnionStationHooks
         do_nothing_on_null(:log_benchmark_block)
         yield
       else
-        log_user_activity_block("Benchmark: #{title}", &block)
+        @transaction.log_activity_block(next_benchmark_name,
+          title, &block)
       end
     end
 
@@ -283,6 +284,12 @@ module UnionStationHooks
       "user activity #{result}"
     end
 
+    def next_benchmark_name
+      result = @next_benchmark_number
+      @next_benchmark_number += 1
+      "benchmark #{result}"
+    end
+
     def next_database_query_name
       result = @next_database_query_number
       @next_database_query_number += 1

data/lib/union_station_hooks_core/request_reporter.rb

@@ -113,6 +113,7 @@ module UnionStationHooks
       @transaction = continue_transaction
       @next_view_rendering_number = 1
       @next_user_activity_number = 1
+      @next_benchmark_number = 1
       @next_database_query_number = 1
     end
 

data/lib/union_station_hooks_core/version_data.rb

@@ -39,6 +39,6 @@
 {
   :major  => 2,
   :minor  => 0,
-  :tiny   => 0,
-  :string => '2.0.0'
+  :tiny   => 1,
+  :string => '2.0.1'
 }

data/lib/union_station_hooks_core.rb

@@ -163,6 +163,7 @@ module UnionStationHooks
       finalize_and_validate_config
       require_lib('api')
       create_context
+      install_postfork_hook
       install_event_pre_hook
       initialize_other_union_station_hooks_gems
       finalize_install

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: union_station_hooks_core
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Union Station Ruby hooks core code.
 email: info@phusion.nl