Adjust HasService/GetService logic occurrances

Author: kiril-keranov

src/java/frameworks/elastic_apm_agent.go

@@ -144,11 +144,13 @@ func (e *ElasticApmAgentFramework) findElasticApmService() *VCAPService {
 		return nil
 	}
 
-	if vcapServices.HasService("elastic-apm") {
-		return vcapServices.GetService("elastic-apm")
+	service := vcapServices.GetService("elastic-apm")
+	if service != nil {
+		return service
 	}
-	if vcapServices.HasService("elastic") {
-		return vcapServices.GetService("elastic")
+	service = vcapServices.GetService("elastic")
+	if service != nil {
+		return service
 	}
 
 	for _, services := range vcapServices {

src/java/frameworks/sealights_agent.go

@@ -135,8 +135,8 @@ func (f *SealightsAgentFramework) Finalize() error {
 
 	// Find Sealights service
 	var service *VCAPService
-	if vcapServices.HasService("sealights") {
-		service = vcapServices.GetService("sealights")
+	if svc := vcapServices.GetService("sealights"); svc != nil {
+		service = svc
 	} else {
 		service = vcapServices.GetServiceByNamePattern("sealights")
 	}

src/java/frameworks/splunk_otel_java_agent.go

@@ -185,10 +185,8 @@ func (s *SplunkOtelJavaAgentFramework) getCredentials() SplunkCredentials {
 	// Find the first matching Splunk service, preferring explicit labels over name pattern matches
 	var service *common.VCAPService
 	for _, label := range []string{"splunk", "splunk-otel", "splunk-o11y"} {
-		if vcapServices.HasService(label) {
-			service = vcapServices.GetService(label)
-			break
-		}
+		service = vcapServices.GetService(label)
+		break
 	}
 	if service == nil {
 		service = vcapServices.GetServiceByNamePattern("splunk")