Skip to content

Commit 71b5948

Browse files
committed
only set otel.service.name from application_name if not set in credentials
1 parent 8e0e951 commit 71b5948

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

lib/java_buildpack/framework/splunk_otel_java_agent.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ def release
4040
java_opts.add_system_property(key, value) if key.start_with?('splunk.') || key.start_with?('otel.')
4141
end
4242

43+
# Set the otel.service.name to the application_name if not specified in credentials
44+
return if credentials.key? 'otel.service.name'
45+
4346
app_name = @application.details['application_name']
4447
java_opts.add_system_property('otel.service.name', app_name)
4548
end
@@ -51,6 +54,7 @@ def supports?
5154
@application.services.one_service? REQUIRED_SERVICE_NAME_FILTER
5255
end
5356

57+
# bound service must contain the string `splunk-o11y`
5458
REQUIRED_SERVICE_NAME_FILTER = /splunk-o11y/.freeze
5559

5660
end

spec/java_buildpack/framework/splunk_otel_java_agent_spec.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,21 @@
6262

6363
it 'sets the service name from the application name' do
6464
allow(services).to receive(:find_service).and_return('credentials' => { 'splunk.access.token' => 'sekret' })
65-
# allow(details).to be( { 'application_name' => 'dick' })
6665

6766
component.release
6867

6968
expect(java_opts).to include('-Dotel.service.name=GreatServiceTM')
7069
end
7170

71+
it 'prefers credentials over application_name for service name' do
72+
creds = { 'credentials' => { 'otel.service.name' => 'sweet', 'splunk.access.token' => 'sekret' } }
73+
allow(services).to receive(:find_service).and_return(creds)
74+
75+
component.release
76+
77+
expect(java_opts).to include('-Dotel.service.name=sweet')
78+
end
79+
7280
end
7381

7482
end

0 commit comments

Comments
 (0)