Skip to content

Commit 5cb22f2

Browse files
committed
Merge branch 'expr-sucks'
2 parents f497475 + 4985ea7 commit 5cb22f2

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

config/app_dynamics_agent.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
version: 4.1.+
1919
repository_root: ! '{default.repository.root}/app-dynamics'
2020
default_application_name:
21-
default_node_name: ! '$(expr "$VCAP_APPLICATION" : ''.*application_name[": ]*\([-_a-zA-Z0-9]*\).*''):$(expr "$VCAP_APPLICATION" : ''.*instance_index[": ]*\([[:digit:]]*\).*'')'
21+
default_node_name: ! '$(ruby -e "require ''json'' ; a = JSON.parse(ENV[''VCAP_APPLICATION'']); puts \"#{a[''application_name'']}:#{a[''instance_index'']}\"")'
2222
default_tier_name:

config/introscope_agent.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717
---
1818
repository_root: ""
1919
version: 9.7.+
20-
default_agent_name: "$(expr \"$VCAP_APPLICATION\" : \'.*application_name[\": ]*\\([A-Za-z0-9_-]*\\).*\')"
20+
default_agent_name: ! '$(ruby -e "require ''json'' ; puts JSON.parse(ENV[''VCAP_APPLICATION''])[''application_name'']")'

config/your_kit_profiler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ version: 2015.+
1919
repository_root: ! '{default.repository.root}/your-kit/{platform}/{architecture}'
2020
enabled: false
2121
port: 10001
22-
default_session_name: ! '$(expr "$VCAP_APPLICATION" : ''.*application_name[": ]*\([-_a-zA-Z0-9]*\).*''):$(expr "$VCAP_APPLICATION" : ''.*instance_index[": ]*\([[:digit:]]*\).*'')'
22+
default_session_name: ! '$(ruby -e "require ''json'' ; a = JSON.parse(ENV[''VCAP_APPLICATION'']); puts \"#{a[''application_name'']}:#{a[''instance_index'']}\"")'

0 commit comments

Comments
 (0)