Skip to content

Commit

Permalink
chore: Replace OTel in messages and descriptions with OpenTelemetry
Browse files Browse the repository at this point in the history
Signed-off-by: Thorsten Hans <[email protected]>
  • Loading branch information
ThorstenHans committed Aug 29, 2024
1 parent ec3d262 commit 10b54e7
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions cmd/cleanup.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

var cleanUpCmd = &cobra.Command{
Use: "cleanup",
Short: "Clean up OTel dependencies",
Short: "Clean up OpenTelemetry dependencies",
RunE: func(cmd *cobra.Command, args []string) error {
if err := cleanUp(); err != nil {
return err
Expand Down Expand Up @@ -41,7 +41,7 @@ func cleanUp() error {
return err
}

fmt.Println("Stopping Spin OTel Docker containers...")
fmt.Println("Stopping Spin OpenTelemetry Docker containers...")

getContainers := exec.Command("docker", "ps")
dockerPsOutput, err := getContainers.CombinedOutput()
Expand All @@ -62,6 +62,6 @@ func cleanUp() error {
}
}

fmt.Println("All Spin OTel resources have been cleaned up.")
fmt.Println("All Spin OpenTelemetry resources have been cleaned up.")
return nil
}
2 changes: 1 addition & 1 deletion cmd/open.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import (

var openCmd = &cobra.Command{
Use: "open",
Short: "Opens the desired OTel UI in the default browser.",
Short: "Opens the desired OpenTelemetry UI in the default browser.",
}
2 changes: 1 addition & 1 deletion cmd/open/prometheus.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

var PrometheusCmd = &cobra.Command{
Use: "prometheus",
Short: "Opens the prometheus UI in the default browser.",
Short: "Opens the Prometheus UI in the default browser.",
RunE: func(cmd *cobra.Command, args []string) error {
return prometheus()
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (

var rootCmd = &cobra.Command{
Use: "otel",
Short: "A plugin that makes using Spin with OTel easy.",
Long: "A plugin that makes using Spin with OTel easy by automatically standing up dependencies, sourcing environment variables, and linking to dashboards.",
Short: "A plugin that makes using Spin with OpenTelemetry easy.",
Long: "A plugin that makes using Spin with OpenTelemetry easy by automatically standing up dependencies, sourcing environment variables, and linking to dashboards.",
}

var otelConfigDirName = "otel-config"
Expand Down
6 changes: 3 additions & 3 deletions cmd/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

var setUpCmd = &cobra.Command{
Use: "setup",
Short: "Run OTel dependencies in Docker.",
Short: "Run OpenTelemetry dependencies in Docker.",
RunE: func(cmd *cobra.Command, args []string) error {
if err := setUp(); err != nil {
return err
Expand All @@ -32,14 +32,14 @@ func setUp() error {

cmd := exec.Command("docker", "compose", "-f", composeFile, "up", "-d")

fmt.Println("Pulling and running Spin OTel resources...")
fmt.Println("Pulling and running Spin OpenTelemetry resources...")

output, err := cmd.CombinedOutput()
if err != nil {
fmt.Println(string(output))
return err
}

fmt.Println("The Spin OTel resources are now running. Be sure to run the \"spin otel cleanup\" command when you are finished using them.")
fmt.Println("The Spin OpenTelemetry resources are now running. Be sure to run the \"spin otel cleanup\" command when you are finished using them.")
return nil
}
6 changes: 3 additions & 3 deletions cmd/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

var upCmd = &cobra.Command{
Use: "up",
Short: "Runs a Spin App with the default OTel environment variables.",
Long: "Runs a Spin App with the default OTel environment variables. Any flags that work with the \"spin up\" command, will work with the \"spin otel up\" command: \"spin otel up -- --help\"",
Short: "Runs a Spin App with the default OpenTelemetry environment variables.",
Long: "Runs a Spin App with the default OpenTelemetry environment variables. Any flags that work with the \"spin up\" command, will work with the \"spin otel up\" command: \"spin otel up -- --help\"",
RunE: func(cmd *cobra.Command, args []string) error {
if err := up(args); err != nil {
return err
Expand All @@ -28,7 +28,7 @@ func up(args []string) error {

pathToSpin := os.Getenv("SPIN_BIN_PATH")
if pathToSpin == "" {
return fmt.Errorf("Please ensure that you are running \"spin otel up\", rather than calling the OTel plugin binary directly")
return fmt.Errorf("Please ensure that you are running \"spin otel up\", rather than calling the OpenTelemetry plugin binary directly")
}

// Passing flags and args after the '--'
Expand Down

0 comments on commit 10b54e7

Please sign in to comment.