Merge branch '714-modern-skywalking'

Signed-off-by: Ben Hale <[email protected]>
cloudfoundry · Jul 15, 2019 · 2cd7e3e · 2cd7e3e
2 parents baa12dd + be0d204
commit 2cd7e3e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/config/sky_walking_agent.yml b/config/sky_walking_agent.yml
@@ -15,6 +15,6 @@
 
 # Configuration for the Sky Walking framework.
 ---
-version: 3.+
+version: 6.+
 repository_root: https://java-buildpack.cloudfoundry.org/sky-walking
 default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name | @sh")
diff --git a/lib/java_buildpack/framework/sky_walking_agent.rb b/lib/java_buildpack/framework/sky_walking_agent.rb
@@ -35,7 +35,7 @@ def compile
       def release
         credentials = @application.services.find_service(FILTER, 'servers')['credentials']
         java_opts = @droplet.java_opts
-        java_opts.add_javaagent(@droplet.sandbox + 'skywalking-agent.jar')
+        java_opts.add_javaagent(@droplet.sandbox + 'agent/skywalking-agent.jar')
 
         application_name java_opts, credentials
         sample_n_per_3_secs java_opts, credentials

diff --git a/spec/fixtures/stub-skywalking-agent.tar.gz b/spec/fixtures/stub-skywalking-agent.tar.gz
diff --git a/spec/java_buildpack/framework/sky_walking_agent_spec.rb b/spec/java_buildpack/framework/sky_walking_agent_spec.rb
@@ -48,7 +48,7 @@
 
       component.compile
 
-      expect(sandbox + 'skywalking-agent.jar').to exist
+      expect(sandbox + 'agent/skywalking-agent.jar').to exist
     end
 
     it 'raises error if servers not specified' do
@@ -62,7 +62,7 @@
       it 'updates JAVA_OPTS' do
         component.release
 
-        expect(java_opts).to include('-javaagent:$PWD/.java-buildpack/sky_walking_agent/skywalking-agent.jar')
+        expect(java_opts).to include('-javaagent:$PWD/.java-buildpack/sky_walking_agent/agent/skywalking-agent.jar')
         expect(java_opts).to include('-Dskywalking.collector.servers=test-servers')
         expect(java_opts).to include('-Dskywalking.agent.application_code=test-application-name')
       end