Merge branch '738-unique-host-id'

Signed-off-by: Ben Hale <[email protected]>

Author: nebhale

config/app_dynamics_agent.yml

@@ -18,5 +18,6 @@
 version: 4.+
 repository_root: https://packages.appdynamics.com/java
 default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name | @sh")
-default_node_name: $(jq -r -n "$VCAP_APPLICATION | .application_name"):$CF_INSTANCE_INDEX
+default_node_name: $(jq -r -n "$VCAP_APPLICATION | .application_name + \":$CF_INSTANCE_INDEX\"")
 default_tier_name: 
+default_unique_host_name: $(jq -r -n "$VCAP_APPLICATION | .application_id + \":$CF_INSTANCE_INDEX\"")

lib/java_buildpack/framework/app_dynamics_agent.rb

@@ -52,6 +52,7 @@ def release
         host_name java_opts, credentials
         port java_opts, credentials
         ssl_enabled java_opts, credentials
+        unique_host_name java_opts
       end
 
       protected
@@ -74,7 +75,7 @@ def application_name(java_opts, credentials)
       end
 
       def account_access_key(java_opts, credentials)
-        account_access_key = credentials['account-access-key']
+        account_access_key = credentials['account-access-key'] || credentials.dig('account-access-secret', 'secret')
         java_opts.add_system_property 'appdynamics.agent.accountAccessKey', account_access_key if account_access_key
       end
 
@@ -111,6 +112,11 @@ def tier_name(java_opts, credentials)
         java_opts.add_system_property('appdynamics.agent.tierName', name.to_s)
       end
 
+      def unique_host_name(java_opts)
+        name = @configuration['default_unique_host_name'] || @application.details['application_name']
+        java_opts.add_system_property('appdynamics.agent.uniqueHostId', name.to_s)
+      end
+
       # Copy default configuration present in resources folder of app_dynamics_agent ver* directories present in sandbox
       #
       # @param [Pathname] default_conf_dir the 'defaults' directory present in app_dynamics_agent resources.