Skip to content

Commit f7c56c2

Browse files
committed
make attributes_contains crate private
1 parent 93aab1e commit f7c56c2

File tree

2 files changed

+49
-24
lines changed

2 files changed

+49
-24
lines changed

opentelemetry-appender-tracing/src/layer.rs

+47-23
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,19 @@ mod tests {
208208
use opentelemetry::trace::TracerProvider as _;
209209
use opentelemetry::trace::{TraceContextExt, TraceFlags, Tracer};
210210
use opentelemetry::{logs::AnyValue, Key};
211-
use opentelemetry_sdk::logs::LoggerProvider;
211+
use opentelemetry_sdk::logs::{LogRecord, LoggerProvider};
212212
use opentelemetry_sdk::testing::logs::InMemoryLogsExporter;
213213
use opentelemetry_sdk::trace;
214214
use opentelemetry_sdk::trace::{Sampler, TracerProvider};
215215
use tracing::error;
216216
use tracing_subscriber::layer::SubscriberExt;
217217

218+
pub fn attributes_contains(log_record: &LogRecord, key: &Key, value: &AnyValue) -> bool {
219+
log_record
220+
.attributes_iter()
221+
.any(|(k, v)| k == key && v == value)
222+
}
223+
218224
// cargo test --features=testing
219225
#[test]
220226
fn tracing_appender_standalone() {
@@ -256,23 +262,30 @@ mod tests {
256262
assert_eq!(log.record.attributes_len(), 3);
257263
#[cfg(feature = "experimental_metadata_attributes")]
258264
assert_eq!(log.record.attributes_len(), 8);
259-
assert!(log
260-
.record
261-
.attributes_contains(&Key::new("event_id"), &AnyValue::Int(20)));
262-
assert!(log
263-
.record
264-
.attributes_contains(&Key::new("user_name"), &AnyValue::String("otel".into())));
265-
assert!(log.record.attributes_contains(
265+
assert!(attributes_contains(
266+
&log.record,
267+
&Key::new("event_id"),
268+
&AnyValue::Int(20)
269+
));
270+
assert!(attributes_contains(
271+
&log.record,
272+
&Key::new("user_name"),
273+
&AnyValue::String("otel".into())
274+
));
275+
assert!(attributes_contains(
276+
&log.record,
266277
&Key::new("user_email"),
267278
&AnyValue::String("otel@opentelemetry.io".into())
268279
));
269280
#[cfg(feature = "experimental_metadata_attributes")]
270281
{
271-
assert!(log.record.attributes_contains(
282+
assert!(attributes_contains(
283+
&log.record,
272284
&Key::new("code.filename"),
273285
&AnyValue::String("layer.rs".into())
274286
));
275-
assert!(log.record.attributes_contains(
287+
assert!(attributes_contains(
288+
&log.record,
276289
&Key::new("code.namespace"),
277290
&AnyValue::String("opentelemetry_appender_tracing::layer::tests".into())
278291
));
@@ -361,23 +374,30 @@ mod tests {
361374
assert_eq!(log.record.attributes_len(), 3);
362375
#[cfg(feature = "experimental_metadata_attributes")]
363376
assert_eq!(log.record.attributes_len(), 8);
364-
assert!(log
365-
.record
366-
.attributes_contains(&Key::new("event_id"), &AnyValue::Int(20.into())));
367-
assert!(log
368-
.record
369-
.attributes_contains(&Key::new("user_name"), &AnyValue::String("otel".into())));
370-
assert!(log.record.attributes_contains(
377+
assert!(attributes_contains(
378+
&log.record,
379+
&Key::new("event_id"),
380+
&AnyValue::Int(20.into())
381+
));
382+
assert!(attributes_contains(
383+
&log.record,
384+
&Key::new("user_name"),
385+
&AnyValue::String("otel".into())
386+
));
387+
assert!(attributes_contains(
388+
&log.record,
371389
&Key::new("user_email"),
372390
&AnyValue::String("otel@opentelemetry.io".into())
373391
));
374392
#[cfg(feature = "experimental_metadata_attributes")]
375393
{
376-
assert!(log.record.attributes_contains(
394+
assert!(attributes_contains(
395+
&log.record,
377396
&Key::new("code.filename"),
378397
&AnyValue::String("layer.rs".into())
379398
));
380-
assert!(log.record.attributes_contains(
399+
assert!(attributes_contains(
400+
&log.record,
381401
&Key::new("code.namespace"),
382402
&AnyValue::String("opentelemetry_appender_tracing::layer::tests".into())
383403
));
@@ -437,11 +457,13 @@ mod tests {
437457

438458
#[cfg(feature = "experimental_metadata_attributes")]
439459
{
440-
assert!(log.record.attributes_contains(
460+
assert!(attributes_contains(
461+
&log.record,
441462
&Key::new("code.filename"),
442463
&AnyValue::String("layer.rs".into())
443464
));
444-
assert!(log.record.attributes_contains(
465+
assert!(attributes_contains(
466+
&log.record,
445467
&Key::new("code.namespace"),
446468
&AnyValue::String("opentelemetry_appender_tracing::layer::tests".into())
447469
));
@@ -532,11 +554,13 @@ mod tests {
532554

533555
#[cfg(feature = "experimental_metadata_attributes")]
534556
{
535-
assert!(log.record.attributes_contains(
557+
assert!(attributes_contains(
558+
&log.record,
536559
&Key::new("code.filename"),
537560
&AnyValue::String("layer.rs".into())
538561
));
539-
assert!(log.record.attributes_contains(
562+
assert!(attributes_contains(
563+
&log.record,
540564
&Key::new("code.namespace"),
541565
&AnyValue::String("opentelemetry_appender_tracing::layer::tests".into())
542566
));

opentelemetry-sdk/src/logs/record.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,9 @@ impl LogRecord {
110110
self.attributes.as_ref().map_or(0, |attrs| attrs.len())
111111
}
112112

113+
#[allow(dead_code)]
113114
/// Returns true if the `LogRecord` contains the specified attribute.
114-
pub fn attributes_contains(&self, key: &Key, value: &AnyValue) -> bool {
115+
pub(crate) fn attributes_contains(&self, key: &Key, value: &AnyValue) -> bool {
115116
self.attributes.as_ref().map_or(false, |attrs| {
116117
attrs.iter().any(|(k, v)| k == key && v == value)
117118
})

0 commit comments

Comments
 (0)