From 815e3874a28f132415e7eead92385ff72ef2c9a2 Mon Sep 17 00:00:00 2001 From: Yuta Yamaguchi Date: Tue, 26 Mar 2024 01:27:25 +0900 Subject: [PATCH] Use semantic conventions in examples (#1639) Co-authored-by: Cijo Thomas --- examples/logs-basic/Cargo.toml | 1 + examples/logs-basic/src/main.rs | 3 ++- examples/tracing-jaeger/Cargo.toml | 1 + examples/tracing-jaeger/src/main.rs | 4 +++- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/examples/logs-basic/Cargo.toml b/examples/logs-basic/Cargo.toml index 58f64e08ab..ae30dc6779 100644 --- a/examples/logs-basic/Cargo.toml +++ b/examples/logs-basic/Cargo.toml @@ -10,5 +10,6 @@ opentelemetry = { path = "../../opentelemetry", features = ["logs"] } opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["logs"] } opentelemetry-stdout = { path = "../../opentelemetry-stdout", features = ["logs"]} opentelemetry-appender-log = { path = "../../opentelemetry-appender-log", default-features = false} +opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" } log = { workspace = true } serde_json = { workspace = true } diff --git a/examples/logs-basic/src/main.rs b/examples/logs-basic/src/main.rs index 3f22cb94e0..b19928b1e2 100644 --- a/examples/logs-basic/src/main.rs +++ b/examples/logs-basic/src/main.rs @@ -3,6 +3,7 @@ use opentelemetry::KeyValue; use opentelemetry_appender_log::OpenTelemetryLogBridge; use opentelemetry_sdk::logs::{Config, LoggerProvider}; use opentelemetry_sdk::Resource; +use opentelemetry_semantic_conventions::resource::SERVICE_NAME; fn main() { // Setup LoggerProvider with a stdout exporter @@ -14,7 +15,7 @@ fn main() { let logger_provider = LoggerProvider::builder() .with_config( Config::default().with_resource(Resource::new(vec![KeyValue::new( - "service.name", + SERVICE_NAME, "logs-basic-example", )])), ) diff --git a/examples/tracing-jaeger/Cargo.toml b/examples/tracing-jaeger/Cargo.toml index 6257f0ebf0..809365c66b 100644 --- a/examples/tracing-jaeger/Cargo.toml +++ b/examples/tracing-jaeger/Cargo.toml @@ -9,4 +9,5 @@ publish = false opentelemetry = { path = "../../opentelemetry" } opentelemetry_sdk = { path = "../../opentelemetry-sdk", features = ["rt-tokio"] } opentelemetry-otlp = { path = "../../opentelemetry-otlp", features = ["tonic"] } +opentelemetry-semantic-conventions = { path = "../../opentelemetry-semantic-conventions" } tokio = { workspace = true, features = ["full"] } diff --git a/examples/tracing-jaeger/src/main.rs b/examples/tracing-jaeger/src/main.rs index e80f028390..9a76fca48f 100644 --- a/examples/tracing-jaeger/src/main.rs +++ b/examples/tracing-jaeger/src/main.rs @@ -6,6 +6,8 @@ use opentelemetry::{ }; use opentelemetry_otlp::WithExportConfig; use opentelemetry_sdk::{runtime, trace as sdktrace, Resource}; +use opentelemetry_semantic_conventions::resource::SERVICE_NAME; + use std::error::Error; fn init_tracer() -> Result { @@ -18,7 +20,7 @@ fn init_tracer() -> Result { ) .with_trace_config( sdktrace::config().with_resource(Resource::new(vec![KeyValue::new( - "service.name", + SERVICE_NAME, "tracing-jaeger", )])), )