Skip to content

Commit e977ba5

Browse files
committed
Fix typos+adjust
1 parent fafaca3 commit e977ba5

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/java/frameworks/elastic_apm_agent.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func (e *ElasticApmAgentFramework) Supply() error {
7575

7676
err = e.constructJarPath(elasticDir)
7777
if err != nil {
78-
return err
78+
return fmt.Errorf("elastic apm agent jar not found during supply: %w", err)
7979
}
8080

8181
e.context.Log.Info("Elastic APM agent %s installed", dep.Version)
@@ -87,7 +87,7 @@ func (e *ElasticApmAgentFramework) Finalize() error {
8787
elasticDir := filepath.Join(e.context.Stager.DepDir(), "elastic_apm_agent")
8888
err := e.constructJarPath(elasticDir)
8989
if err != nil {
90-
return err
90+
return fmt.Errorf("elastic apm agent jar not found during finalize: %w", err)
9191
}
9292
service := e.findElasticApmService()
9393
// service should not be nil as detect has already passed
@@ -268,7 +268,7 @@ func (e *ElasticApmAgentFramework) constructJarPath(elasticDir string) error {
268268
return fmt.Errorf("failed to search for Elastic APM agent JAR: %w", err)
269269
}
270270
if len(matches) == 0 {
271-
return fmt.Errorf("Elastic APM agent JAR not found after installation in %s", elasticDir)
271+
return fmt.Errorf("agent jar not found after installation in %s", elasticDir)
272272
}
273273
e.jarPath = matches[0]
274274
return nil

src/java/frameworks/introscope_agent.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (i *IntroscopeAgentFramework) Finalize() error {
7979
agentDir := filepath.Join(i.context.Stager.DepDir(), "introscope_agent")
8080
err := i.constructAgentPath(agentDir)
8181
if err != nil {
82-
return fmt.Errorf("ontroscope Agent.jar not found during finalize: %w", err)
82+
return fmt.Errorf("introscope Agent.jar not found during finalize: %w", err)
8383
}
8484

8585
i.context.Log.BeginStep("Configuring Introscope agent")

src/java/frameworks/maria_db_jdbc.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (f *MariaDBJDBCFramework) Supply() error {
7171
// if jar path exists after the dependency install
7272
err = f.constructJarPath(mariadbDir)
7373
if err != nil {
74-
return fmt.Errorf("MariaDB JDBC JAR not found during supply: %w", err)
74+
return fmt.Errorf("jdbc jar not found during supply: %w", err)
7575
}
7676

7777
f.context.Log.Info("MariaDB JDBC %s installed", dep.Version)
@@ -83,7 +83,7 @@ func (f *MariaDBJDBCFramework) Finalize() error {
8383
mariadbDir := filepath.Join(f.context.Stager.DepDir(), "mariadb_jdbc")
8484
err := f.constructJarPath(mariadbDir)
8585
if err != nil {
86-
return fmt.Errorf("MariaDB JDBC JAR not found during finalize: %w", err)
86+
return fmt.Errorf("jdbc jar not found during finalize: %w", err)
8787
}
8888

8989
f.context.Log.BeginStep("Configuring MariaDB JDBC driver")

src/java/frameworks/sky_walking_agent.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (s *SkyWalkingAgentFramework) Supply() error {
8585
// if jar path exists after the dependency install
8686
err = s.constructJarPath(agentDir)
8787
if err != nil {
88-
return fmt.Errorf("SkyWalking agent JAR path not found during supply: %w", err)
88+
return fmt.Errorf("agent jar path not found during supply: %w", err)
8989
}
9090

9191
s.context.Log.Info("SkyWalking agent %s installed", dep.Version)
@@ -97,7 +97,7 @@ func (s *SkyWalkingAgentFramework) Finalize() error {
9797
agentDir := filepath.Join(s.context.Stager.DepDir(), "sky_walking_agent")
9898
err := s.constructJarPath(agentDir)
9999
if err != nil {
100-
return fmt.Errorf("SkyWalking agent JAR path not found during finalize: %w", err)
100+
return fmt.Errorf("agent jar path not found during finalize: %w", err)
101101
}
102102

103103
s.context.Log.BeginStep("Configuring SkyWalking agent")
@@ -204,7 +204,7 @@ func (s *SkyWalkingAgentFramework) constructJarPath(agentDir string) error {
204204
// Find the installed agent JAR (in skywalking-agent subdirectory)
205205
jarPattern := filepath.Join(agentDir, "skywalking-agent", "skywalking-agent.jar")
206206
if _, err := os.Stat(jarPattern); err != nil {
207-
return fmt.Errorf("SkyWalking agent JAR not found after installation: %w", err)
207+
return fmt.Errorf("agent jar not found after installation: %w", err)
208208
}
209209
s.jarPath = jarPattern
210210
return nil

0 commit comments

Comments
 (0)