Skip to content

Commit 96a5f8f

Browse files
authored
Rename api/standard package to semconv (#1016)
* Rename api/standard package to semconv * Update `api/standard` package dependencies to `semconv` * Update Changelog * Add PR number to Changelog
1 parent fc1ce6c commit 96a5f8f

File tree

17 files changed

+158
-154
lines changed

17 files changed

+158
-154
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
88

99
## [Unreleased]
1010

11+
### Changed
12+
13+
- Renamed `go.opentelemetry.io/otel/api/standard` package to `go.opentelemetry.io/otel/semconv` to avoid the ambiguous and generic name `standard` and better describe the package as containing OpenTelemetry semantic conventions. (#1016)
14+
1115
## [0.10.0] - 2020-07-29
1216

1317
This release migrates the default OpenTelemetry SDK into its own Go module, decoupling the SDK from the API and reducing dependencies for instrumentation packages.

example/http/client/client.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"log"
2323

2424
"go.opentelemetry.io/otel/api/kv"
25-
"go.opentelemetry.io/otel/api/standard"
2625
"go.opentelemetry.io/otel/api/trace"
26+
"go.opentelemetry.io/otel/semconv"
2727

2828
"net/http"
2929
"time"
@@ -83,7 +83,7 @@ func main() {
8383

8484
return err
8585
},
86-
trace.WithAttributes(standard.PeerServiceKey.String("ExampleService")))
86+
trace.WithAttributes(semconv.PeerServiceKey.String("ExampleService")))
8787

8888
if err != nil {
8989
panic(err)

example/http/server/server.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import (
2121

2222
"go.opentelemetry.io/otel/api/correlation"
2323
"go.opentelemetry.io/otel/api/global"
24-
"go.opentelemetry.io/otel/api/standard"
2524
"go.opentelemetry.io/otel/api/trace"
2625
"go.opentelemetry.io/otel/exporters/stdout"
2726
"go.opentelemetry.io/otel/instrumentation/httptrace"
2827
"go.opentelemetry.io/otel/sdk/resource"
2928
sdktrace "go.opentelemetry.io/otel/sdk/trace"
29+
"go.opentelemetry.io/otel/semconv"
3030
)
3131

3232
func initTracer() {
@@ -41,7 +41,7 @@ func initTracer() {
4141
// In a production application, use sdktrace.ProbabilitySampler with a desired probability.
4242
tp, err := sdktrace.NewProvider(sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}),
4343
sdktrace.WithSyncer(exporter),
44-
sdktrace.WithResource(resource.New(standard.ServiceNameKey.String("ExampleService"))))
44+
sdktrace.WithResource(resource.New(semconv.ServiceNameKey.String("ExampleService"))))
4545
if err != nil {
4646
log.Fatal(err)
4747
}

example/otel-collector/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ import (
2828
"go.opentelemetry.io/otel/api/global"
2929
"go.opentelemetry.io/otel/api/kv"
3030
"go.opentelemetry.io/otel/api/metric"
31-
"go.opentelemetry.io/otel/api/standard"
3231
apitrace "go.opentelemetry.io/otel/api/trace"
3332
"go.opentelemetry.io/otel/exporters/otlp"
3433
"go.opentelemetry.io/otel/sdk/metric/controller/push"
3534
"go.opentelemetry.io/otel/sdk/metric/selector/simple"
3635
"go.opentelemetry.io/otel/sdk/resource"
3736
sdktrace "go.opentelemetry.io/otel/sdk/trace"
37+
"go.opentelemetry.io/otel/semconv"
3838
)
3939

4040
// Initializes an OTLP exporter, and configures the corresponding trace and
@@ -57,7 +57,7 @@ func initProvider() (*otlp.Exporter, *push.Controller) {
5757
sdktrace.WithConfig(sdktrace.Config{DefaultSampler: sdktrace.AlwaysSample()}),
5858
sdktrace.WithResource(resource.New(
5959
// the service name used to display traces in backends
60-
kv.Key(standard.ServiceNameKey).String("test-service"),
60+
kv.Key(semconv.ServiceNameKey).String("test-service"),
6161
)),
6262
sdktrace.WithSyncer(exp),
6363
)

instrumentation/grpctrace/interceptor.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"net"
2323
"strings"
2424

25-
"go.opentelemetry.io/otel/api/standard"
25+
"go.opentelemetry.io/otel/semconv"
2626

2727
"github.com/golang/protobuf/proto" //nolint:staticcheck
2828

@@ -45,20 +45,20 @@ func (m messageType) Event(ctx context.Context, id int, message interface{}) {
4545
if p, ok := message.(proto.Message); ok {
4646
span.AddEvent(ctx, "message",
4747
kv.KeyValue(m),
48-
standard.RPCMessageIDKey.Int(id),
49-
standard.RPCMessageUncompressedSizeKey.Int(proto.Size(p)),
48+
semconv.RPCMessageIDKey.Int(id),
49+
semconv.RPCMessageUncompressedSizeKey.Int(proto.Size(p)),
5050
)
5151
} else {
5252
span.AddEvent(ctx, "message",
5353
kv.KeyValue(m),
54-
standard.RPCMessageIDKey.Int(id),
54+
semconv.RPCMessageIDKey.Int(id),
5555
)
5656
}
5757
}
5858

5959
var (
60-
messageSent = messageType(standard.RPCMessageTypeSent)
61-
messageReceived = messageType(standard.RPCMessageTypeReceived)
60+
messageSent = messageType(semconv.RPCMessageTypeSent)
61+
messageReceived = messageType(semconv.RPCMessageTypeReceived)
6262
)
6363

6464
// UnaryClientInterceptor returns a grpc.UnaryClientInterceptor suitable
@@ -404,7 +404,7 @@ func StreamServerInterceptor(tracer trace.Tracer, opts ...Option) grpc.StreamSer
404404
// spanInfo returns a span name and all appropriate attributes from the gRPC
405405
// method and peer address.
406406
func spanInfo(fullMethod, peerAddress string) (string, []kv.KeyValue) {
407-
attrs := []kv.KeyValue{standard.RPCSystemGRPC}
407+
attrs := []kv.KeyValue{semconv.RPCSystemGRPC}
408408
name, mAttrs := parseFullMethod(fullMethod)
409409
attrs = append(attrs, mAttrs...)
410410
attrs = append(attrs, peerAttr(peerAddress)...)
@@ -423,8 +423,8 @@ func peerAttr(addr string) []kv.KeyValue {
423423
}
424424

425425
return []kv.KeyValue{
426-
standard.NetPeerIPKey.String(host),
427-
standard.NetPeerPortKey.String(port),
426+
semconv.NetPeerIPKey.String(host),
427+
semconv.NetPeerPortKey.String(port),
428428
}
429429
}
430430

@@ -450,10 +450,10 @@ func parseFullMethod(fullMethod string) (string, []kv.KeyValue) {
450450

451451
var attrs []kv.KeyValue
452452
if service := parts[0]; service != "" {
453-
attrs = append(attrs, standard.RPCServiceKey.String(service))
453+
attrs = append(attrs, semconv.RPCServiceKey.String(service))
454454
}
455455
if method := parts[1]; method != "" {
456-
attrs = append(attrs, standard.RPCMethodKey.String(method))
456+
attrs = append(attrs, semconv.RPCMethodKey.String(method))
457457
}
458458
return name, attrs
459459
}

0 commit comments

Comments
 (0)