Skip to content

Commit ff8f0ea

Browse files
committed
Merge branch '772-appdynamics-config-files'
Signed-off-by: Ben Hale <[email protected]>
2 parents 42e6a5b + 93d1eba commit ff8f0ea

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/java_buildpack/framework/app_dynamics_agent.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ def supports?
7070
private
7171

7272
CONFIG_FILES = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
73-
service-endpoint.xml transactions.xml].freeze
73+
service-endpoint.xml transactions.xml custom-interceptors.xml
74+
custom-activity-correlation.xml].freeze
7475

7576
FILTER = /app[-]?dynamics/.freeze
7677

spec/java_buildpack/framework/app_dynamics_agent_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@
151151
cache_fixture: 'stub-app-dynamics-agent.zip' do
152152

153153
config_files = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
154-
service-endpoint.xml transactions.xml]
154+
service-endpoint.xml transactions.xml custom-interceptors.xml
155+
custom-activity-correlation.xml]
155156

156157
config_files.each do |file|
157158
uri = "http://foo.com/java/#{file}"

0 commit comments

Comments
 (0)