fixup! Add generated modules that output const &str for tracing compatibility

Author: kriswuollett

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

@@ -31,17 +31,6 @@ docker run --rm \
 	--output /output/trace.rs \
 	--parameters conventions=trace
 
-docker run --rm \
-	-v "${CRATE_DIR}/semantic-conventions/model:/source" \
-	-v "${CRATE_DIR}/scripts/templates:/templates" \
-	-v "${CRATE_DIR}/src/semconv:/output" \
-	otel/semconvgen:$SEMCOVGEN_VERSION \
-  --only span,event,attribute_group,scope \
-  -f /source code \
-	--template /templates/semconv_semantic_attributes.rs.j2 \
-	--output /output/trace.rs \
-	--parameters conventions=trace
-
 docker run --rm \
 	-v "${CRATE_DIR}/semantic-conventions/model:/source" \
 	-v "${CRATE_DIR}/scripts/templates:/templates" \
@@ -53,17 +42,6 @@ docker run --rm \
 	--output /output/resource.rs \
 	--parameters conventions=resource
 
-docker run --rm \
-	-v "${CRATE_DIR}/semantic-conventions/model:/source" \
-	-v "${CRATE_DIR}/scripts/templates:/templates" \
-	-v "${CRATE_DIR}/src/semconv:/output" \
-	otel/semconvgen:$SEMCOVGEN_VERSION \
-  --only resource \
-  -f /source code \
-	--template /templates/semconv_semantic_attributes.rs.j2 \
-	--output /output/resource.rs \
-	--parameters conventions=resource
-
 SED=(sed -i)
 if [[ "$(uname)" = "Darwin" ]]; then
   SED=(sed -i "")

opentelemetry-semantic-conventions/scripts/templates/header_resource.rs

@@ -7,14 +7,30 @@
 //!
 //! ## Usage
 //!
+//! `tracing`:
+//! 
+//! ```
+//! use opentelemetry_semantic_conventions as semconv;
+//! use tracing::span;
+//!
+//! let span = span!(
+//!     LEVEL::INFO,
+//!     "handle_request",
+//!     { semconv::resource::SERVICE_NAME = "my-service" },
+//!     { semconv::resource::SERVICE_NAMESPACE = "my-namespace" }
+//! );
+//! ```
+//! 
+//! OpenTelemetry SDK:
+//! 
 //! ```
 //! use opentelemetry_sdk::{trace::{config, TracerProvider}, Resource};
 //! use opentelemetry_semantic_conventions as semconv;
 //!
 //! let _tracer = TracerProvider::builder()
 //!     .with_config(config().with_resource(Resource::new(vec![
-//!         semconv::resource::SERVICE_NAME.string("my-service"),
-//!         semconv::resource::SERVICE_NAMESPACE.string("my-namespace"),
+//!         semconv::resource::SERVICE_NAME.into().string("my-service"),
+//!         semconv::resource::SERVICE_NAMESPACE.into().string("my-namespace"),
 //!     ])))
 //!     .build();
 //! ```

opentelemetry-semantic-conventions/scripts/templates/header_trace.rs

@@ -7,6 +7,22 @@
 //!
 //! ## Usage
 //!
+//! `tracing`:
+//! 
+//! ```
+//! use opentelemetry_semantic_conventions as semconv;
+//! use tracing::span;
+//!
+//! let span = span!(
+//!     LEVEL::INFO,
+//!     "handle_request",
+//!     { semconv::trace::NET_PEER_NAME = "example.org" },
+//!     { semconv::trace::NET_PEER_PORT = 80 }
+//! );
+//! ```
+//! 
+//! OpenTelemetry SDK:
+//! 
 //! ```
 //! use opentelemetry::{global, trace::Tracer as _};
 //! use opentelemetry_semantic_conventions as semcov;
@@ -15,8 +31,8 @@
 //! let _span = tracer
 //!     .span_builder("span-name")
 //!     .with_attributes(vec![
-//!         semcov::trace::NET_PEER_NAME.string("example.org"),
-//!         semcov::trace::NET_PEER_PORT.i64(80),
+//!         semcov::trace::NET_PEER_NAME.into().string("example.org"),
+//!         semcov::trace::NET_PEER_PORT.into().i64(80),
 //!     ])
 //!     .start(&tracer);
 //! ```

opentelemetry-semantic-conventions/scripts/templates/semantic_attributes.rs.j2

@@ -6,8 +6,6 @@
 
 {% include 'header_' + conventions + '.rs' %}
 
-use opentelemetry::Key;
-
 {%- for attribute in attributes if attribute.is_local and not attribute.ref %}
 
 /// {% filter escape %}{{attribute.brief | to_doc_brief}}.{% endfilter %}
@@ -28,5 +26,5 @@ use opentelemetry::Key;
 {%- if (attribute.stability | string()) == "StabilityLevel.DEPRECATED"  %}
 #[deprecated]
 {%- endif %}
-pub const {{attribute.fqn | to_const_name}}: Key = Key::from_static_str("{{attribute.fqn}}");
+pub const {{attribute.fqn | to_const_name}}: &str = "{{attribute.fqn}}";
 {%- endfor %}