Merge branch 'main' into shutdown_channel

Author: TommyCpp

RELEASING.md

@@ -16,7 +16,7 @@ A draft PR can be created, but before releasing consider the following:
 
 * Are there any pending pull requests which should be included in the next release?
   * Are they blockers?
-* Are there any unresolved issues which should be resolved before the next release?
+* Are there any unresolved issues which should be resolved before the next release? Check the release [blockers milestone](https://github.com/open-telemetry/opentelemetry-rust/milestones) for every release
 * Bring it up at a SIG meeting, this can usually get some of these questions answered sooner than later. It will also
   help establish a person to perform the release. Ideally this can be someone different each time to ensure that the
   process is documented.

opentelemetry-semantic-conventions/CHANGELOG.md

@@ -6,6 +6,8 @@
 
 - Update to [v1.24.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.24.0) of the semantic conventions.
   [#1596](https://github.com/open-telemetry/opentelemetry-rust/pull/1596)
+- Update to [v1.25.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.25.0) of the semantic conventions.
+  [#1681](https://github.com/open-telemetry/opentelemetry-rust/pull/1681)
 
 ## v0.14.0
 

opentelemetry-semantic-conventions/scripts/generate-consts-from-spec.sh

@@ -5,8 +5,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 CRATE_DIR="${SCRIPT_DIR}/../"
 
 # freeze the spec version and generator version to make generation reproducible
-SPEC_VERSION=1.24.0
-SEMCOVGEN_VERSION=0.23.0
+SPEC_VERSION=1.25.0
+SEMCOVGEN_VERSION=0.24.0
 
 cd "$CRATE_DIR"
 
@@ -36,7 +36,7 @@ docker run --rm \
 	-v "${CRATE_DIR}/scripts/templates:/templates" \
 	-v "${CRATE_DIR}/src:/output" \
 	otel/semconvgen:$SEMCOVGEN_VERSION \
-  --only resource \
+  --only resource,attribute_group \
   -f /source code \
 	--template /templates/semantic_attributes.rs.j2 \
 	--output /output/resource.rs \
@@ -51,6 +51,6 @@ fi
 "${SED[@]}" "s/\(opentelemetry.io\/schemas\/\)[^\"]*\"/\1$SPEC_VERSION\"/" src/lib.rs
 
 # handle doc generation failures
-"${SED[@]}" 's/\[2\]\.$//' src/resource.rs # remove trailing [2] from few of the doc comments
+"${SED[@]}" 's/\[2\]\.$//' src/resource.rs src/trace.rs # remove trailing [2] from few of the doc comments
 
 cargo fmt

opentelemetry-semantic-conventions/src/lib.rs

@@ -20,4 +20,4 @@ pub mod trace;
 
 /// The schema URL that matches the version of the semantic conventions that
 /// this crate defines.
-pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.24.0";
+pub const SCHEMA_URL: &str = "https://opentelemetry.io/schemas/1.25.0";