Merge branch '3.x'

nebhale · nebhale · commit 05b7eb57788d · 2017-06-09T10:05:43.000-07:00
diff --git a/docs/framework-metric_writer.md b/docs/framework-metric_writer.md
@@ -21,7 +21,7 @@ The credential payload of the service may contain the following entries:
 | Name | Description
 | ---- | -----------
 | `access_key` | The access key used to authenticate agains the endpoint
-| `hostname` | The hostname of the endpoint
+| `endpoint` | The endpoint
 
 ## Configuration
 For general information on configuring the buildpack, including how to specify configuration values through environment variables, refer to [Configuration and Extension][].
diff --git a/lib/java_buildpack/framework/metric_writer.rb b/lib/java_buildpack/framework/metric_writer.rb
@@ -36,7 +36,7 @@ def release
         @droplet.java_opts
                 .add_system_property('cloudfoundry.metrics.accessToken', credentials[ACCESS_KEY])
                 .add_system_property('cloudfoundry.metrics.applicationId', @application.details['application_id'])
-                .add_system_property('cloudfoundry.metrics.endpoint', "https://#{credentials[HOSTNAME]}")
+                .add_system_property('cloudfoundry.metrics.endpoint', credentials[ENDPOINT])
                 .add_system_property('cloudfoundry.metrics.instanceId', '$CF_INSTANCE_GUID')
                 .add_system_property('cloudfoundry.metrics.instanceIndex', '$CF_INSTANCE_INDEX')
       end
@@ -45,16 +45,16 @@ def release
 
       # (see JavaBuildpack::Component::VersionedDependencyComponent#supports?)
       def supports?
-        @application.services.one_service? FILTER, ACCESS_KEY, HOSTNAME
+        @application.services.one_service? FILTER, ACCESS_KEY, ENDPOINT
       end
 
       ACCESS_KEY = 'access_key'.freeze
 
-      FILTER = /metrics-forwarder/
+      ENDPOINT = 'endpoint'.freeze
 
-      HOSTNAME = 'hostname'.freeze
+      FILTER = /metrics-forwarder/
 
-      private_constant :ACCESS_KEY, :FILTER, :HOSTNAME
+      private_constant :ACCESS_KEY, :ENDPOINT, :FILTER
 
     end
 
diff --git a/spec/java_buildpack/framework/metric_writer_spec.rb b/spec/java_buildpack/framework/metric_writer_spec.rb
@@ -27,7 +27,7 @@
   context do
 
     before do
-      allow(services).to receive(:one_service?).with(/metrics-forwarder/, 'access_key', 'hostname').and_return(true)
+      allow(services).to receive(:one_service?).with(/metrics-forwarder/, 'access_key', 'endpoint').and_return(true)
     end
 
     it 'detects with metric-forwarder service' do
@@ -54,7 +54,7 @@
        cache_fixture: 'stub-metric-writer.jar' do
 
       allow(services).to receive(:find_service).and_return('credentials' => { 'access_key' => 'test-access-key',
-                                                                              'hostname'   => 'test-hostname' })
+                                                                              'endpoint'   => 'https://test-endpoint' })
 
       component.release
 
@@ -63,13 +63,13 @@
 
     it 'updates JAVA_OPTS' do
       allow(services).to receive(:find_service).and_return('credentials' => { 'access_key' => 'test-access-key',
-                                                                              'hostname'   => 'test-hostname' })
+                                                                              'endpoint'   => 'https://test-endpoint' })
 
       component.release
 
       expect(java_opts).to include('-Dcloudfoundry.metrics.accessToken=test-access-key')
       expect(java_opts).to include('-Dcloudfoundry.metrics.applicationId=test-application-id')
-      expect(java_opts).to include('-Dcloudfoundry.metrics.endpoint=https://test-hostname')
+      expect(java_opts).to include('-Dcloudfoundry.metrics.endpoint=https://test-endpoint')
       expect(java_opts).to include('-Dcloudfoundry.metrics.instanceId=$CF_INSTANCE_GUID')
       expect(java_opts).to include('-Dcloudfoundry.metrics.instanceIndex=$CF_INSTANCE_INDEX')
     end
