Fix apm framework + comments

Author: kiril-keranov

src/java/frameworks/azure_application_insights_agent.go

@@ -101,6 +101,8 @@ func (a *AzureApplicationInsightsAgentFramework) Supply() error {
 		a.context.Log.Warning("Could not install default Azure Application Insights configuration: %s", err.Error())
 	}
 
+	// constructJarPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = a.constructJarPath(agentDir)
 	if err != nil {
 		return fmt.Errorf("azure application insights agent not found during supply: %w", err)

src/java/frameworks/datadog_javaagent.go

@@ -96,6 +96,8 @@ func (d *DatadogJavaagentFramework) Supply() error {
 		return fmt.Errorf("failed to install Datadog Javaagent: %w", err)
 	}
 
+	// constructJarPathAndFixClassCount can be skipped here and do it only in finalize, but it can be left
+	// as a double check if jar path exists after the dependency install
 	err = d.constructJarPathAndFixClassCount(datadogDir)
 	if err != nil {
 		return fmt.Errorf("datadog Java agent JAR path not found during supply: %w", err)

src/java/frameworks/elastic_apm_agent.go

@@ -73,26 +73,28 @@ func (e *ElasticApmAgentFramework) Supply() error {
 		return fmt.Errorf("failed to install Elastic APM agent: %w", err)
 	}
 
-	// Find the installed JAR
-	jarPattern := filepath.Join(elasticDir, "elastic-apm-agent*.jar")
-	matches, err := filepath.Glob(jarPattern)
+	err = e.constructJarPath(elasticDir)
 	if err != nil {
-		return fmt.Errorf("failed to search for Elastic APM agent JAR: %w", err)
+		return err
 	}
-	if len(matches) == 0 {
-		return fmt.Errorf("Elastic APM agent JAR not found after installation in %s", elasticDir)
-	}
-	e.jarPath = matches[0]
 
 	e.context.Log.Info("Elastic APM agent %s installed", dep.Version)
 	return nil
 }
 
 // Finalize configures the Elastic APM agent
 func (e *ElasticApmAgentFramework) Finalize() error {
-	if e.jarPath == "" || e.service == nil {
-		return nil
+	elasticDir := filepath.Join(e.context.Stager.DepDir(), "elastic_apm_agent")
+	err := e.constructJarPath(elasticDir)
+	if err != nil {
+		return err
+	}
+	service := e.findElasticApmService()
+	// service should not be nil as detect has already passed
+	if service == nil {
+		e.context.Log.Debug("Elastic APM Agent: No elastic-apm service found")
 	}
+	e.service = service
 
 	e.context.Log.BeginStep("Configuring Elastic APM agent")
 
@@ -257,3 +259,17 @@ func (e *ElasticApmAgentFramework) getApplicationName() string {
 
 	return ""
 }
+
+func (e *ElasticApmAgentFramework) constructJarPath(elasticDir string) error {
+	// Find the installed JAR
+	jarPattern := filepath.Join(elasticDir, "elastic-apm-agent*.jar")
+	matches, err := filepath.Glob(jarPattern)
+	if err != nil {
+		return fmt.Errorf("failed to search for Elastic APM agent JAR: %w", err)
+	}
+	if len(matches) == 0 {
+		return fmt.Errorf("Elastic APM agent JAR not found after installation in %s", elasticDir)
+	}
+	e.jarPath = matches[0]
+	return nil
+}

src/java/frameworks/google_stackdriver_profiler.go

@@ -83,6 +83,8 @@ func (g *GoogleStackdriverProfilerFramework) Supply() error {
 		return fmt.Errorf("failed to install Google Stackdriver Profiler: %w", err)
 	}
 
+	// constructAgentPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = g.constructAgentPath(profilerDir)
 	if err != nil {
 		return fmt.Errorf("google stackdriver profiler agent not found during supply: %w", err)

src/java/frameworks/introscope_agent.go

@@ -63,6 +63,8 @@ func (i *IntroscopeAgentFramework) Supply() error {
 		return fmt.Errorf("failed to install Introscope agent: %w", err)
 	}
 
+	// constructAgentPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = i.constructAgentPath(agentDir)
 	if err != nil {
 		return fmt.Errorf("introscope Agent.jar not found during supply: %w", err)

src/java/frameworks/maria_db_jdbc.go

@@ -67,7 +67,8 @@ func (f *MariaDBJDBCFramework) Supply() error {
 		return fmt.Errorf("failed to install MariaDB JDBC: %w", err)
 	}
 
-	// Find the installed JAR
+	// constructJarPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = f.constructJarPath(mariadbDir)
 	if err != nil {
 		return fmt.Errorf("MariaDB JDBC JAR not found during supply: %w", err)

src/java/frameworks/riverbed_appinternals_agent.go

@@ -63,7 +63,8 @@ func (r *RiverbedAppInternalsAgentFramework) Supply() error {
 		return fmt.Errorf("failed to install Riverbed AppInternals agent: %w", err)
 	}
 
-	// Find the installed agent directory (contains lib/rvbd-agent.jar)
+	// constructAgentJarPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = r.constructAgentJarPath(agentDir)
 	if err != nil {
 		return fmt.Errorf("riverbed appinternals agent JAR not found during supply: %w", err)
@@ -217,6 +218,7 @@ func (r *RiverbedAppInternalsAgentFramework) getApplicationName() string {
 }
 
 func (r *RiverbedAppInternalsAgentFramework) constructAgentJarPath(agentDir string) error {
+	// Find the installed agent directory (contains lib/rvbd-agent.jar)
 	agentJarPath := filepath.Join(agentDir, "lib", "rvbd-agent.jar")
 	if _, err := os.Stat(agentJarPath); err != nil {
 		return fmt.Errorf("agent jar not found after installation: %w", err)

src/java/frameworks/sky_walking_agent.go

@@ -81,6 +81,8 @@ func (s *SkyWalkingAgentFramework) Supply() error {
 		return fmt.Errorf("failed to install SkyWalking agent: %w", err)
 	}
 
+	// constructJarPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = s.constructJarPath(agentDir)
 	if err != nil {
 		return fmt.Errorf("SkyWalking agent JAR path not found during supply: %w", err)

src/java/frameworks/splunk_otel_java_agent.go

@@ -90,7 +90,8 @@ func (s *SplunkOtelJavaAgentFramework) Supply() error {
 		return fmt.Errorf("failed to install Splunk OTEL Java agent: %w", err)
 	}
 
-	// Find the installed agent JAR
+	// constructJarPath can be skipped here and do it only in finalize, but it can be left as a double check
+	// if jar path exists after the dependency install
 	err = s.constructJarPath(agentDir)
 	if err != nil {
 		return fmt.Errorf("splunk OTEL Java agent JAR path not found during supply: %w", err)