Merge branch 'main' into main

open-telemetry · Jul 23, 2024 · bc2f8a2 · bc2f8a2
2 parents 3180964 + 8749168
commit bc2f8a2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -52,6 +52,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3991](https://github.com/open-telemetry/opentelemetry-python/pull/3991))
 - Add attributes field in  `MeterProvider.get_meter` and `InstrumentationScope`
   ([#4015](https://github.com/open-telemetry/opentelemetry-python/pull/4015))
+- Fix inaccessible `SCHEMA_URL` constants in `opentelemetry-semantic-conventions`
+  ([#4069](https://github.com/open-telemetry/opentelemetry-python/pull/4069))
 
 ## Version 1.25.0/0.46b0 (2024-05-30)
 

diff --git a/README.md b/README.md
@@ -80,9 +80,7 @@ this repository and perform an [editable
 install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs):
 
 ```sh
-pip install -e ./opentelemetry-api
-pip install -e ./opentelemetry-sdk
-pip install -e ./instrumentation/opentelemetry-instrumentation-{instrumentation}
+pip install -e ./opentelemetry-api -e ./opentelemetry-sdk -e ./opentelemetry-semantic-conventions
 ```
 
 For additional exporter and instrumentation packages, see the 

diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/metrics/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/metrics/__init__.py
@@ -20,7 +20,7 @@
     reason="Use metrics defined in the :py:const:`opentelemetry.semconv.metrics` and :py:const:`opentelemetry.semconv._incubating.metrics` modules instead.",
 )  # type: ignore
 class MetricInstruments:
-    SCHEMA_URL = "https://opentelemetry.io/schemas/v1.21.0"
+    SCHEMA_URL = "https://opentelemetry.io/schemas/1.21.0"
     """
     The URL of the OpenTelemetry schema for these keys and values.
     """

diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/resource/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/resource/__init__.py
@@ -24,7 +24,7 @@
     reason="Use attributes defined in the :py:const:`opentelemetry.semconv.attributes` and :py:const:`opentelemetry.semconv._incubating.attributes` modules instead.",
 )  # type: ignore
 class ResourceAttributes:
-    SCHEMA_URL = "https://opentelemetry.io/schemas/v1.21.0"
+    SCHEMA_URL = "https://opentelemetry.io/schemas/1.21.0"
     """
     The URL of the OpenTelemetry schema for these keys and values.
     """

diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/schemas.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/schemas.py
@@ -21,14 +21,14 @@ class Schemas(Enum):
     The URL of the OpenTelemetry schema version 1.23.1.
     """
 
-    V1_25_0 = "https://opentelemetry.io/schemas/v1.25.0"
+    V1_25_0 = "https://opentelemetry.io/schemas/1.25.0"
     """
-    The URL of the OpenTelemetry schema version v1.25.0.
+    The URL of the OpenTelemetry schema version 1.25.0.
     """
 
-    V1_26_0 = "https://opentelemetry.io/schemas/v1.26.0"
+    V1_26_0 = "https://opentelemetry.io/schemas/1.26.0"
     """
-    The URL of the OpenTelemetry schema version v1.26.0.
+    The URL of the OpenTelemetry schema version 1.26.0.
     """
 
     # when generating new semantic conventions,

diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/trace/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/trace/__init__.py
@@ -24,7 +24,7 @@
     reason="Use attributes defined in the :py:const:`opentelemetry.semconv.attributes` and :py:const:`opentelemetry.semconv._incubating.attributes` modules instead.",
 )  # type: ignore
 class SpanAttributes:
-    SCHEMA_URL = "https://opentelemetry.io/schemas/v1.21.0"
+    SCHEMA_URL = "https://opentelemetry.io/schemas/1.21.0"
     """
     The URL of the OpenTelemetry schema for these keys and values.
     """

diff --git a/scripts/semconv/generate.sh b/scripts/semconv/generate.sh
@@ -5,8 +5,9 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 ROOT_DIR="${SCRIPT_DIR}/../../"
 
 # freeze the spec version to make SemanticAttributes generation reproducible
-SEMCONV_VERSION=v1.26.0
-OTEL_SEMCONV_GEN_IMG_VERSION=0.24.0
+SEMCONV_VERSION=1.26.0
+SEMCONV_VERSION_TAG=v$SEMCONV_VERSION
+OTEL_SEMCONV_GEN_IMG_VERSION=0.25.0
 INCUBATING_DIR=_incubating
 cd ${SCRIPT_DIR}
 
@@ -16,7 +17,7 @@ cd semantic-conventions
 
 git init
 git remote add origin https://github.com/open-telemetry/semantic-conventions.git
-git fetch origin "$SEMCONV_VERSION"
+git fetch origin "$SEMCONV_VERSION_TAG"
 git reset --hard FETCH_HEAD
 cd ${SCRIPT_DIR}