1616/// use opentelemetry::otel_info;
1717/// otel_info!(name: "sdk_start", version = "1.0.0", schema_url = "http://example.com");
1818/// ```
19+ ///
20+
21+ // TODO: Remove `name` attribute duplication in logging macros below once `tracing::Fmt` supports displaying `name`.
22+ // See issue: https://github.com/tokio-rs/tracing/issues/2774
23+
1924#[ macro_export]
2025macro_rules! otel_info {
2126 ( name: $name: expr $( , ) ?) => {
2227 #[ cfg( feature = "internal-logs" ) ]
2328 {
24- tracing:: info!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
29+ tracing:: info!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
2530 }
2631 #[ cfg( not( feature = "internal-logs" ) ) ]
2732 {
@@ -31,7 +36,7 @@ macro_rules! otel_info {
3136 ( name: $name: expr, $( $key: ident = $value: expr) ,+ $( , ) ?) => {
3237 #[ cfg( feature = "internal-logs" ) ]
3338 {
34- tracing:: info!( name: $name, target: env!( "CARGO_PKG_NAME" ) , $( $key = $value) ,+, "" ) ;
39+ tracing:: info!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , $( $key = $value) ,+, "" ) ;
3540 }
3641 #[ cfg( not( feature = "internal-logs" ) ) ]
3742 {
@@ -56,7 +61,7 @@ macro_rules! otel_warn {
5661 ( name: $name: expr $( , ) ?) => {
5762 #[ cfg( feature = "internal-logs" ) ]
5863 {
59- tracing:: warn!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
64+ tracing:: warn!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
6065 }
6166 #[ cfg( not( feature = "internal-logs" ) ) ]
6267 {
@@ -68,6 +73,7 @@ macro_rules! otel_warn {
6873 {
6974 tracing:: warn!( name: $name,
7075 target: env!( "CARGO_PKG_NAME" ) ,
76+ name = $name,
7177 $( $key = {
7278 $value
7379 } ) ,+,
@@ -97,7 +103,7 @@ macro_rules! otel_debug {
97103 ( name: $name: expr $( , ) ?) => {
98104 #[ cfg( feature = "internal-logs" ) ]
99105 {
100- tracing:: debug!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
106+ tracing:: debug!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
101107 }
102108 #[ cfg( not( feature = "internal-logs" ) ) ]
103109 {
@@ -107,7 +113,7 @@ macro_rules! otel_debug {
107113 ( name: $name: expr, $( $key: ident = $value: expr) ,+ $( , ) ?) => {
108114 #[ cfg( feature = "internal-logs" ) ]
109115 {
110- tracing:: debug!( name: $name, target: env!( "CARGO_PKG_NAME" ) , $( $key = $value) ,+, "" ) ;
116+ tracing:: debug!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , $( $key = $value) ,+, "" ) ;
111117 }
112118 #[ cfg( not( feature = "internal-logs" ) ) ]
113119 {
@@ -132,7 +138,7 @@ macro_rules! otel_error {
132138 ( name: $name: expr $( , ) ?) => {
133139 #[ cfg( feature = "internal-logs" ) ]
134140 {
135- tracing:: error!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
141+ tracing:: error!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
136142 }
137143 #[ cfg( not( feature = "internal-logs" ) ) ]
138144 {
@@ -144,6 +150,7 @@ macro_rules! otel_error {
144150 {
145151 tracing:: error!( name: $name,
146152 target: env!( "CARGO_PKG_NAME" ) ,
153+ name = $name,
147154 $( $key = {
148155 $value
149156 } ) ,+,
0 commit comments