Merge branch 'main' into prom-view-example

open-telemetry · Sep 17, 2022 · fd6f640 · fd6f640
2 parents 0053021 + e1a1f07
commit fd6f640
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 126 deletions.
diff --git a/internal/tools/common.go b/internal/tools/common.go
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -13,7 +13,6 @@ require (
 	go.opentelemetry.io/build-tools/dbotconf v0.0.0-20220706175322-58de0d25b85c
 	go.opentelemetry.io/build-tools/multimod v0.0.0-20220706175322-58de0d25b85c
 	go.opentelemetry.io/build-tools/semconvgen v0.0.0-20220706175322-58de0d25b85c
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
 	golang.org/x/tools v0.1.12
 )
 
@@ -182,6 +181,7 @@ require (
 	go.uber.org/zap v1.21.0 // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
 	golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
 	golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect

diff --git a/website_docs/getting-started.md b/website_docs/getting-started.md
@@ -5,7 +5,7 @@ weight: 2
 
 Welcome to the OpenTelemetry for Go getting started guide! This guide will walk you through the basic steps in installing, instrumenting with, configuring, and exporting data from OpenTelemetry. Before you get started, be sure to have Go 1.16 or newer installed.
 
-Understand how a system is functioning when it is failing or having issues is critical to resolving those issues. One strategy to understand this is with tracing. This guide shows how the OpenTelemetry Go project can be used to trace an example application. You will start with an application that computes Fibonacci numbers for users, and from there you will add instrumentation to produce tracing telemetry with OpenTelemetry Go.
+Understanding how a system is functioning when it is failing or having issues is critical to resolving those issues. One strategy to understand this is with tracing. This guide shows how the OpenTelemetry Go project can be used to trace an example application. You will start with an application that computes Fibonacci numbers for users, and from there you will add instrumentation to produce tracing telemetry with OpenTelemetry Go.
 
 For reference, a complete example of the code you will build can be found [here](https://github.com/open-telemetry/opentelemetry-go/tree/main/example/fib).