diff --git a/bridge/opentracing/internal/mock.go b/bridge/opentracing/internal/mock.go index 75683a899..99585c756 100644 --- a/bridge/opentracing/internal/mock.go +++ b/bridge/opentracing/internal/mock.go @@ -267,8 +267,8 @@ func (s *MockSpan) RecordError(err error, opts ...trace.EventOption) { s.SetStatus(codes.Error, "") opts = append(opts, trace.WithAttributes( - semconv.ExceptionTypeKey.String(reflect.TypeOf(err).String()), - semconv.ExceptionMessageKey.String(err.Error()), + semconv.ExceptionType(reflect.TypeOf(err).String()), + semconv.ExceptionMessage(err.Error()), )) s.AddEvent(semconv.ExceptionEventName, opts...) } diff --git a/example/fib/main.go b/example/fib/main.go index 18f38e000..6863f7f14 100644 --- a/example/fib/main.go +++ b/example/fib/main.go @@ -46,8 +46,8 @@ func newResource() *resource.Resource { resource.Default(), resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("fib"), - semconv.ServiceVersionKey.String("v0.1.0"), + semconv.ServiceName("fib"), + semconv.ServiceVersion("v0.1.0"), attribute.String("environment", "demo"), ), ) diff --git a/example/jaeger/main.go b/example/jaeger/main.go index 591d3a470..38196ebb5 100644 --- a/example/jaeger/main.go +++ b/example/jaeger/main.go @@ -51,7 +51,7 @@ func tracerProvider(url string) (*tracesdk.TracerProvider, error) { // Record information about this application in a Resource. tracesdk.WithResource(resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String(service), + semconv.ServiceName(service), attribute.String("environment", environment), attribute.Int64("ID", id), )), diff --git a/example/otel-collector/main.go b/example/otel-collector/main.go index bdbaf65ba..bc6643f49 100644 --- a/example/otel-collector/main.go +++ b/example/otel-collector/main.go @@ -46,7 +46,7 @@ func initProvider() (func(context.Context) error, error) { res, err := resource.New(ctx, resource.WithAttributes( // the service name used to display traces in backends - semconv.ServiceNameKey.String("test-service"), + semconv.ServiceName("test-service"), ), ) if err != nil { diff --git a/example/zipkin/main.go b/example/zipkin/main.go index 63809b630..81a16abd4 100644 --- a/example/zipkin/main.go +++ b/example/zipkin/main.go @@ -55,7 +55,7 @@ func initTracer(url string) (func(context.Context) error, error) { sdktrace.WithSpanProcessor(batcher), sdktrace.WithResource(resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("zipkin-test"), + semconv.ServiceName("zipkin-test"), )), ) otel.SetTracerProvider(tp) diff --git a/exporters/jaeger/jaeger.go b/exporters/jaeger/jaeger.go index 972e25414..ddbd681d0 100644 --- a/exporters/jaeger/jaeger.go +++ b/exporters/jaeger/jaeger.go @@ -352,7 +352,7 @@ func process(res *resource.Resource, defaultServiceName string) *gen.Process { // If no service.name is contained in a Span's Resource, // that field MUST be populated from the default Resource. if serviceName.Value.AsString() == "" { - serviceName = semconv.ServiceNameKey.String(defaultServiceName) + serviceName = semconv.ServiceName(defaultServiceName) } process.ServiceName = serviceName.Value.AsString() diff --git a/exporters/jaeger/jaeger_test.go b/exporters/jaeger/jaeger_test.go index 066ea8ffe..1b11be790 100644 --- a/exporters/jaeger/jaeger_test.go +++ b/exporters/jaeger/jaeger_test.go @@ -119,7 +119,7 @@ func TestExporterExportSpan(t *testing.T) { tp := sdktrace.NewTracerProvider( sdktrace.WithBatcher(exp), sdktrace.WithResource(resource.NewSchemaless( - semconv.ServiceNameKey.String(serviceName), + semconv.ServiceName(serviceName), attribute.String(tagKey, tagVal), )), ) @@ -376,7 +376,7 @@ func TestSpanSnapshotToThrift(t *testing.T) { Resource: resource.NewSchemaless( attribute.String("rk1", rv1), attribute.Int64("rk2", rv2), - semconv.ServiceNameKey.String("service name"), + semconv.ServiceName("service name"), ), Status: sdktrace.Status{ Code: codes.Unset, @@ -453,7 +453,7 @@ func TestExporterExportSpansHonorsCancel(t *testing.T) { { Name: "s1", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r1").String("v1"), ), StartTime: now, @@ -462,7 +462,7 @@ func TestExporterExportSpansHonorsCancel(t *testing.T) { { Name: "s2", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r2").String("v2"), ), StartTime: now, @@ -483,7 +483,7 @@ func TestExporterExportSpansHonorsTimeout(t *testing.T) { { Name: "s1", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r1").String("v1"), ), StartTime: now, @@ -492,7 +492,7 @@ func TestExporterExportSpansHonorsTimeout(t *testing.T) { { Name: "s2", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r2").String("v2"), ), StartTime: now, @@ -530,7 +530,7 @@ func TestJaegerBatchList(t *testing.T) { tracetest.SpanStub{ Name: "s1", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r1").String("v1"), ), StartTime: now, @@ -564,7 +564,7 @@ func TestJaegerBatchList(t *testing.T) { { Name: "s1", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r1").String("v1"), ), StartTime: now, @@ -573,7 +573,7 @@ func TestJaegerBatchList(t *testing.T) { { Name: "s2", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r1").String("v1"), ), StartTime: now, @@ -582,7 +582,7 @@ func TestJaegerBatchList(t *testing.T) { { Name: "s3", Resource: resource.NewSchemaless( - semconv.ServiceNameKey.String("name"), + semconv.ServiceName("name"), attribute.Key("r2").String("v2"), ), StartTime: now, @@ -689,7 +689,7 @@ func TestProcess(t *testing.T) { { name: "resources contain service name", res: resource.NewSchemaless( - semconv.ServiceNameKey.String("service name"), + semconv.ServiceName("service name"), attribute.Key("r1").String("v1"), ), defaultServiceName: "default service name", diff --git a/exporters/otlp/otlpmetric/internal/transform/metricdata_test.go b/exporters/otlp/otlpmetric/internal/transform/metricdata_test.go index 7241a5cf7..8744d40d4 100644 --- a/exporters/otlp/otlpmetric/internal/transform/metricdata_test.go +++ b/exporters/otlp/otlpmetric/internal/transform/metricdata_test.go @@ -288,8 +288,8 @@ var ( otelRes = resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("test server"), - semconv.ServiceVersionKey.String("v0.1.0"), + semconv.ServiceName("test server"), + semconv.ServiceVersion("v0.1.0"), ) pbRes = &rpb.Resource{ diff --git a/exporters/otlp/otlptrace/otlptracehttp/example_test.go b/exporters/otlp/otlptrace/otlptracehttp/example_test.go index 0331d2838..8682bbce3 100644 --- a/exporters/otlp/otlptrace/otlptracehttp/example_test.go +++ b/exporters/otlp/otlptrace/otlptracehttp/example_test.go @@ -60,8 +60,8 @@ func multiply(ctx context.Context, x, y int64) int64 { func newResource() *resource.Resource { return resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("otlptrace-example"), - semconv.ServiceVersionKey.String("0.0.1"), + semconv.ServiceName("otlptrace-example"), + semconv.ServiceVersion("0.0.1"), ) } diff --git a/exporters/prometheus/exporter_test.go b/exporters/prometheus/exporter_test.go index 25205aed9..067d1951b 100644 --- a/exporters/prometheus/exporter_test.go +++ b/exporters/prometheus/exporter_test.go @@ -274,9 +274,9 @@ func TestPrometheusExporter(t *testing.T) { } else { res, err = resource.New(ctx, // always specify service.name because the default depends on the running OS - resource.WithAttributes(semconv.ServiceNameKey.String("prometheus_test")), + resource.WithAttributes(semconv.ServiceName("prometheus_test")), // Overwrite the semconv.TelemetrySDKVersionKey value so we don't need to update every version - resource.WithAttributes(semconv.TelemetrySDKVersionKey.String("latest")), + resource.WithAttributes(semconv.TelemetrySDKVersion("latest")), resource.WithAttributes(tc.customResouceAttrs...), ) require.NoError(t, err) @@ -350,9 +350,9 @@ func TestMultiScopes(t *testing.T) { res, err := resource.New(ctx, // always specify service.name because the default depends on the running OS - resource.WithAttributes(semconv.ServiceNameKey.String("prometheus_test")), + resource.WithAttributes(semconv.ServiceName("prometheus_test")), // Overwrite the semconv.TelemetrySDKVersionKey value so we don't need to update every version - resource.WithAttributes(semconv.TelemetrySDKVersionKey.String("latest")), + resource.WithAttributes(semconv.TelemetrySDKVersion("latest")), ) require.NoError(t, err) res, err = resource.Merge(resource.Default(), res) @@ -613,8 +613,8 @@ func TestDuplicateMetrics(t *testing.T) { // initialize resource res, err := resource.New(ctx, - resource.WithAttributes(semconv.ServiceNameKey.String("prometheus_test")), - resource.WithAttributes(semconv.TelemetrySDKVersionKey.String("latest")), + resource.WithAttributes(semconv.ServiceName("prometheus_test")), + resource.WithAttributes(semconv.TelemetrySDKVersion("latest")), ) require.NoError(t, err) res, err = resource.Merge(resource.Default(), res) diff --git a/exporters/stdout/stdoutmetric/example_test.go b/exporters/stdout/stdoutmetric/example_test.go index 4db2535d3..fdce6951d 100644 --- a/exporters/stdout/stdoutmetric/example_test.go +++ b/exporters/stdout/stdoutmetric/example_test.go @@ -35,7 +35,7 @@ var ( now = time.Date(2000, time.January, 01, 0, 0, 0, 0, time.FixedZone("GMT", 0)) res = resource.NewSchemaless( - semconv.ServiceNameKey.String("stdoutmetric-example"), + semconv.ServiceName("stdoutmetric-example"), ) mockData = metricdata.ResourceMetrics{ diff --git a/exporters/stdout/stdouttrace/example_test.go b/exporters/stdout/stdouttrace/example_test.go index a34331f35..0864fbade 100644 --- a/exporters/stdout/stdouttrace/example_test.go +++ b/exporters/stdout/stdouttrace/example_test.go @@ -59,8 +59,8 @@ func multiply(ctx context.Context, x, y int64) int64 { func Resource() *resource.Resource { return resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("stdout-example"), - semconv.ServiceVersionKey.String("0.0.1"), + semconv.ServiceName("stdout-example"), + semconv.ServiceVersion("0.0.1"), ) } diff --git a/exporters/zipkin/model_test.go b/exporters/zipkin/model_test.go index 676c08a1c..a7ee19a3a 100644 --- a/exporters/zipkin/model_test.go +++ b/exporters/zipkin/model_test.go @@ -38,8 +38,8 @@ import ( func TestModelConversion(t *testing.T) { res := resource.NewSchemaless( - semconv.ServiceNameKey.String("model-test"), - semconv.ServiceVersionKey.String("0.1.0"), + semconv.ServiceName("model-test"), + semconv.ServiceVersion("0.1.0"), attribute.Int64("resource-attr1", 42), attribute.IntSlice("resource-attr2", []int{0, 1, 2}), ) @@ -1095,9 +1095,9 @@ func TestRemoteEndpointTransformation(t *testing.T) { data: tracetest.SpanStub{ SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ - semconv.PeerServiceKey.String("peer-service-test"), - semconv.NetPeerNameKey.String("peer-name-test"), - semconv.NetSockPeerNameKey.String("net-sock-peer-test"), + semconv.PeerService("peer-service-test"), + semconv.NetPeerName("peer-name-test"), + semconv.NetSockPeerName("net-sock-peer-test"), }, }, want: &zkmodel.Endpoint{ @@ -1109,8 +1109,8 @@ func TestRemoteEndpointTransformation(t *testing.T) { data: tracetest.SpanStub{ SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ - semconv.NetSockPeerNameKey.String("net-sock-peer-test"), - semconv.DBNameKey.String("db-name-test"), + semconv.NetSockPeerName("net-sock-peer-test"), + semconv.DBName("db-name-test"), }, }, want: &zkmodel.Endpoint{ @@ -1123,7 +1123,7 @@ func TestRemoteEndpointTransformation(t *testing.T) { SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ attribute.String("foo", "bar"), - semconv.DBNameKey.String("db-name-test"), + semconv.DBName("db-name-test"), }, }, want: &zkmodel.Endpoint{ @@ -1137,7 +1137,7 @@ func TestRemoteEndpointTransformation(t *testing.T) { Attributes: []attribute.KeyValue{ keyPeerHostname.String("peer-hostname-test"), keyPeerAddress.String("peer-address-test"), - semconv.DBNameKey.String("http-host-test"), + semconv.DBName("http-host-test"), }, }, want: &zkmodel.Endpoint{ @@ -1150,7 +1150,7 @@ func TestRemoteEndpointTransformation(t *testing.T) { SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ keyPeerAddress.String("peer-address-test"), - semconv.DBNameKey.String("http-host-test"), + semconv.DBName("http-host-test"), }, }, want: &zkmodel.Endpoint{ @@ -1162,7 +1162,7 @@ func TestRemoteEndpointTransformation(t *testing.T) { data: tracetest.SpanStub{ SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ - semconv.NetSockPeerAddrKey.String("INVALID"), + semconv.NetSockPeerAddr("INVALID"), }, }, want: nil, @@ -1172,7 +1172,7 @@ func TestRemoteEndpointTransformation(t *testing.T) { data: tracetest.SpanStub{ SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ - semconv.NetSockPeerAddrKey.String("0:0:1:5ee:bad:c0de:0:0"), + semconv.NetSockPeerAddr("0:0:1:5ee:bad:c0de:0:0"), }, }, want: &zkmodel.Endpoint{ @@ -1184,8 +1184,8 @@ func TestRemoteEndpointTransformation(t *testing.T) { data: tracetest.SpanStub{ SpanKind: trace.SpanKindProducer, Attributes: []attribute.KeyValue{ - semconv.NetSockPeerAddrKey.String("1.2.3.4"), - semconv.NetSockPeerPortKey.Int(9876), + semconv.NetSockPeerAddr("1.2.3.4"), + semconv.NetSockPeerPort(9876), }, }, want: &zkmodel.Endpoint{ @@ -1211,6 +1211,6 @@ func TestServiceName(t *testing.T) { attrs = append(attrs, attribute.String("test_key", "test_value")) assert.Equal(t, defaultServiceName, getServiceName(attrs)) - attrs = append(attrs, semconv.ServiceNameKey.String("my_service")) + attrs = append(attrs, semconv.ServiceName("my_service")) assert.Equal(t, "my_service", getServiceName(attrs)) } diff --git a/exporters/zipkin/zipkin_test.go b/exporters/zipkin/zipkin_test.go index cbec5b8f3..3bcd431f3 100644 --- a/exporters/zipkin/zipkin_test.go +++ b/exporters/zipkin/zipkin_test.go @@ -199,8 +199,8 @@ func logStoreLogger(s *logStore) *log.Logger { func TestExportSpans(t *testing.T) { res := resource.NewSchemaless( - semconv.ServiceNameKey.String("exporter-test"), - semconv.ServiceVersionKey.String("0.1.0"), + semconv.ServiceName("exporter-test"), + semconv.ServiceVersion("0.1.0"), ) spans := tracetest.SpanStubs{ diff --git a/sdk/metric/example_test.go b/sdk/metric/example_test.go index 4e95d3909..c0704509a 100644 --- a/sdk/metric/example_test.go +++ b/sdk/metric/example_test.go @@ -34,8 +34,8 @@ func Example() { // information about how to create and use Resources. res := resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("my-service"), - semconv.ServiceVersionKey.String("v0.1.0"), + semconv.ServiceName("my-service"), + semconv.ServiceVersion("v0.1.0"), ) meterProvider := metric.NewMeterProvider( diff --git a/sdk/resource/builtin.go b/sdk/resource/builtin.go index 34a474891..aa0f942f4 100644 --- a/sdk/resource/builtin.go +++ b/sdk/resource/builtin.go @@ -60,9 +60,9 @@ var ( func (telemetrySDK) Detect(context.Context) (*Resource, error) { return NewWithAttributes( semconv.SchemaURL, - semconv.TelemetrySDKNameKey.String("opentelemetry"), - semconv.TelemetrySDKLanguageKey.String("go"), - semconv.TelemetrySDKVersionKey.String(otel.Version()), + semconv.TelemetrySDKName("opentelemetry"), + semconv.TelemetrySDKLanguageGo, + semconv.TelemetrySDKVersion(otel.Version()), ), nil } diff --git a/sdk/resource/container.go b/sdk/resource/container.go index 6f7fd005b..318dcf82f 100644 --- a/sdk/resource/container.go +++ b/sdk/resource/container.go @@ -47,7 +47,7 @@ func (cgroupContainerIDDetector) Detect(ctx context.Context) (*Resource, error) if containerID == "" { return Empty(), nil } - return NewWithAttributes(semconv.SchemaURL, semconv.ContainerIDKey.String(containerID)), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ContainerID(containerID)), nil } var ( diff --git a/sdk/resource/env.go b/sdk/resource/env.go index deebe363a..e32843cad 100644 --- a/sdk/resource/env.go +++ b/sdk/resource/env.go @@ -59,7 +59,7 @@ func (fromEnv) Detect(context.Context) (*Resource, error) { var res *Resource if svcName != "" { - res = NewSchemaless(semconv.ServiceNameKey.String(svcName)) + res = NewSchemaless(semconv.ServiceName(svcName)) } r2, err := constructOTResources(attrs) diff --git a/sdk/resource/env_test.go b/sdk/resource/env_test.go index 43b3a0e25..d8c5a70c8 100644 --- a/sdk/resource/env_test.go +++ b/sdk/resource/env_test.go @@ -83,7 +83,7 @@ func TestNoResourceAttributesSet(t *testing.T) { res, err := detector.Detect(context.Background()) require.NoError(t, err) assert.Equal(t, res, NewSchemaless( - semconv.ServiceNameKey.String("bar"), + semconv.ServiceName("bar"), )) } @@ -131,6 +131,6 @@ func TestDetectServiceNameFromEnv(t *testing.T) { require.NoError(t, err) assert.Equal(t, res, NewSchemaless( attribute.String("key", "value"), - semconv.ServiceNameKey.String("bar"), + semconv.ServiceName("bar"), )) } diff --git a/sdk/resource/os.go b/sdk/resource/os.go index ac520dd86..815fe5c20 100644 --- a/sdk/resource/os.go +++ b/sdk/resource/os.go @@ -63,7 +63,7 @@ func (osDescriptionDetector) Detect(ctx context.Context) (*Resource, error) { return NewWithAttributes( semconv.SchemaURL, - semconv.OSDescriptionKey.String(description), + semconv.OSDescription(description), ), nil } diff --git a/sdk/resource/process.go b/sdk/resource/process.go index 7eaddd34b..bdd0e7fe6 100644 --- a/sdk/resource/process.go +++ b/sdk/resource/process.go @@ -120,14 +120,14 @@ type processRuntimeDescriptionDetector struct{} // Detect returns a *Resource that describes the process identifier (PID) of the // executing process. func (processPIDDetector) Detect(ctx context.Context) (*Resource, error) { - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessPIDKey.Int(pid())), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessPID(pid())), nil } // Detect returns a *Resource that describes the name of the process executable. func (processExecutableNameDetector) Detect(ctx context.Context) (*Resource, error) { executableName := filepath.Base(commandArgs()[0]) - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessExecutableNameKey.String(executableName)), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessExecutableName(executableName)), nil } // Detect returns a *Resource that describes the full path of the process executable. @@ -137,13 +137,13 @@ func (processExecutablePathDetector) Detect(ctx context.Context) (*Resource, err return nil, err } - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessExecutablePathKey.String(executablePath)), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessExecutablePath(executablePath)), nil } // Detect returns a *Resource that describes all the command arguments as received // by the process. func (processCommandArgsDetector) Detect(ctx context.Context) (*Resource, error) { - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessCommandArgsKey.StringSlice(commandArgs())), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessCommandArgs(commandArgs()...)), nil } // Detect returns a *Resource that describes the username of the user that owns the @@ -154,18 +154,18 @@ func (processOwnerDetector) Detect(ctx context.Context) (*Resource, error) { return nil, err } - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessOwnerKey.String(owner.Username)), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessOwner(owner.Username)), nil } // Detect returns a *Resource that describes the name of the compiler used to compile // this process image. func (processRuntimeNameDetector) Detect(ctx context.Context) (*Resource, error) { - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessRuntimeNameKey.String(runtimeName())), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessRuntimeName(runtimeName())), nil } // Detect returns a *Resource that describes the version of the runtime of this process. func (processRuntimeVersionDetector) Detect(ctx context.Context) (*Resource, error) { - return NewWithAttributes(semconv.SchemaURL, semconv.ProcessRuntimeVersionKey.String(runtimeVersion())), nil + return NewWithAttributes(semconv.SchemaURL, semconv.ProcessRuntimeVersion(runtimeVersion())), nil } // Detect returns a *Resource that describes the runtime of this process. @@ -175,6 +175,6 @@ func (processRuntimeDescriptionDetector) Detect(ctx context.Context) (*Resource, return NewWithAttributes( semconv.SchemaURL, - semconv.ProcessRuntimeDescriptionKey.String(runtimeDescription), + semconv.ProcessRuntimeDescription(runtimeDescription), ), nil } diff --git a/sdk/resource/resource_test.go b/sdk/resource/resource_test.go index 630a5da9a..608d9e21e 100644 --- a/sdk/resource/resource_test.go +++ b/sdk/resource/resource_test.go @@ -227,8 +227,8 @@ func TestDefault(t *testing.T) { "default service.name should include executable name") require.Contains(t, res.Attributes(), semconv.TelemetrySDKLanguageGo) - require.Contains(t, res.Attributes(), semconv.TelemetrySDKVersionKey.String(otel.Version())) - require.Contains(t, res.Attributes(), semconv.TelemetrySDKNameKey.String("opentelemetry")) + require.Contains(t, res.Attributes(), semconv.TelemetrySDKVersion(otel.Version())) + require.Contains(t, res.Attributes(), semconv.TelemetrySDKName("opentelemetry")) } func TestString(t *testing.T) { diff --git a/sdk/trace/span.go b/sdk/trace/span.go index 5abb0b274..9fb483a99 100644 --- a/sdk/trace/span.go +++ b/sdk/trace/span.go @@ -383,14 +383,14 @@ func (s *recordingSpan) End(options ...trace.SpanEndOption) { defer panic(recovered) opts := []trace.EventOption{ trace.WithAttributes( - semconv.ExceptionTypeKey.String(typeStr(recovered)), - semconv.ExceptionMessageKey.String(fmt.Sprint(recovered)), + semconv.ExceptionType(typeStr(recovered)), + semconv.ExceptionMessage(fmt.Sprint(recovered)), ), } if config.StackTrace() { opts = append(opts, trace.WithAttributes( - semconv.ExceptionStacktraceKey.String(recordStackTrace()), + semconv.ExceptionStacktrace(recordStackTrace()), )) } @@ -430,14 +430,14 @@ func (s *recordingSpan) RecordError(err error, opts ...trace.EventOption) { } opts = append(opts, trace.WithAttributes( - semconv.ExceptionTypeKey.String(typeStr(err)), - semconv.ExceptionMessageKey.String(err.Error()), + semconv.ExceptionType(typeStr(err)), + semconv.ExceptionMessage(err.Error()), )) c := trace.NewEventConfig(opts...) if c.StackTrace() { opts = append(opts, trace.WithAttributes( - semconv.ExceptionStacktraceKey.String(recordStackTrace()), + semconv.ExceptionStacktrace(recordStackTrace()), )) } diff --git a/sdk/trace/trace_test.go b/sdk/trace/trace_test.go index 280546894..7d5a09fb1 100644 --- a/sdk/trace/trace_test.go +++ b/sdk/trace/trace_test.go @@ -1235,8 +1235,8 @@ func TestRecordError(t *testing.T) { Name: semconv.ExceptionEventName, Time: errTime, Attributes: []attribute.KeyValue{ - semconv.ExceptionTypeKey.String(s.typ), - semconv.ExceptionMessageKey.String(s.msg), + semconv.ExceptionType(s.typ), + semconv.ExceptionMessage(s.msg), }, }, }, @@ -1279,8 +1279,8 @@ func TestRecordErrorWithStackTrace(t *testing.T) { Name: semconv.ExceptionEventName, Time: errTime, Attributes: []attribute.KeyValue{ - semconv.ExceptionTypeKey.String(typ), - semconv.ExceptionMessageKey.String(msg), + semconv.ExceptionType(typ), + semconv.ExceptionMessage(msg), }, }, }, @@ -1502,8 +1502,8 @@ func TestSpanCapturesPanic(t *testing.T) { require.Len(t, spans[0].Events(), 1) assert.Equal(t, spans[0].Events()[0].Name, semconv.ExceptionEventName) assert.Equal(t, spans[0].Events()[0].Attributes, []attribute.KeyValue{ - semconv.ExceptionTypeKey.String("*errors.errorString"), - semconv.ExceptionMessageKey.String("error message"), + semconv.ExceptionType("*errors.errorString"), + semconv.ExceptionMessage("error message"), }) } diff --git a/website_docs/getting-started.md b/website_docs/getting-started.md index a084dcb46..e32448669 100644 --- a/website_docs/getting-started.md +++ b/website_docs/getting-started.md @@ -323,8 +323,8 @@ func newResource() *resource.Resource { resource.Default(), resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("fib"), - semconv.ServiceVersionKey.String("v0.1.0"), + semconv.ServiceName("fib"), + semconv.ServiceVersion("v0.1.0"), attribute.String("environment", "demo"), ), ) diff --git a/website_docs/manual.md b/website_docs/manual.md index 4fd2190da..21dbcc859 100644 --- a/website_docs/manual.md +++ b/website_docs/manual.md @@ -51,7 +51,7 @@ func newTraceProvider(exp sdktrace.SpanExporter) *sdktrace.TracerProvider { resource.Default(), resource.NewWithAttributes( semconv.SchemaURL, - semconv.ServiceNameKey.String("ExampleService"), + semconv.ServiceName("ExampleService"), ), )