Skip to content

Commit

Permalink
Merge branch 'main' into use-instrumenting-scope-ii
Browse files Browse the repository at this point in the history
  • Loading branch information
Aneurysm9 authored Jul 6, 2022
2 parents 81575eb + 5795c70 commit 9668116
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ coverage.*
gen/

/example/fib/fib
/example/fib/traces.txt
/example/jaeger/jaeger
/example/namedtracer/namedtracer
/example/opencensus/opencensus
Expand Down
6 changes: 3 additions & 3 deletions baggage/baggage.go
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (p Property) Key() string {
return p.key
}

// Value returns the Property value. Additionally a boolean value is returned
// Value returns the Property value. Additionally, a boolean value is returned
// indicating if the returned value is the empty if the Property has a value
// that is empty or if the value is not set.
func (p Property) Value() (string, bool) {
Expand Down Expand Up @@ -392,7 +392,7 @@ func New(members ...Member) (Baggage, error) {
}
}

// Check member numbers after deduplicating.
// Check member numbers after deduplication.
if len(b) > maxMembers {
return Baggage{}, errMemberNumber
}
Expand Down Expand Up @@ -454,7 +454,7 @@ func Parse(bStr string) (Baggage, error) {
func (b Baggage) Member(key string) Member {
v, ok := b.list[key]
if !ok {
// We do not need to worry about distiguising between the situation
// We do not need to worry about distinguishing between the situation
// where a zero-valued Member is included in the Baggage because a
// zero-valued Member is invalid according to the W3C Baggage
// specification (it has an empty key).
Expand Down
2 changes: 1 addition & 1 deletion metric/instrument/asyncfloat64/asyncfloat64.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Counter interface {
instrument.Asynchronous
}

// UpDownCounter is an instrument that records increasing or decresing values.
// UpDownCounter is an instrument that records increasing or decreasing values.
type UpDownCounter interface {
// Observe records the state of the instrument.
//
Expand Down
2 changes: 1 addition & 1 deletion metric/instrument/asyncint64/asyncint64.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Counter interface {
instrument.Asynchronous
}

// UpDownCounter is an instrument that records increasing or decresing values.
// UpDownCounter is an instrument that records increasing or decreasing values.
type UpDownCounter interface {
// Observe records the state of the instrument.
//
Expand Down
2 changes: 1 addition & 1 deletion metric/instrument/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (cfg Config) Description() string {
return cfg.description
}

// Unit describes the measurement unit for a instrument.
// Unit describes the measurement unit for an instrument.
func (cfg Config) Unit() unit.Unit {
return cfg.unit
}
Expand Down
2 changes: 1 addition & 1 deletion metric/instrument/syncfloat64/syncfloat64.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type Counter interface {
instrument.Synchronous
}

// UpDownCounter is an instrument that records increasing or decresing values.
// UpDownCounter is an instrument that records increasing or decreasing values.
type UpDownCounter interface {
// Add records a change to the counter.
Add(ctx context.Context, incr float64, attrs ...attribute.KeyValue)
Expand Down
2 changes: 1 addition & 1 deletion metric/instrument/syncint64/syncint64.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type Counter interface {
instrument.Synchronous
}

// UpDownCounter is an instrument that records increasing or decresing values.
// UpDownCounter is an instrument that records increasing or decreasing values.
type UpDownCounter interface {
// Add records a change to the counter.
Add(ctx context.Context, incr int64, attrs ...attribute.KeyValue)
Expand Down
2 changes: 1 addition & 1 deletion metric/internal/global/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// htmp://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
Expand Down
8 changes: 4 additions & 4 deletions metric/noop.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@ func NewNoopMeter() Meter {

type noopMeter struct{}

// AsyncInt64 creates a instrument that does not record any metrics.
// AsyncInt64 creates an instrument that does not record any metrics.
func (noopMeter) AsyncInt64() asyncint64.InstrumentProvider {
return nonrecordingAsyncInt64Instrument{}
}

// AsyncFloat64 creates a instrument that does not record any metrics.
// AsyncFloat64 creates an instrument that does not record any metrics.
func (noopMeter) AsyncFloat64() asyncfloat64.InstrumentProvider {
return nonrecordingAsyncFloat64Instrument{}
}

// SyncInt64 creates a instrument that does not record any metrics.
// SyncInt64 creates an instrument that does not record any metrics.
func (noopMeter) SyncInt64() syncint64.InstrumentProvider {
return nonrecordingSyncInt64Instrument{}
}

// SyncFloat64 creates a instrument that does not record any metrics.
// SyncFloat64 creates an instrument that does not record any metrics.
func (noopMeter) SyncFloat64() syncfloat64.InstrumentProvider {
return nonrecordingSyncFloat64Instrument{}
}
Expand Down
2 changes: 1 addition & 1 deletion website_docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ const name = "fib"

Using the full-qualified package name, something that should be unique for Go packages, is the standard way to identify a [`Tracer`]. If your example package name differs, be sure to update the name you use here to match.

Everything should be in place now to start tracing your application. But first, what is a trace? And, how exactly should you build them for you application?
Everything should be in place now to start tracing your application. But first, what is a trace? And, how exactly should you build them for your application?

To back up a bit, a trace is a type of telemetry that represents work being done by a service. A trace is a record of the connection(s) between participants processing a transaction, often through client/server requests processing and other forms of communication.

Expand Down

0 comments on commit 9668116

Please sign in to comment.