16
16
/// use opentelemetry::otel_info;
17
17
/// otel_info!(name: "sdk_start", version = "1.0.0", schema_url = "http://example.com");
18
18
/// ```
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
+
19
24
#[ macro_export]
20
25
macro_rules! otel_info {
21
26
( name: $name: expr $( , ) ?) => {
22
27
#[ cfg( feature = "internal-logs" ) ]
23
28
{
24
- tracing:: info!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
29
+ tracing:: info!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
25
30
}
26
31
#[ cfg( not( feature = "internal-logs" ) ) ]
27
32
{
@@ -31,7 +36,7 @@ macro_rules! otel_info {
31
36
( name: $name: expr, $( $key: ident = $value: expr) ,+ $( , ) ?) => {
32
37
#[ cfg( feature = "internal-logs" ) ]
33
38
{
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) ,+, "" ) ;
35
40
}
36
41
#[ cfg( not( feature = "internal-logs" ) ) ]
37
42
{
@@ -56,7 +61,7 @@ macro_rules! otel_warn {
56
61
( name: $name: expr $( , ) ?) => {
57
62
#[ cfg( feature = "internal-logs" ) ]
58
63
{
59
- tracing:: warn!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
64
+ tracing:: warn!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
60
65
}
61
66
#[ cfg( not( feature = "internal-logs" ) ) ]
62
67
{
@@ -68,6 +73,7 @@ macro_rules! otel_warn {
68
73
{
69
74
tracing:: warn!( name: $name,
70
75
target: env!( "CARGO_PKG_NAME" ) ,
76
+ name = $name,
71
77
$( $key = {
72
78
$value
73
79
} ) ,+,
@@ -97,7 +103,7 @@ macro_rules! otel_debug {
97
103
( name: $name: expr $( , ) ?) => {
98
104
#[ cfg( feature = "internal-logs" ) ]
99
105
{
100
- tracing:: debug!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
106
+ tracing:: debug!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
101
107
}
102
108
#[ cfg( not( feature = "internal-logs" ) ) ]
103
109
{
@@ -107,7 +113,7 @@ macro_rules! otel_debug {
107
113
( name: $name: expr, $( $key: ident = $value: expr) ,+ $( , ) ?) => {
108
114
#[ cfg( feature = "internal-logs" ) ]
109
115
{
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) ,+, "" ) ;
111
117
}
112
118
#[ cfg( not( feature = "internal-logs" ) ) ]
113
119
{
@@ -132,7 +138,7 @@ macro_rules! otel_error {
132
138
( name: $name: expr $( , ) ?) => {
133
139
#[ cfg( feature = "internal-logs" ) ]
134
140
{
135
- tracing:: error!( name: $name, target: env!( "CARGO_PKG_NAME" ) , "" ) ;
141
+ tracing:: error!( name: $name, target: env!( "CARGO_PKG_NAME" ) , name = $name , "" ) ;
136
142
}
137
143
#[ cfg( not( feature = "internal-logs" ) ) ]
138
144
{
@@ -144,6 +150,7 @@ macro_rules! otel_error {
144
150
{
145
151
tracing:: error!( name: $name,
146
152
target: env!( "CARGO_PKG_NAME" ) ,
153
+ name = $name,
147
154
$( $key = {
148
155
$value
149
156
} ) ,+,
0 commit comments