From 1f8ad000fffc5ae24933d7b4dcbb99cc00bfb649 Mon Sep 17 00:00:00 2001
From: Tyler Yahn <MrAlias@users.noreply.github.com>
Date: Mon, 28 Mar 2022 09:23:13 -0700
Subject: [PATCH] Fix schema URLs (#2744)

* Fix schema URLs

* Add changelog entry
---
 CHANGELOG.md             | 5 +++++
 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 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f9f190d1..ddc987b34 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<version>"` they now use the correct URL without a `v` prefix, `"https://opentelemetry.io/schemas/<version>"`. (#2743, #2744)
+
 ### Security
 
 - Upgrade `go.opentelemetry.io/proto/otlp` from `v0.12.0` to `v0.12.1`.
diff --git a/semconv/v1.4.0/schema.go b/semconv/v1.4.0/schema.go
index 467a30b9e..a78f1bf40 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/<version>
-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 9a2f60647..6175b00d2 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/<version>
-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 c7574ab20..be540d6df 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/<version>
-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 ec8b463d9..64b6c46a5 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/<version>
-const SchemaURL = "https://opentelemetry.io/schemas/v1.7.0"
+const SchemaURL = "https://opentelemetry.io/schemas/1.7.0"