Skip to content

Commit f4cac21

Browse files
committed
Polishing
[resolves #753] Signed-off-by: Ben Hale <[email protected]>
1 parent a43eaa7 commit f4cac21

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

lib/java_buildpack/framework/app_dynamics_agent.rb

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ module Framework
2424

2525
# Encapsulates the functionality for enabling zero-touch AppDynamics support.
2626
class AppDynamicsAgent < JavaBuildpack::Component::VersionedDependencyComponent
27-
@conf_files = [
28-
'logging/log4j2.xml',
29-
'logging/log4j.xml',
30-
'app-agent-config.xml',
31-
'controller-info.xml',
32-
'service-endpoint.xml',
33-
'transactions.xml'
34-
]
3527

3628
def initialize(context)
3729
super(context)
@@ -43,7 +35,7 @@ def compile
4335
download_zip(false, @droplet.sandbox, 'AppDynamics Agent')
4436

4537
# acessor for resources dir through @droplet?
46-
resources_dir = Pathname.new(File.expand_path('../../../resources', __dir__)).freeze
38+
resources_dir = Pathname.new(File.expand_path('../../../resources', __dir__)).freeze
4739
default_conf_dir = resources_dir + @droplet.component_id + 'defaults'
4840

4941
copy_appd_default_configuration(default_conf_dir)
@@ -54,7 +46,7 @@ def compile
5446
# (see JavaBuildpack::Component::BaseComponent#release)
5547
def release
5648
credentials = @application.services.find_service(FILTER, 'host-name')['credentials']
57-
java_opts = @droplet.java_opts
49+
java_opts = @droplet.java_opts
5850
java_opts.add_javaagent(@droplet.sandbox + 'javaagent.jar')
5951

6052
application_name java_opts, credentials
@@ -77,9 +69,12 @@ def supports?
7769

7870
private
7971

72+
CONFIG_FILES = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
73+
service-endpoint.xml transactions.xml].freeze
74+
8075
FILTER = /app[-]?dynamics/.freeze
8176

82-
private_constant :FILTER
77+
private_constant :CONFIG_FILES, :FILTER
8378

8479
def application_name(java_opts, credentials)
8580
name = credentials['application-name'] || @configuration['default_application_name'] ||
@@ -177,7 +172,7 @@ def override_default_config_if_applicable
177172

178173
agent_root = @application.environment['APPD_CONF_HTTP_URL'].chomp('/') + '/java/'
179174
@logger.info { "Downloading override configuration files from #{agent_root}" }
180-
JavaBuildpack::Framework::AppDynamicsAgent.instance_variable_get(:@conf_files).each do |conf_file|
175+
CONFIG_FILES.each do |conf_file|
181176
uri = URI(agent_root + conf_file)
182177

183178
# `download()` uses retries with exponential backoff which is expensive

spec/java_buildpack/framework/app_dynamics_agent_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,11 @@
149149

150150
it 'sets APPD_CONF_HTTP_URL env var to download config files from',
151151
cache_fixture: 'stub-app-dynamics-agent.zip' do
152-
conf_files.each do |file|
152+
153+
config_files = %w[logging/log4j2.xml logging/log4j.xml app-agent-config.xml controller-info.xml
154+
service-endpoint.xml transactions.xml]
155+
156+
config_files.each do |file|
153157
uri = "http://foo.com/java/#{file}"
154158
allow(application_cache).to receive(:get)
155159
.with(uri)

0 commit comments

Comments
 (0)