Merge branch 'shorter-ids'

APegaDavis · Jun 14, 2017 · 95f52d1 · 95f52d1
2 parents 4c94631 + 990b230
commit 95f52d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/java_buildpack/jre/jvmkill_agent.rb b/lib/java_buildpack/jre/jvmkill_agent.rb
@@ -57,7 +57,7 @@ def supports?
       private_constant :FILTER
 
       def application_identifier
-        "#{@application.details['application_name']}-#{@application.details['application_id']}"
+        "#{@application.details['application_name']}-#{@application.details['application_id'][0...8]}"
       end
 
       def container_dir
@@ -69,15 +69,15 @@ def heap_dump_path
       end
 
       def instance_identifier
-        '$CF_INSTANCE_INDEX-%FT%T%z-$CF_INSTANCE_GUID'
+        '$CF_INSTANCE_INDEX-%FT%T%z-${CF_INSTANCE_GUID:0:8}'
       end
 
       def jvmkill_agent
         @droplet.sandbox + "bin/jvmkill-#{@version}"
       end
 
       def space_identifier
-        "#{@application.details['space_name']}-#{@application.details['space_id']}"
+        "#{@application.details['space_name']}-#{@application.details['space_id'][0...8]}"
       end
 
     end

diff --git a/spec/java_buildpack/jre/jvmkill_agent_spec.rb b/spec/java_buildpack/jre/jvmkill_agent_spec.rb
@@ -50,9 +50,9 @@
     component.release
 
     expect(java_opts).to include('-agentpath:$PWD/.java-buildpack/jvmkill_agent/bin/jvmkill-0.0.0=' \
-                                 'printHeapHistogram=1,heapDumpPath=test-container-dir/test-space-name-test-space-id/' \
-                                 'test-application-name-test-application-id/$CF_INSTANCE_INDEX-%FT%T%z-' \
-                                 '$CF_INSTANCE_GUID.hprof')
+                                 'printHeapHistogram=1,heapDumpPath=test-container-dir/test-space-name-test-spa/' \
+                                 'test-application-name-test-app/$CF_INSTANCE_INDEX-%FT%T%z-' \
+                                 '${CF_INSTANCE_GUID:0:8}.hprof')
   end
 
 end