Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 10b54e7

Browse files
committedAug 29, 2024··
chore: Replace OTel in messages and descriptions with OpenTelemetry
Signed-off-by: Thorsten Hans <thorsten.hans@fermyon.com>
1 parent ec3d262 commit 10b54e7

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed
 

‎cmd/cleanup.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
var cleanUpCmd = &cobra.Command{
1212
Use: "cleanup",
13-
Short: "Clean up OTel dependencies",
13+
Short: "Clean up OpenTelemetry dependencies",
1414
RunE: func(cmd *cobra.Command, args []string) error {
1515
if err := cleanUp(); err != nil {
1616
return err
@@ -41,7 +41,7 @@ func cleanUp() error {
4141
return err
4242
}
4343

44-
fmt.Println("Stopping Spin OTel Docker containers...")
44+
fmt.Println("Stopping Spin OpenTelemetry Docker containers...")
4545

4646
getContainers := exec.Command("docker", "ps")
4747
dockerPsOutput, err := getContainers.CombinedOutput()
@@ -62,6 +62,6 @@ func cleanUp() error {
6262
}
6363
}
6464

65-
fmt.Println("All Spin OTel resources have been cleaned up.")
65+
fmt.Println("All Spin OpenTelemetry resources have been cleaned up.")
6666
return nil
6767
}

‎cmd/open.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ import (
66

77
var openCmd = &cobra.Command{
88
Use: "open",
9-
Short: "Opens the desired OTel UI in the default browser.",
9+
Short: "Opens the desired OpenTelemetry UI in the default browser.",
1010
}

‎cmd/open/prometheus.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
var PrometheusCmd = &cobra.Command{
99
Use: "prometheus",
10-
Short: "Opens the prometheus UI in the default browser.",
10+
Short: "Opens the Prometheus UI in the default browser.",
1111
RunE: func(cmd *cobra.Command, args []string) error {
1212
return prometheus()
1313
},

‎cmd/root.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212

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

1919
var otelConfigDirName = "otel-config"

‎cmd/setup.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

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

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

35-
fmt.Println("Pulling and running Spin OTel resources...")
35+
fmt.Println("Pulling and running Spin OpenTelemetry resources...")
3636

3737
output, err := cmd.CombinedOutput()
3838
if err != nil {
3939
fmt.Println(string(output))
4040
return err
4141
}
4242

43-
fmt.Println("The Spin OTel resources are now running. Be sure to run the \"spin otel cleanup\" command when you are finished using them.")
43+
fmt.Println("The Spin OpenTelemetry resources are now running. Be sure to run the \"spin otel cleanup\" command when you are finished using them.")
4444
return nil
4545
}

‎cmd/up.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
var upCmd = &cobra.Command{
1212
Use: "up",
13-
Short: "Runs a Spin App with the default OTel environment variables.",
14-
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\"",
13+
Short: "Runs a Spin App with the default OpenTelemetry environment variables.",
14+
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\"",
1515
RunE: func(cmd *cobra.Command, args []string) error {
1616
if err := up(args); err != nil {
1717
return err
@@ -28,7 +28,7 @@ func up(args []string) error {
2828

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

3434
// Passing flags and args after the '--'

0 commit comments

Comments
 (0)
Please sign in to comment.