Merge branch '772-appdynamics-config-files'

Signed-off-by: Ben Hale <bhale@pivotal.io>
mateuszrzeszutek · Feb 5, 2020 · ff8f0ea · ff8f0ea
2 parents 42e6a5b + 93d1eba
commit ff8f0ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/java_buildpack/framework/app_dynamics_agent.rb b/lib/java_buildpack/framework/app_dynamics_agent.rb
@@ -70,7 +70,8 @@ def supports?
       private
 
       CONFIG_FILES = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
-                        service-endpoint.xml transactions.xml].freeze
+                        service-endpoint.xml transactions.xml custom-interceptors.xml
+                        custom-activity-correlation.xml].freeze
 
       FILTER = /app[-]?dynamics/.freeze
 

diff --git a/spec/java_buildpack/framework/app_dynamics_agent_spec.rb b/spec/java_buildpack/framework/app_dynamics_agent_spec.rb
@@ -151,7 +151,8 @@
            cache_fixture: 'stub-app-dynamics-agent.zip' do
 
           config_files = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
-                            service-endpoint.xml transactions.xml]
+                            service-endpoint.xml transactions.xml custom-interceptors.xml
+                            custom-activity-correlation.xml]
 
           config_files.each do |file|
             uri = "http://foo.com/java/#{file}"