Merge branch '3.x'

mateuszrzeszutek · Apr 7, 2017 · f58ce04 · f58ce04
2 parents 6d7989a + a3a9e61
commit f58ce04
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/config/app_dynamics_agent.yml b/config/app_dynamics_agent.yml
@@ -16,8 +16,9 @@
 # Configuration for the AppDynamics framework
 ---
 version: 4.+
-repository_root: ""
-default_application_name:
+repository_root: "https://packages.appdynamics.com/java"
+default_application_name: $(ruby -e "require 'json' ; a = JSON.parse(ENV['VCAP_APPLICATION']);
+  puts \"#{a['space_name']}:#{a['application_name']}\"")
 default_node_name: $(ruby -e "require 'json' ; a = JSON.parse(ENV['VCAP_APPLICATION']);
   puts \"#{a['application_name']}:#{a['instance_index']}\"")
 default_tier_name:
diff --git a/config/components.yml b/config/components.yml
@@ -36,7 +36,7 @@ jres:
 # Frameworks are processed in order. Any Java Opts added by the JavaOpts framework will be specified in the start
 # command after any Java Opts added by previous frameworks.
 frameworks:
-# - "JavaBuildpack::Framework::AppDynamicsAgent"
+  - "JavaBuildpack::Framework::AppDynamicsAgent"
   - "JavaBuildpack::Framework::ContainerCertificateTrustStore"
   - "JavaBuildpack::Framework::ContainerCustomizer"
   - "JavaBuildpack::Framework::Debug"