Merge branch 'martinpfeifer-dd-version-env-var'

Author: Daniel Mikusa

lib/java_buildpack/framework/datadog_javaagent.rb

@@ -50,9 +50,8 @@ def release
           java_opts.add_system_property('dd.service', "\\\"#{app_name}\\\"")
         end
 
-        return unless @application.details['application_version']
-
-        version = @configuration['default_application_version'] || @application.details['application_version']
+        version = @application.environment['DD_VERSION'] || @configuration['default_application_version'] ||
+          @application.details['application_version']
         java_opts.add_system_property('dd.version', version)
       end
 

spec/java_buildpack/framework/datadog_javaagent_spec.rb

@@ -107,4 +107,24 @@
       end
     end
   end
+
+  context 'when dd_version environment variable is provided' do
+    let(:environment) do
+      super().update({ 'DD_VERSION' => 'env-variable-version' })
+    end
+
+    before do
+      FileUtils.mkdir_p File.join(context[:droplet].root, 'datadog')
+    end
+
+    after do
+      FileUtils.rmdir File.join(context[:droplet].root, 'datadog')
+    end
+
+    it 'release updates JAVA_OPTS with env variable version' do
+      component.release
+
+      expect(java_opts).to include('-Ddd.version=env-variable-version')
+    end
+  end
 end