hoodoo 1.19.0 → 2.0.0

data/spec/active/active_record/manually_dated_spec.rb

@@ -18,7 +18,7 @@ describe Hoodoo::ActiveRecord::ManuallyDated do
         t.text :data
         t.text :unique
 
-        t.timestamps
+        t.timestamps :null => true
         t.datetime :effective_start, :null => false
         t.datetime :effective_end,   :null => false
       end

data/spec/active/active_record/search_helper_spec.rb

@@ -19,7 +19,7 @@ describe Hoodoo::ActiveRecord::Finder::SearchHelper do
     spec_helper_silence_stdout() do
       ActiveRecord::Migration.create_table( :r_spec_model_search_helper_tests ) do | t |
         t.text :field
-        t.timestamps
+        t.timestamps :null => true
       end
     end
 

data/spec/active/active_record/secure_spec.rb

@@ -11,7 +11,7 @@ describe Hoodoo::ActiveRecord::Secure do
         t.text :distributor
         t.text :field
 
-        t.timestamps
+        t.timestamps :null => true
       end
 
       ActiveRecord::Migration.create_table( :r_spec_model_secure_test_as, &migration )
@@ -332,7 +332,7 @@ describe Hoodoo::ActiveRecord::Secure do
         migration = Proc.new do | t |
           t.text :creating_caller_uuid
           t.text :programme_code
-          t.timestamps
+          t.timestamps :null => true
         end
 
         ActiveRecord::Migration.create_table( :r_spec_model_secure_render_as, &migration )

data/spec/active/active_record/support_spec.rb

@@ -203,7 +203,7 @@ describe Hoodoo::ActiveRecord::Support do
           manual_scope = RSpecFullScopeForTestSubclass.dated( @context ).to_sql()
 
           expect( manual_scope ).to include( "FROM #{ @thtname1 }" )
-          expect( manual_scope ).to include( "\"effective_end\" > #{ RSpecFullScopeForTestSubclass.sanitize( @test_time_value ) }" )
+          expect( manual_scope ).to include( "\"effective_end\" > '#{ RSpecFullScopeForTestSubclass.connection.quoted_date( @test_time_value ) }'" )
         end
 
         it 'secure' do
@@ -239,7 +239,7 @@ describe Hoodoo::ActiveRecord::Support do
         manual_scope = RSpecFullScopeForTestBaseSubclassWithoutOverrides.dated( @context ).to_sql()
 
         expect( manual_scope ).to include( "FROM #{ @thtname2 }" )
-        expect( manual_scope ).to include( "\"effective_end\" > #{ RSpecFullScopeForTestBaseSubclassWithoutOverrides.sanitize( @test_time_value ) }" )
+        expect( manual_scope ).to include( "\"effective_end\" > '#{ RSpecFullScopeForTestBaseSubclassWithoutOverrides.connection.quoted_date( @test_time_value ) }'" )
       end
 
       it 'secure' do
@@ -268,7 +268,7 @@ describe Hoodoo::ActiveRecord::Support do
           manual_scope = RSpecFullScopeForManuallyDated.manually_dated( @context ).to_sql()
 
           expect( manual_scope ).to include( 'FROM "r_spec_full_scope_for_manually_dateds"' )
-          expect( manual_scope ).to include( "\"effective_end\" > #{ RSpecFullScopeForTestSubclass.sanitize( @test_time_value.to_time.round( Hoodoo::ActiveRecord::ManuallyDated::SECONDS_DECIMAL_PLACES ) ) }" )
+          expect( manual_scope ).to include( "\"effective_end\" > '#{ RSpecFullScopeForTestSubclass.connection.quoted_date( @test_time_value.to_time.round( Hoodoo::ActiveRecord::ManuallyDated::SECONDS_DECIMAL_PLACES ) ) }'" )
         end
 
         it 'secure' do

data/spec/monkey/patch/datadog_traced_amqp_spec.rb

@@ -51,8 +51,16 @@ describe Hoodoo::Monkey::Patch::DatadogTracedAMQP, :order => :defined do
     end
   end
 
-  it_behaves_like 'an AMQP-based middleware/client endpoint',
-                  {'X_DDTRACE_PARENT_TRACE_ID'=>'trace_id', 'X_DDTRACE_PARENT_SPAN_ID' => 'span_id'}
+  it_behaves_like(
+    'an AMQP-based middleware/client endpoint',
+    {
+      'X_DATADOG_TRACE_ID'        => 'trace_id',
+      'X_DATADOG_PARENT_ID'       => 'span_id',
+
+      'X_DDTRACE_PARENT_TRACE_ID' => 'trace_id',
+      'X_DDTRACE_PARENT_SPAN_ID'  => 'span_id',
+    }
+  )
 
   context 'afterwards' do
     it 'has non-zero NewRelic method call counts' do

data/spec/monkey/patch/newrelic_traced_amqp_spec.rb

@@ -18,14 +18,11 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
     @@newrelic_crossapp_count      = 0
     @@newrelic_agent_disable_count = 0
 
-    module NewRelic
-      module Agent
-        class CrossAppTracing
-        end
-      end
-    end
-
     Hoodoo::Monkey.enable( extension_module: Hoodoo::Monkey::Patch::NewRelicTracedAMQP )
+
+    load 'new_relic/agent/logger.rb'
+    load 'new_relic/agent/method_tracer.rb'
+    load 'new_relic/agent/transaction.rb'
   end
 
   after :all do
@@ -51,19 +48,23 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
       result
     end
 
-    allow( NewRelic::Agent::CrossAppTracing ).to receive( :tl_trace_http_request ) do | newrelic_request, &block |
+    # We should always start a new Segment...
+    #
+    allow( ::NewRelic::Agent::Transaction ).to receive( :start_external_request_segment ) do | type, uri, method |
       @@newrelic_crossapp_count += 1
 
-      expect( newrelic_request ).to be_a( Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicRequestWrapper )
-      block.call()
+      expect( type   ).to   eq( 'AlchemyFlux' )
+      expect( uri    ).to be_a( URI           )
+      expect( method ).to be_a( String        )
+
+      ::NewRelic::Agent::Transaction::Segment.new
     end
 
-    allow( NewRelic::Agent ).to receive( :disable_all_tracing ) do | &block |
+    # ...and no matter what happens must always then call "finish" on
+    # that segment.
+    #
+    allow_any_instance_of( ::NewRelic::Agent::Transaction::Segment ).to receive( :finish ) do
       @@newrelic_agent_disable_count += 1
-
-      result = block.call()
-      expect( result ).to be_a( Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicResponseWrapper )
-      result
     end
   end
 
@@ -78,7 +79,7 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP, :order => :defined do
   end
 end
 
-describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicRequestWrapper do
+describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AlchemyFluxHTTPRequestWrapper do
   before :each do
     @full_uri     = 'https://test.com:8080/1/Person/1234?_embed=Birthday'
     @http_message = {
@@ -98,7 +99,7 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicRequestWrapper d
   end
 
   it 'reports the correct "type" value' do
-    expect( @wrapper.type ).to eq( 'Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicRequestWrapper' )
+    expect( @wrapper.type ).to eq( 'AlchemyFlux' )
   end
 
   it 'reports the correct "host" value' do
@@ -110,7 +111,35 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicRequestWrapper d
   end
 
   it 'reports the correct "uri" value' do
-    expect( @wrapper.uri ).to eq( @full_uri )
+    expect( @wrapper.uri ).to eq( URI.parse( @full_uri ) )
+  end
+
+  # The next three tests are for "#host_from_header" with behaviour simply
+  # copied from other NewRelic examples. NewRelic source code has very few
+  # comments explaining anything it does, so whether or not the combination
+  # of upper and lower case "host"/"Host" checks is actually important
+  # remains a mystery.
+  #
+  it 'reports the host from a "Host/host" header, lower case first' do
+    @http_message[ 'headers' ][ 'host' ] = 'foo'
+    @http_message[ 'headers' ][ 'Host' ] = 'Bar'
+
+    alt_wrapper = described_class.new( @http_message, @full_uri )
+    expect( alt_wrapper.host_from_header ).to eq( 'foo' )
+  end
+
+  it 'reports the host from a "Host/host" header, upper case last' do
+    @http_message[ 'headers' ][ 'Host' ] = 'Bar'
+
+    alt_wrapper = described_class.new( @http_message, @full_uri )
+    expect( alt_wrapper.host_from_header ).to eq( 'Bar' )
+  end
+
+  it 'survives missing headers when trying to report the host from a "Host/host" header' do
+    @http_message.delete( 'headers' )
+
+    alt_wrapper = described_class.new( @http_message, @full_uri )
+    expect( alt_wrapper.host_from_header ).to eq( nil )
   end
 
   it 'can read headers' do
@@ -123,7 +152,7 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicRequestWrapper d
   end
 end
 
-describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicResponseWrapper do
+describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AlchemyFluxHTTPResponseWrapper do
 
   before :all do
     module NewRelic
@@ -137,7 +166,7 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicResponseWrapper
 
   before :each do
     @http_response = {
-      'headers'      => { NewRelic::Agent::CrossAppTracing::NR_APPDATA_HEADER => '4321' },
+      'headers'      => { ::NewRelic::Agent::CrossAppTracing::NR_APPDATA_HEADER => '4321' },
       'CONTENT_TYPE' => 'application/json; charset=utf-8',
       'HTTP_X_FOO'   => '46'
     }
@@ -150,11 +179,15 @@ describe Hoodoo::Monkey::Patch::NewRelicTracedAMQP::AMQPNewRelicResponseWrapper
   end
 
   it 'accesses the NewRelic NR_APPDATA_HEADER correctly' do
-    expect( @wrapper[ NewRelic::Agent::CrossAppTracing::NR_APPDATA_HEADER ] ).to eq( @http_response[ 'headers' ][ NewRelic::Agent::CrossAppTracing::NR_APPDATA_HEADER ] )
+    expect( @wrapper[ ::NewRelic::Agent::CrossAppTracing::NR_APPDATA_HEADER ] ).to eq( @http_response[ 'headers' ][ ::NewRelic::Agent::CrossAppTracing::NR_APPDATA_HEADER ] )
   end
 
   it 'accesses other headers correctly' do
     expect( @wrapper[ 'CONTENT_TYPE' ] ).to eq( @http_response[ 'CONTENT_TYPE' ] )
     expect( @wrapper[ 'HTTP_X_FOO'   ] ).to eq( @http_response[ 'HTTP_X_FOO'   ] )
   end
+
+  it 'can report headers as a Hash' do
+    expect( @wrapper.to_hash ).to eq( @http_response[ 'headers' ] )
+  end
 end

data/spec/new_relic/agent/logger.rb

@@ -0,0 +1,24 @@
+########################################################################
+# File::    logger.rb
+# (C)::     Loyalty New Zealand 2017
+#
+# Purpose:: Override NewRelic 'new_relic/agent/logger'. See the
+#           top level 'spec/newrelic_rpm.rb' file for details.
+# ----------------------------------------------------------------------
+#           04-Aug-2017 (ADH): Created.
+########################################################################
+
+require 'logger'
+
+# Note that all of this will be defined when the test suite is starting up, but
+# during test runs, local redefinitions of NewRelic and *undefinitions* of that
+# constant will occur. The code only exists so that other "require"s will work
+# and thus provide coverage, mainly inside "newrelic_middleware_analytics.rb".
+#
+module NewRelic
+  module Agent
+    def self.logger
+      Logger.new( File::NULL )
+    end
+  end
+end

data/spec/new_relic/agent/transaction.rb

@@ -0,0 +1,32 @@
+########################################################################
+# File::    transaction.rb
+# (C)::     Loyalty New Zealand 2017
+#
+# Purpose:: Override NewRelic 'new_relic/agent/transaction'. See the
+#           top level 'spec/newrelic_rpm.rb' file for details.
+# ----------------------------------------------------------------------
+#           07-Aug-2017 (ADH): Created.
+########################################################################
+
+# Note that all of this will be defined when the test suite is starting up, but
+# during test runs, local redefinitions of NewRelic and *undefinitions* of that
+# constant will occur. The code only exists so that other "require"s will work
+# and thus provide coverage, mainly inside "newrelic_middleware_analytics.rb".
+#
+module NewRelic
+  module Agent
+    class Transaction
+
+      class Segment
+        def add_request_headers( request ); end
+        def read_response_headers( request ); end
+        def finish(); end
+      end
+
+      def self.start_external_request_segment( type, uri, method )
+        return Segment.new
+      end
+
+    end
+  end
+end

data/spec/services/discovery/discoverers/by_drb/by_drb_spec.rb

@@ -39,7 +39,7 @@ describe Hoodoo::Services::Discovery::ByDRb do
       port = Hoodoo::Utilities.spare_port().to_s
 
       discoverer = Hoodoo::Services::Discovery::ByDRb.new( :drb_port => port )
-      discoverer.announce( :Foo, 1, :host => '127.0.0.1', :port => '9292' )
+      discoverer.announce( :Foo, 1, :host => '127.0.0.1', :port => '9292', :path => '/1/Resource' )
 
       shut_down_drb_service_on( port )
     }.to_not raise_error
@@ -53,7 +53,7 @@ describe Hoodoo::Services::Discovery::ByDRb do
       port = Hoodoo::Utilities.spare_port().to_s
 
       discoverer = Hoodoo::Services::Discovery::ByDRb.new( :drb_port => port )
-      discoverer.announce( :Foo, 1, :host => '127.0.0.1', :port => '9292' )
+      discoverer.announce( :Foo, 1, :host => '127.0.0.1', :port => '9292', :path => '/1/Resource' )
 
       discoverer = Hoodoo::Services::Discovery::ByDRb.new(
         :drb_uri => Hoodoo::Services::Discovery::ByDRb::DRbServer.uri( port )
@@ -65,6 +65,52 @@ describe Hoodoo::Services::Discovery::ByDRb do
     }.to_not raise_error
   end
 
+  it 'allows nil host/port/path but cannot announce remotely, only locally' do
+    port  = Hoodoo::Utilities.spare_port().to_s
+    array = [
+      {                                                               },
+
+      { :host => '127.0.0.1'                                          },
+      {                       :port => '9292'                         },
+      {                                        :path => '/1/Resource' },
+
+      { :host => '127.0.0.1', :port => '9292'                         },
+      {                       :port => '9292', :path => '/1/Resource' },
+      { :host => '127.0.0.1',                  :path => '/1/Resource' },
+    ]
+
+    array.each do | options |
+
+      # Announce and enquire with various incomplete options in one
+      # discoverer; as if this were the declaring service.
+      #
+      discoverer = Hoodoo::Services::Discovery::ByDRb.new( :drb_port => port )
+      discoverer.announce( :Foo, 1, options )
+      expect( discoverer.is_local?( :Foo, 1 ) ).to eq( true )
+
+      # This is important as it has a side effect of starting the DRb
+      # server which may not even be running yet since there have been
+      # no remote announcements. That'd cause the tests below here to
+      # fail since the discoverer is configured there to assume a
+      # running DRb process.
+      #
+      expect( discoverer.send( :discover_remote, :Foo, 1 ) ).to be_nil
+
+      # Now enquire in a new discoverer, which can only get its data
+      # from the DRb service, as if this were a second service.
+      #
+      discoverer = Hoodoo::Services::Discovery::ByDRb.new(
+        :drb_uri => Hoodoo::Services::Discovery::ByDRb::DRbServer.uri( port )
+      )
+
+      expect( discoverer.is_local?( :Foo, 1 ) ).to eq( false )
+      expect( discoverer.discover( :Foo, 1 ) ).to be_nil
+
+    end
+
+    shut_down_drb_service_on( port )
+  end
+
   it 'complains if it cannot contact an existing DRb server' do
     port = Hoodoo::Utilities.spare_port().to_s
     uri  = Hoodoo::Services::Discovery::ByDRb::DRbServer.uri( port )

data/spec/services/middleware/exception_reporting/reporters/airbrake_reporter_spec.rb

@@ -19,7 +19,7 @@ describe Hoodoo::Services::Middleware::ExceptionReporting::AirbrakeReporter do
     it 'calls Airbrake correctly without an "env"' do
       ex = RuntimeError.new( 'A' )
 
-      expect( Airbrake ).to receive( :notify_or_ignore ).once do | e, opts |
+      expect( Airbrake ).to receive( :notify_sync ).once do | e, opts |
         expect( e ).to be_a( Exception )
         expect( opts ).to be_a( Hash )
         expect( opts ).to have_key( :backtrace )
@@ -33,7 +33,7 @@ describe Hoodoo::Services::Middleware::ExceptionReporting::AirbrakeReporter do
       ex       = RuntimeError.new( 'A' )
       mock_env = { 'rack' => 'request' }
 
-      expect( Airbrake ).to receive( :notify_or_ignore ).once do | e, opts |
+      expect( Airbrake ).to receive( :notify_sync ).once do | e, opts |
         expect( e ).to be_a( Exception )
 
         expect( opts ).to be_a( Hash )
@@ -59,7 +59,7 @@ describe Hoodoo::Services::Middleware::ExceptionReporting::AirbrakeReporter do
 
       expect( described_class.instance ).to receive( :user_data_for ).once.and_return( mock_user_data )
 
-      expect( Airbrake ).to receive( :notify_or_ignore ).once do | e, opts |
+      expect( Airbrake ).to receive( :notify_sync ).once do | e, opts |
         expect( e ).to be_a( Exception )
 
         expect( opts ).to be_a( Hash )
@@ -84,7 +84,7 @@ describe Hoodoo::Services::Middleware::ExceptionReporting::AirbrakeReporter do
 
       expect( described_class.instance ).to receive( :user_data_for ).once.and_return( nil )
 
-      expect( Airbrake ).to receive( :notify_or_ignore ).once do | e, opts |
+      expect( Airbrake ).to receive( :notify_sync ).once do | e, opts |
         expect( e ).to be_a( Exception )
 
         expect( opts ).to be_a( Hash )

data/spec/services/middleware/middleware_multi_local_spec.rb

@@ -6,7 +6,8 @@ require 'spec_helper'
 
 # Used for X-Assume-Identity-Of testing to avoid magic value copy-and-paste.
 #
-VALID_ASSUMED_IDENTITY_HASH ||= { 'caller_id' => 'custom_caller_id' }
+MMLS_CUSTOM_CALLER_ID            = 'custom_caller_id'
+MMLS_VALID_ASSUMED_IDENTITY_HASH = { 'caller_id' => MMLS_CUSTOM_CALLER_ID }
 
 # This gets inter-resource called from ...BImplementation. It expects search
 # data containing an 'offset' key and string/integer value. If > 0, an error
@@ -40,7 +41,10 @@ class RSpecTestInterResourceCallsAImplementation < Hoodoo::Services::Implementat
         :reference => { :another => 'no other ident', :field_name => 'no ident' }
       )
     elsif context.request.ident == 'hello_return_identity' || context.request.ident == 'hello_set_good_inter_resource_identity'
-      context.response.set_resource( { 'identity' => context.session.identity.to_h } )
+      context.response.body = {
+        'identity'    => context.session.identity.to_h,
+        'fingerprint' => context.session.caller_fingerprint
+      }
     else
       context.response.set_resource( { 'inner' => 'shown' } )
     end
@@ -167,10 +171,10 @@ class RSpecTestInterResourceCallsBImplementation < Hoodoo::Services::Implementat
 
       if ( context.request.ident == 'set_bad_inter_resource_identity' )
         resource.assume_identity_of = {
-          VALID_ASSUMED_IDENTITY_HASH.keys.first => Hoodoo::UUID.generate
+          MMLS_VALID_ASSUMED_IDENTITY_HASH.keys.first => Hoodoo::UUID.generate
         }
       elsif ( context.request.ident == 'set_good_inter_resource_identity' )
-        resource.assume_identity_of = VALID_ASSUMED_IDENTITY_HASH
+        resource.assume_identity_of = MMLS_VALID_ASSUMED_IDENTITY_HASH
       end
 
       result = resource.show(
@@ -318,13 +322,18 @@ end
 describe Hoodoo::Services::Middleware::InterResourceLocal do
 
   before :each do
-    @test_uuid = Hoodoo::UUID.generate()
     @old_test_session = Hoodoo::Services::Middleware.test_session()
+
     @test_session = @old_test_session.dup
+    @test_session.caller_fingerprint = @caller_fingerprint = Hoodoo::UUID.generate()
+
     permissions = Hoodoo::Services::Permissions.new # (this is "default-else-deny")
     permissions.set_default_fallback( Hoodoo::Services::Permissions::ALLOW )
     @test_session.permissions = permissions
+
+    @test_session.scoping = @test_session.scoping.dup
     @test_session.scoping.authorised_http_headers = [] # (no secured headers allowed to start with)
+
     Hoodoo::Services::Middleware.set_test_session( @test_session )
   end
 
@@ -395,6 +404,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
       expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
       expect(context.request.deja_vu).to eq(nil)       # Not used => expect 'nil'
       expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+      expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
     end
     # -> A
       expect_any_instance_of(RSpecTestInterResourceCallsAImplementation).to receive(:list).once.and_call_original
@@ -412,6 +422,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
         expect(context.request.deja_vu).to eq(nil)       # Not used => expect 'nil'
         expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+        expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
       end
     # <- B
     expect_any_instance_of(RSpecTestInterResourceCallsBImplementation).to receive(:expectable_result_hook).once do | ignored_rspec_mock_instance, result |
@@ -548,6 +559,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
       expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
       expect(context.request.deja_vu).to eq(nil)       # Not used => expect 'nil'
       expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+      expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
     end
     # -> A
       expect_any_instance_of(RSpecTestInterResourceCallsAImplementation).to receive(:show).once.and_call_original
@@ -565,6 +577,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
         expect(context.request.deja_vu).to eq(nil)       # Not used => expect 'nil'
         expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+        expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
       end
     # <- B
     expect_any_instance_of(RSpecTestInterResourceCallsBImplementation).to receive(:expectable_result_hook).once do | ignored_rspec_mock_instance, result |
@@ -631,6 +644,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
       expect(context.request.dated_from).to eq(dated_from)       # Is used
       expect(context.request.deja_vu).to eq(deja_vu)             # Is used
       expect(context.request.resource_uuid).to eq(resource_uuid) # Is used
+      expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
     end
     # -> A
       expect_any_instance_of(RSpecTestInterResourceCallsAImplementation).to receive(:create).once.and_call_original
@@ -645,6 +659,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         expect(context.request.dated_from).to eq(dated_from) # Is passed through inter-resource calls
         expect(context.request.deja_vu).to eq(nil)           # Is not passed through inter-resource calls
         expect(context.request.resource_uuid).to eq(nil)     # Is not passed through inter-resource calls
+        expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
       end
     # <- B
     expect_any_instance_of(RSpecTestInterResourceCallsBImplementation).to receive(:expectable_result_hook).once do | ignored_rspec_mock_instance, result |
@@ -877,6 +892,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
       expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
       expect(context.request.deja_vu).to eq(nil)       # Not used => expect 'nil'
       expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+      expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
     end
     # -> A
       expect_any_instance_of(RSpecTestInterResourceCallsAImplementation).to receive(:update).once.and_call_original
@@ -891,6 +907,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
         expect(context.request.deja_vu).to eq(nil)       # Not used => expect 'nil'
         expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+        expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
       end
     # <- B
     expect_any_instance_of(RSpecTestInterResourceCallsBImplementation).to receive(:expectable_result_hook).once do | ignored_rspec_mock_instance, result |
@@ -955,6 +972,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
       expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
       expect(context.request.deja_vu).to eq(deja_vu)   # Is used
       expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+      expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
     end
     # -> A
       expect_any_instance_of(RSpecTestInterResourceCallsAImplementation).to receive(:delete).once.and_call_original
@@ -969,6 +987,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         expect(context.request.dated_from).to eq(nil)    # Not used => expect 'nil'
         expect(context.request.deja_vu).to eq(nil)       # Is not passed through inter-resource calls
         expect(context.request.resource_uuid).to eq(nil) # Not used => expect 'nil'
+        expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
       end
     # <- B
     expect_any_instance_of(RSpecTestInterResourceCallsBImplementation).to receive(:expectable_result_hook).once do | ignored_rspec_mock_instance, result |
@@ -1064,6 +1083,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         expect(context.request.uri_path_extension).to eq('')
         expect(context.request.list.offset).to eq(0)
         expect(context.request.list.limit).to eq(50)
+        expect(context.session.caller_fingerprint).to eq(@caller_fingerprint)
       end
     # <- B
     expect_any_instance_of(RSpecTestInterResourceCallsBImplementation).to receive(:expectable_result_hook).once.and_call_original
@@ -1090,8 +1110,8 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
 
         test_session.scoping.authorised_http_headers = [ 'X-Assume-Identity-Of' ]
         test_session.scoping.authorised_identities   = {
-          VALID_ASSUMED_IDENTITY_HASH.keys.first =>
-          [ VALID_ASSUMED_IDENTITY_HASH.values.first ]
+          MMLS_VALID_ASSUMED_IDENTITY_HASH.keys.first =>
+          [ MMLS_VALID_ASSUMED_IDENTITY_HASH.values.first ]
         }
 
         Hoodoo::Services::Middleware.set_test_session( test_session )
@@ -1108,12 +1128,16 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
             nil,
             {
               'CONTENT_TYPE' => 'application/json; charset=utf-8',
-              'HTTP_X_ASSUME_IDENTITY_OF' => URI.encode_www_form( VALID_ASSUMED_IDENTITY_HASH )
+              'HTTP_X_ASSUME_IDENTITY_OF' => URI.encode_www_form( MMLS_VALID_ASSUMED_IDENTITY_HASH )
             }
           )
 
           result = JSON.parse( last_response.body )
-          expect( result[ 'result' ][ 'identity' ] ).to eq( VALID_ASSUMED_IDENTITY_HASH )
+
+          expect( result[ 'result' ] ).to eq( {
+            'identity'    => MMLS_VALID_ASSUMED_IDENTITY_HASH,
+            'fingerprint' => @caller_fingerprint
+          } )
         end
 
         it 'cannot set an illegal identity in the inter-resource call' do
@@ -1122,7 +1146,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
             nil,
             {
               'CONTENT_TYPE' => 'application/json; charset=utf-8',
-              'HTTP_X_ASSUME_IDENTITY_OF' => URI.encode_www_form( VALID_ASSUMED_IDENTITY_HASH )
+              'HTTP_X_ASSUME_IDENTITY_OF' => URI.encode_www_form( MMLS_VALID_ASSUMED_IDENTITY_HASH )
             }
           )
 
@@ -1133,7 +1157,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
       end
 
       context 'in inter-resource call only' do
-        identity_hash = { 'caller_id' => 'custom_caller_id' }
+        identity_hash = { 'caller_id' => MMLS_CUSTOM_CALLER_ID }
 
         it 'can still set identity for the downstream resource' do
           get(
@@ -1143,7 +1167,11 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
           )
 
           result = JSON.parse( last_response.body )
-          expect( result[ 'result' ][ 'identity' ] ).to eq( VALID_ASSUMED_IDENTITY_HASH )
+
+          expect( result[ 'result' ] ).to eq( {
+            'identity'    => MMLS_VALID_ASSUMED_IDENTITY_HASH,
+            'fingerprint' => @caller_fingerprint
+          } )
         end
 
         it 'cannot set an illegal identity for the downstream resource' do
@@ -1169,7 +1197,7 @@ describe Hoodoo::Services::Middleware::InterResourceLocal do
         test_session.scoping  = test_session.scoping.dup
 
         test_session.scoping.authorised_http_headers = [] # NO ALLOWED HEADERS
-        test_session.scoping.authorised_identities   = { 'caller_id' => [ 'custom_caller_id' ] }
+        test_session.scoping.authorised_identities   = { 'caller_id' => [ MMLS_CUSTOM_CALLER_ID ] }
 
         Hoodoo::Services::Middleware.set_test_session( test_session )
       end