From efc11d7fe7aa83067c9f72f05d37d0d31f2d2d53 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Mon, 28 Mar 2022 07:57:41 -0700 Subject: [PATCH 1/2] Fix schema URLs --- semconv/v1.4.0/schema.go | 2 +- semconv/v1.5.0/schema.go | 2 +- semconv/v1.6.1/schema.go | 2 +- semconv/v1.7.0/schema.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/semconv/v1.4.0/schema.go b/semconv/v1.4.0/schema.go index 467a30b9ed7..a78f1bf4008 100644 --- a/semconv/v1.4.0/schema.go +++ b/semconv/v1.4.0/schema.go @@ -17,4 +17,4 @@ package semconv // import "go.opentelemetry.io/otel/semconv/v1.4.0" // SchemaURL is the schema URL that matches the version of the semantic conventions // that this package defines. Semconv packages starting from v1.4.0 must declare // non-empty schema URL in the form https://opentelemetry.io/schemas/ -const SchemaURL = "https://opentelemetry.io/schemas/v1.4.0" +const SchemaURL = "https://opentelemetry.io/schemas/1.4.0" diff --git a/semconv/v1.5.0/schema.go b/semconv/v1.5.0/schema.go index 9a2f60647c0..6175b00d2dd 100644 --- a/semconv/v1.5.0/schema.go +++ b/semconv/v1.5.0/schema.go @@ -17,4 +17,4 @@ package semconv // import "go.opentelemetry.io/otel/semconv/v1.5.0" // SchemaURL is the schema URL that matches the version of the semantic conventions // that this package defines. Semconv packages starting from v1.4.0 must declare // non-empty schema URL in the form https://opentelemetry.io/schemas/ -const SchemaURL = "https://opentelemetry.io/schemas/v1.5.0" +const SchemaURL = "https://opentelemetry.io/schemas/1.5.0" diff --git a/semconv/v1.6.1/schema.go b/semconv/v1.6.1/schema.go index c7574ab200c..be540d6df4a 100644 --- a/semconv/v1.6.1/schema.go +++ b/semconv/v1.6.1/schema.go @@ -17,4 +17,4 @@ package semconv // import "go.opentelemetry.io/otel/semconv/v1.6.1" // SchemaURL is the schema URL that matches the version of the semantic conventions // that this package defines. Semconv packages starting from v1.4.0 must declare // non-empty schema URL in the form https://opentelemetry.io/schemas/ -const SchemaURL = "https://opentelemetry.io/schemas/v1.6.1" +const SchemaURL = "https://opentelemetry.io/schemas/1.6.1" diff --git a/semconv/v1.7.0/schema.go b/semconv/v1.7.0/schema.go index ec8b463d98e..64b6c46a58d 100644 --- a/semconv/v1.7.0/schema.go +++ b/semconv/v1.7.0/schema.go @@ -17,4 +17,4 @@ package semconv // import "go.opentelemetry.io/otel/semconv/v1.7.0" // SchemaURL is the schema URL that matches the version of the semantic conventions // that this package defines. Semconv packages starting from v1.4.0 must declare // non-empty schema URL in the form https://opentelemetry.io/schemas/ -const SchemaURL = "https://opentelemetry.io/schemas/v1.7.0" +const SchemaURL = "https://opentelemetry.io/schemas/1.7.0" From 8bd228286f87323f1b725bdea1a9c57ec795ee21 Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Mon, 28 Mar 2022 08:05:51 -0700 Subject: [PATCH 2/2] Add changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f9f190d1c2..ddc987b34c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [Unreleased] +### Fixed + +- The `go.opentelemetry.io/otel/schema/*` packages now use the correct schema URL for their `SchemaURL` constant. + Instead of using `"https://opentelemetry.io/schemas/v"` they now use the correct URL without a `v` prefix, `"https://opentelemetry.io/schemas/"`. (#2743, #2744) + ### Security - Upgrade `go.opentelemetry.io/proto/otlp` from `v0.12.0` to `v0.12.1`.