Skip to content

Commit 73fc6f7

Browse files
Merge pull request #218 from celian-garcia/fix/wrong-schema-merge
[BUGFIX]: conflicting Schema URL: https://opentelemetry.io/schemas/1.25.0 and https://opentelemetry.io/schemas/1.12.0"
2 parents 9394be3 + 3ba704e commit 73fc6f7

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

otel/provider.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"go.opentelemetry.io/otel"
2525
"go.opentelemetry.io/otel/sdk/resource"
2626
"go.opentelemetry.io/otel/sdk/trace"
27-
semconv "go.opentelemetry.io/otel/semconv/v1.12.0"
27+
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
2828
)
2929

3030
type Builder struct {
@@ -77,8 +77,7 @@ func (b *Builder) Build() (async.Task, error) {
7777
func (b *Builder) createDefaultResource(serviceName string) (*resource.Resource, error) {
7878
return resource.Merge(
7979
resource.Default(),
80-
resource.NewWithAttributes(
81-
semconv.SchemaURL,
80+
resource.NewSchemaless(
8281
semconv.ServiceNameKey.String(serviceName),
8382
semconv.ServiceVersionKey.String(version.Version)))
8483
}

0 commit comments

Comments
 (0)