Permit raw type values in Elastic APM config (#946)

Resolves #935

Signed-off-by: Daniel Mikusa <[email protected]>

Author: Daniel Mikusa

lib/java_buildpack/framework/elastic_apm_agent.rb

@@ -90,7 +90,7 @@ def apply_user_configuration(credentials, configuration)
 
       def write_java_opts(java_opts, configuration)
         configuration.each do |key, value|
-          if /\$[({][^)}]+[)}]/ =~ value
+          if /\$[({][^)}]+[)}]/ =~ value.to_s
             # we need \" because this is a system property which ends up inside `JAVA_OPTS` which is already quoted
             java_opts.add_system_property("elastic.apm.#{key}", "\\\"#{value}\\\"")
           else

spec/java_buildpack/framework/elastic_apm_agent_spec.rb

@@ -59,30 +59,34 @@
       expect(java_opts).to include('-Delastic.apm.log_file_name=STDOUT')
     end
 
-    it 'updates JAVA_OPTS with additional options' do
-      val = 'object_name[java.lang:type=Memory] attribute[HeapMemoryUsage:metric_name=test_heap_metric]'
-      shell = '$(echo \'Hello world!\') and stuff'
-      var = '--> ${SOME_VAR} <--'
-      allow(services).to receive(:find_service).and_return('credentials' => { 'secret_token' => 'test-secret_token',
-                                                                              'server_urls' => 'different-serverurl',
-                                                                              'service_name' => 'different-name',
-                                                                              'foo' => 'bar',
-                                                                              'capture_jmx_metrics' => val,
-                                                                              'sub' => shell,
-                                                                              'var' => var })
-
-      component.release
-
-      expect(java_opts).to include('-Delastic.apm.secret_token=test-secret_token')
-      expect(java_opts).to include('-Delastic.apm.server_urls=different-serverurl')
-      expect(java_opts).to include('-Delastic.apm.service_name=different-name')
-      expect(java_opts).to include('-Delastic.apm.foo=bar')
-      escaped = 'object_name\[java.lang:type\=Memory\]\ attribute\[HeapMemoryUsage:metric_name\=test_heap_metric\]'
-      expect(java_opts).to include("-Delastic.apm.capture_jmx_metrics=#{escaped}")
-      expect(java_opts).to include('-Delastic.apm.sub=\"$(echo \'Hello world!\') and stuff\"')
-      expect(java_opts).to include('-Delastic.apm.var=\"--> ${SOME_VAR} <--\"')
+    context do
+      let(:creds) do
+        { 'secret_token' => 'test-secret_token',
+          'server_urls' => 'different-serverurl',
+          'service_name' => 'different-name',
+          'foo' => 'bar',
+          'capture_jmx_metrics' => 'object_name[java.lang:type=Memory] ' \
+                                   'attribute[HeapMemoryUsage:metric_name=test_heap_metric]',
+          'sub' => '$(echo \'Hello world!\') and stuff',
+          'var' => '--> ${SOME_VAR} <--',
+          'bool' => false,
+          'nil' => nil }
+      end
+
+      it 'updates JAVA_OPTS with additional options' do
+        allow(services).to receive(:find_service).and_return('credentials' => creds)
+
+        component.release
+
+        expect(java_opts).to include('-Delastic.apm.secret_token=test-secret_token')
+        expect(java_opts).to include('-Delastic.apm.server_urls=different-serverurl')
+        expect(java_opts).to include('-Delastic.apm.service_name=different-name')
+        expect(java_opts).to include('-Delastic.apm.foo=bar')
+        escaped = 'object_name\[java.lang:type\=Memory\]\ attribute\[HeapMemoryUsage:metric_name\=test_heap_metric\]'
+        expect(java_opts).to include("-Delastic.apm.capture_jmx_metrics=#{escaped}")
+        expect(java_opts).to include('-Delastic.apm.sub=\"$(echo \'Hello world!\') and stuff\"')
+        expect(java_opts).to include('-Delastic.apm.var=\"--> ${SOME_VAR} <--\"')
+      end
     end
-
   end
-
 end