Merge pull request #10 from asteurer/path-fix

fixing otel-config path bug

Author: asteurer

cmd/cleanup.go

@@ -25,7 +25,7 @@ func getIDs(dockerOutput []byte) []string {
 
 	for _, entry := range outputArray {
 		// Each container in the Docker Compose stack will have the name of the directory
-		if strings.Contains(entry, otelConfigDir) {
+		if strings.Contains(entry, otelConfigDirName) {
 			fields := strings.Fields(entry)
 			if len(fields) > 0 {
 				result = append(result, fields[0])

cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"path"
 
 	open "github.com/fermyon/otel-plugin/cmd/open"
 	"github.com/spf13/cobra"
@@ -14,9 +15,31 @@ var rootCmd = &cobra.Command{
 	Long:  "A plugin that makes using Spin with OTel easy by automatically standing up dependencies, sourcing environment variables, and linking to dashboards.",
 }
 
-var otelConfigDir = "otel-config"
+var otelConfigDirName = "otel-config"
+var otelConfigPath string
+
+// setOtelConfigPath allows for someone to run the otel plugin directly from source or via the Spin plugin installation
+func setOtelConfigPath() error {
+	executablePath, err := os.Executable()
+	if err != nil {
+		return err
+	}
+
+	otelConfigPath = path.Join(path.Dir(executablePath), otelConfigDirName)
+
+	if _, err := os.Stat(otelConfigPath); os.IsNotExist(err) {
+		return fmt.Errorf("the directory in which the plugin binary is executed is missing necessary files, so please make sure the plugin was installed using \"spin plugins install otel\"")
+	}
+
+	return nil
+}
 
 func Execute() {
+	if err := setOtelConfigPath(); err != nil {
+		fmt.Fprintln(os.Stderr, fmt.Errorf("error finding the otel-config directory: %w", err))
+		os.Exit(1)
+	}
+
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)

cmd/setup.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
 	"path"
 
@@ -20,7 +21,12 @@ var setUpCmd = &cobra.Command{
 }
 
 func setUp() error {
-	cmd := exec.Command("docker", "compose", "-f", path.Join(otelConfigDir, "compose.yaml"), "up", "-d")
+	composeFile := path.Join(otelConfigPath, "compose.yaml")
+	if _, err := os.Stat(composeFile); os.IsNotExist(err) {
+		return fmt.Errorf("the otel-config directory is missing the \"compose.yaml\" file, so please consider removing and re-installing the otel plugin")
+	}
+
+	cmd := exec.Command("docker", "compose", "-f", composeFile, "up", "-d")
 
 	fmt.Println("Pulling and running Spin OTel resources...")
 

spin-pluginify.toml

@@ -1,5 +1,5 @@
 name = "otel"
-version = "0.1.0"
+version = "0.1.1"
 spin_compatibility = ">=2.5"
 license = "Apache-2.0"
 package = "otel"