Skip to content

Commit ea31af7

Browse files
Aneurysm9Aneurysm9
authored
Merge branch 'main' into feat/bridge_support_TextMap
2 parents a1939b5 + 575e1bb commit ea31af7

File tree

45 files changed

+240
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+240
-179
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ coverage.*
1111
gen/
1212

1313
/example/fib/fib
14+
/example/fib/traces.txt
1415
/example/jaeger/jaeger
1516
/example/namedtracer/namedtracer
1617
/example/opencensus/opencensus

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ of the `"go.opentelemetry.io/otel/bridge/opentracing".BridgeTracer` type. (#2911
1616
### Changed
1717

1818
- The `crosslink` make target has been updated to use the `go.opentelemetry.io/build-tools/crosslink` package. (#2886)
19+
- In the `go.opentelemetry.io/otel/sdk/instrumentation` package rename `Library` to `Scope` and alias `Library` as `Scope` (#2976)
1920

2021
### Removed
2122

2223
- Support for go1.16. Support is now only for go1.17 and go1.18 (#2917)
2324

25+
### Deprecated
26+
27+
- The `Library` struct in the `go.opentelemetry.io/otel/sdk/instrumentation` package is deprecated.
28+
Use the equivalent `Scope` struct instead. (#2977)
29+
- The `ReadOnlySpan.InstrumentationLibrary` method from the `go.opentelemetry.io/otel/sdk/trace` package is deprecated.
30+
Use the equivalent `ReadOnlySpan.InstrumentationScope` method instead. (#2977)
31+
2432
## [1.7.0/0.30.0] - 2022-04-28
2533

2634
### Added

‎baggage/baggage.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (p Property) Key() string {
157157
return p.key
158158
}
159159

160-
// Value returns the Property value. Additionally a boolean value is returned
160+
// Value returns the Property value. Additionally, a boolean value is returned
161161
// indicating if the returned value is the empty if the Property has a value
162162
// that is empty or if the value is not set.
163163
func (p Property) Value() (string, bool) {
@@ -392,7 +392,7 @@ func New(members ...Member) (Baggage, error) {
392392
}
393393
}
394394

395-
// Check member numbers after deduplicating.
395+
// Check member numbers after deduplication.
396396
if len(b) > maxMembers {
397397
return Baggage{}, errMemberNumber
398398
}
@@ -454,7 +454,7 @@ func Parse(bStr string) (Baggage, error) {
454454
func (b Baggage) Member(key string) Member {
455455
v, ok := b.list[key]
456456
if !ok {
457-
// We do not need to worry about distiguising between the situation
457+
// We do not need to worry about distinguishing between the situation
458458
// where a zero-valued Member is included in the Baggage because a
459459
// zero-valued Member is invalid according to the W3C Baggage
460460
// specification (it has an empty key).

‎example/otel-collector/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
2424
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect
2525
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0 // indirect
26-
go.opentelemetry.io/proto/otlp v0.16.0 // indirect
26+
go.opentelemetry.io/proto/otlp v0.18.0 // indirect
2727
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
2828
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
2929
golang.org/x/text v0.3.5 // indirect

‎example/otel-collector/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
162162
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
163163
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
164164
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
165-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
166-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
165+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
166+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
167167
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
168168
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
169169
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

‎exporters/jaeger/jaeger.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ func spanToThrift(ss sdktrace.ReadOnlySpan) *gen.Span {
142142
}
143143
}
144144

145-
if il := ss.InstrumentationLibrary(); il.Name != "" {
146-
tags = append(tags, getStringTag(keyInstrumentationLibraryName, il.Name))
147-
if il.Version != "" {
148-
tags = append(tags, getStringTag(keyInstrumentationLibraryVersion, il.Version))
145+
if is := ss.InstrumentationScope(); is.Name != "" {
146+
tags = append(tags, getStringTag(keyInstrumentationLibraryName, is.Name))
147+
if is.Version != "" {
148+
tags = append(tags, getStringTag(keyInstrumentationLibraryVersion, is.Version))
149149
}
150150
}
151151

‎exporters/otlp/otlpmetric/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
go.opentelemetry.io/otel/metric v0.30.0
1111
go.opentelemetry.io/otel/sdk v1.7.0
1212
go.opentelemetry.io/otel/sdk/metric v0.30.0
13-
go.opentelemetry.io/proto/otlp v0.16.0
13+
go.opentelemetry.io/proto/otlp v0.18.0
1414
google.golang.org/grpc v1.46.2
1515
google.golang.org/protobuf v1.28.0
1616
)

‎exporters/otlp/otlpmetric/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
165165
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
166166
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
167167
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
168-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
169-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
168+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
169+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
170170
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
171171
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
172172
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎exporters/otlp/otlpmetric/otlpmetricgrpc/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
go.opentelemetry.io/otel/metric v0.30.0
1111
go.opentelemetry.io/otel/sdk v1.7.0
1212
go.opentelemetry.io/otel/sdk/metric v0.30.0
13-
go.opentelemetry.io/proto/otlp v0.16.0
13+
go.opentelemetry.io/proto/otlp v0.18.0
1414
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1
1515
google.golang.org/grpc v1.46.2
1616
google.golang.org/protobuf v1.28.0

‎exporters/otlp/otlpmetric/otlpmetricgrpc/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
165165
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
166166
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
167167
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
168-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
169-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
168+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
169+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
170170
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
171171
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
172172
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎exporters/otlp/otlpmetric/otlpmetrichttp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0
88
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.30.0
99
go.opentelemetry.io/otel/sdk v1.7.0
10-
go.opentelemetry.io/proto/otlp v0.16.0
10+
go.opentelemetry.io/proto/otlp v0.18.0
1111
google.golang.org/protobuf v1.28.0
1212
)
1313

‎exporters/otlp/otlpmetric/otlpmetrichttp/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
165165
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
166166
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
167167
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
168-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
169-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
168+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
169+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
170170
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
171171
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
172172
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎exporters/otlp/otlptrace/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0
1010
go.opentelemetry.io/otel/sdk v1.7.0
1111
go.opentelemetry.io/otel/trace v1.7.0
12-
go.opentelemetry.io/proto/otlp v0.16.0
12+
go.opentelemetry.io/proto/otlp v0.18.0
1313
google.golang.org/grpc v1.46.2
1414
google.golang.org/protobuf v1.28.0
1515
)

‎exporters/otlp/otlptrace/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
163163
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
164164
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
165165
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
166-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
167-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
166+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
167+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
168168
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
169169
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
170170
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎exporters/otlp/otlptrace/internal/tracetransform/instrumentation.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
commonpb "go.opentelemetry.io/proto/otlp/common/v1"
2020
)
2121

22-
func InstrumentationScope(il instrumentation.Library) *commonpb.InstrumentationScope {
23-
if il == (instrumentation.Library{}) {
22+
func InstrumentationScope(il instrumentation.Scope) *commonpb.InstrumentationScope {
23+
if il == (instrumentation.Scope{}) {
2424
return nil
2525
}
2626
return &commonpb.InstrumentationScope{

‎exporters/otlp/otlptrace/internal/tracetransform/span.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func Spans(sdl []tracesdk.ReadOnlySpan) []*tracepb.ResourceSpans {
3434

3535
type key struct {
3636
r attribute.Distinct
37-
il instrumentation.Library
37+
is instrumentation.Scope
3838
}
3939
ssm := make(map[key]*tracepb.ScopeSpans)
4040

@@ -47,15 +47,15 @@ func Spans(sdl []tracesdk.ReadOnlySpan) []*tracepb.ResourceSpans {
4747
rKey := sd.Resource().Equivalent()
4848
k := key{
4949
r: rKey,
50-
il: sd.InstrumentationLibrary(),
50+
is: sd.InstrumentationScope(),
5151
}
5252
scopeSpan, iOk := ssm[k]
5353
if !iOk {
54-
// Either the resource or instrumentation library were unknown.
54+
// Either the resource or instrumentation scope were unknown.
5555
scopeSpan = &tracepb.ScopeSpans{
56-
Scope: InstrumentationScope(sd.InstrumentationLibrary()),
56+
Scope: InstrumentationScope(sd.InstrumentationScope()),
5757
Spans: []*tracepb.Span{},
58-
SchemaUrl: sd.InstrumentationLibrary().SchemaURL,
58+
SchemaUrl: sd.InstrumentationScope().SchemaURL,
5959
}
6060
}
6161
scopeSpan.Spans = append(scopeSpan.Spans, span(sd))

‎exporters/otlp/otlptrace/internal/tracetransform/span_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func TestSpanData(t *testing.T) {
264264
attribute.Int64("rk2", 5),
265265
attribute.StringSlice("rk3", []string{"sv1", "sv2"}),
266266
),
267-
InstrumentationLibrary: instrumentation.Library{
267+
InstrumentationLibrary: instrumentation.Scope{
268268
Name: "go.opentelemetry.io/test/otel",
269269
Version: "v0.0.1",
270270
SchemaURL: semconv.SchemaURL,

‎exporters/otlp/otlptrace/otlptracegrpc/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0
99
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0
1010
go.opentelemetry.io/otel/sdk v1.7.0
11-
go.opentelemetry.io/proto/otlp v0.16.0
11+
go.opentelemetry.io/proto/otlp v0.18.0
1212
go.uber.org/goleak v1.1.12
1313
google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1
1414
google.golang.org/grpc v1.46.2

‎exporters/otlp/otlptrace/otlptracegrpc/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
164164
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
165165
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
166166
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
167-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
168-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
167+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
168+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
169169
go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
170170
go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
171171
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

‎exporters/otlp/otlptrace/otlptracehttp/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.7.0
1010
go.opentelemetry.io/otel/sdk v1.7.0
1111
go.opentelemetry.io/otel/trace v1.7.0
12-
go.opentelemetry.io/proto/otlp v0.16.0
12+
go.opentelemetry.io/proto/otlp v0.18.0
1313
google.golang.org/protobuf v1.28.0
1414
)
1515

‎exporters/otlp/otlptrace/otlptracehttp/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
163163
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
164164
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
165165
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
166-
go.opentelemetry.io/proto/otlp v0.16.0 h1:WHzDWdXUvbc5bG2ObdrGfaNpQz7ft7QN9HHmJlbiB1E=
167-
go.opentelemetry.io/proto/otlp v0.16.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
166+
go.opentelemetry.io/proto/otlp v0.18.0 h1:W5hyXNComRa23tGpKwG+FRAc4rfF6ZUg1JReK+QHS80=
167+
go.opentelemetry.io/proto/otlp v0.18.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U=
168168
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
169169
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
170170
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎exporters/zipkin/model.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ func toZipkinTags(data tracesdk.ReadOnlySpan) map[string]string {
218218
delete(m, "error")
219219
}
220220

221-
if il := data.InstrumentationLibrary(); il.Name != "" {
222-
m[keyInstrumentationLibraryName] = il.Name
223-
if il.Version != "" {
224-
m[keyInstrumentationLibraryVersion] = il.Version
221+
if is := data.InstrumentationScope(); is.Name != "" {
222+
m[keyInstrumentationLibraryName] = is.Name
223+
if is.Version != "" {
224+
m[keyInstrumentationLibraryVersion] = is.Version
225225
}
226226
}
227227

‎metric/instrument/asyncfloat64/asyncfloat64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type Counter interface {
4545
instrument.Asynchronous
4646
}
4747

48-
// UpDownCounter is an instrument that records increasing or decresing values.
48+
// UpDownCounter is an instrument that records increasing or decreasing values.
4949
type UpDownCounter interface {
5050
// Observe records the state of the instrument.
5151
//

‎metric/instrument/asyncint64/asyncint64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type Counter interface {
4545
instrument.Asynchronous
4646
}
4747

48-
// UpDownCounter is an instrument that records increasing or decresing values.
48+
// UpDownCounter is an instrument that records increasing or decreasing values.
4949
type UpDownCounter interface {
5050
// Observe records the state of the instrument.
5151
//

‎metric/instrument/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func (cfg Config) Description() string {
2727
return cfg.description
2828
}
2929

30-
// Unit describes the measurement unit for a instrument.
30+
// Unit describes the measurement unit for an instrument.
3131
func (cfg Config) Unit() unit.Unit {
3232
return cfg.unit
3333
}

‎metric/instrument/syncfloat64/syncfloat64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type Counter interface {
3939
instrument.Synchronous
4040
}
4141

42-
// UpDownCounter is an instrument that records increasing or decresing values.
42+
// UpDownCounter is an instrument that records increasing or decreasing values.
4343
type UpDownCounter interface {
4444
// Add records a change to the counter.
4545
Add(ctx context.Context, incr float64, attrs ...attribute.KeyValue)

‎metric/instrument/syncint64/syncint64.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ type Counter interface {
3939
instrument.Synchronous
4040
}
4141

42-
// UpDownCounter is an instrument that records increasing or decresing values.
42+
// UpDownCounter is an instrument that records increasing or decreasing values.
4343
type UpDownCounter interface {
4444
// Add records a change to the counter.
4545
Add(ctx context.Context, incr int64, attrs ...attribute.KeyValue)

‎metric/internal/global/state_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
66
//
7-
// htmp://www.apache.org/licenses/LICENSE-2.0
7+
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,

‎metric/noop.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ func NewNoopMeter() Meter {
4343

4444
type noopMeter struct{}
4545

46-
// AsyncInt64 creates a instrument that does not record any metrics.
46+
// AsyncInt64 creates an instrument that does not record any metrics.
4747
func (noopMeter) AsyncInt64() asyncint64.InstrumentProvider {
4848
return nonrecordingAsyncInt64Instrument{}
4949
}
5050

51-
// AsyncFloat64 creates a instrument that does not record any metrics.
51+
// AsyncFloat64 creates an instrument that does not record any metrics.
5252
func (noopMeter) AsyncFloat64() asyncfloat64.InstrumentProvider {
5353
return nonrecordingAsyncFloat64Instrument{}
5454
}
5555

56-
// SyncInt64 creates a instrument that does not record any metrics.
56+
// SyncInt64 creates an instrument that does not record any metrics.
5757
func (noopMeter) SyncInt64() syncint64.InstrumentProvider {
5858
return nonrecordingSyncInt64Instrument{}
5959
}
6060

61-
// SyncFloat64 creates a instrument that does not record any metrics.
61+
// SyncFloat64 creates an instrument that does not record any metrics.
6262
func (noopMeter) SyncFloat64() syncfloat64.InstrumentProvider {
6363
return nonrecordingSyncFloat64Instrument{}
6464
}

‎sdk/instrumentation/library.go

+2-9
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,5 @@ For more information see
2222
package instrumentation // import "go.opentelemetry.io/otel/sdk/instrumentation"
2323

2424
// Library represents the instrumentation library.
25-
type Library struct {
26-
// Name is the name of the instrumentation library. This should be the
27-
// Go package name of that library.
28-
Name string
29-
// Version is the version of the instrumentation library.
30-
Version string
31-
// SchemaURL of the telemetry emitted by the library.
32-
SchemaURL string
33-
}
25+
// Deprecated: please use Scope instead.
26+
type Library = Scope

0 commit comments

Comments
 (0)