Skip to content

Commit 548c8fb

Browse files
Bump Skywalking agent to use latest available version (#927)
Fixed path location of Java Agent in the downloaded tar
1 parent 7322eff commit 548c8fb

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

config/sky_walking_agent.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515

1616
# Configuration for the Sky Walking framework.
1717
---
18-
version: 6.+
18+
version: +
1919
repository_root: https://java-buildpack.cloudfoundry.org/sky-walking
2020
default_application_name: $(jq -r -n "$VCAP_APPLICATION | .space_name + \":\" + .application_name | @sh")

lib/java_buildpack/framework/sky_walking_agent.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def compile
3535
def release
3636
credentials = @application.services.find_service(FILTER, 'servers')['credentials']
3737
java_opts = @droplet.java_opts
38-
java_opts.add_javaagent(@droplet.sandbox + 'agent/skywalking-agent.jar')
38+
java_opts.add_javaagent(@droplet.sandbox + 'skywalking-agent.jar')
3939

4040
application_name java_opts, credentials
4141
sample_n_per_3_secs java_opts, credentials
338 Bytes
Binary file not shown.

spec/java_buildpack/framework/sky_walking_agent_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
component.compile
5050

51-
expect(sandbox + 'agent/skywalking-agent.jar').to exist
51+
expect(sandbox + 'skywalking-agent.jar').to exist
5252
end
5353

5454
it 'raises error if servers not specified' do
@@ -62,7 +62,7 @@
6262
it 'updates JAVA_OPTS' do
6363
component.release
6464

65-
expect(java_opts).to include('-javaagent:$PWD/.java-buildpack/sky_walking_agent/agent/skywalking-agent.jar')
65+
expect(java_opts).to include('-javaagent:$PWD/.java-buildpack/sky_walking_agent/skywalking-agent.jar')
6666
expect(java_opts).to include('-Dskywalking.collector.servers=test-servers')
6767
expect(java_opts).to include('-Dskywalking.agent.application_code=test-application-name')
6868
end

0 commit comments

Comments
 (0)