@@ -81,21 +81,21 @@ func (s *SkyWalkingAgentFramework) Supply() error {
8181 return fmt .Errorf ("failed to install SkyWalking agent: %w" , err )
8282 }
8383
84- // Find the installed agent JAR (in skywalking-agent subdirectory)
85- jarPattern := filepath .Join (agentDir , "skywalking-agent" , "skywalking-agent.jar" )
86- if _ , err := os .Stat (jarPattern ); err != nil {
87- return fmt .Errorf ("SkyWalking agent JAR not found after installation: %w" , err )
84+ err = s .constructJarPath (agentDir )
85+ if err != nil {
86+ return fmt .Errorf ("SkyWalking agent JAR path not found during supply: %w" , err )
8887 }
89- s .jarPath = jarPattern
9088
9189 s .context .Log .Info ("SkyWalking agent %s installed" , dep .Version )
9290 return nil
9391}
9492
9593// Finalize configures the SkyWalking agent
9694func (s * SkyWalkingAgentFramework ) Finalize () error {
97- if s .jarPath == "" {
98- return nil
95+ agentDir := filepath .Join (s .context .Stager .DepDir (), "sky_walking_agent" )
96+ err := s .constructJarPath (agentDir )
97+ if err != nil {
98+ return fmt .Errorf ("SkyWalking agent JAR path not found during finalize: %w" , err )
9999 }
100100
101101 s .context .Log .BeginStep ("Configuring SkyWalking agent" )
@@ -197,3 +197,13 @@ func (s *SkyWalkingAgentFramework) getCredentials() SkyWalkingCredentials {
197197
198198 return creds
199199}
200+
201+ func (s * SkyWalkingAgentFramework ) constructJarPath (agentDir string ) error {
202+ // Find the installed agent JAR (in skywalking-agent subdirectory)
203+ jarPattern := filepath .Join (agentDir , "skywalking-agent" , "skywalking-agent.jar" )
204+ if _ , err := os .Stat (jarPattern ); err != nil {
205+ return fmt .Errorf ("SkyWalking agent JAR not found after installation: %w" , err )
206+ }
207+ s .jarPath = jarPattern
208+ return nil
209+ }
0 commit comments