File tree Expand file tree Collapse file tree 2 files changed +13
-1
lines changed
lib/java_buildpack/framework
spec/java_buildpack/framework Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,9 @@ def release
40
40
java_opts . add_system_property ( key , value ) if key . start_with? ( 'splunk.' ) || key . start_with? ( 'otel.' )
41
41
end
42
42
43
+ # Set the otel.service.name to the application_name if not specified in credentials
44
+ return if credentials . key? 'otel.service.name'
45
+
43
46
app_name = @application . details [ 'application_name' ]
44
47
java_opts . add_system_property ( 'otel.service.name' , app_name )
45
48
end
@@ -51,6 +54,7 @@ def supports?
51
54
@application . services . one_service? REQUIRED_SERVICE_NAME_FILTER
52
55
end
53
56
57
+ # bound service must contain the string `splunk-o11y`
54
58
REQUIRED_SERVICE_NAME_FILTER = /splunk-o11y/ . freeze
55
59
56
60
end
Original file line number Diff line number Diff line change 62
62
63
63
it 'sets the service name from the application name' do
64
64
allow ( services ) . to receive ( :find_service ) . and_return ( 'credentials' => { 'splunk.access.token' => 'sekret' } )
65
- # allow(details).to be( { 'application_name' => 'dick' })
66
65
67
66
component . release
68
67
69
68
expect ( java_opts ) . to include ( '-Dotel.service.name=GreatServiceTM' )
70
69
end
71
70
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
+
72
80
end
73
81
74
82
end
You can’t perform that action at this time.
0 commit comments