Skip to content

Commit a5a8409

Browse files
lalitblalitb
authored
Merge branch 'main' into move-errors-to-sdk
2 parents e9c4d51 + ac0ea9f commit a5a8409

File tree

26 files changed

+324
-546
lines changed

26 files changed

+324
-546
lines changed

‎opentelemetry-appender-tracing/src/layer.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ mod tests {
334334
.expect("Atleast one log is expected to be present.");
335335

336336
// Validate common fields
337-
assert_eq!(log.instrumentation.name, "opentelemetry-appender-tracing");
337+
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
338338
assert_eq!(log.record.severity_number, Some(Severity::Error));
339339

340340
// Validate trace context is none.
@@ -428,7 +428,7 @@ mod tests {
428428
.expect("Atleast one log is expected to be present.");
429429

430430
// validate common fields.
431-
assert_eq!(log.instrumentation.name, "opentelemetry-appender-tracing");
431+
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
432432
assert_eq!(log.record.severity_number, Some(Severity::Error));
433433

434434
// validate trace context.
@@ -526,7 +526,7 @@ mod tests {
526526
.expect("Atleast one log is expected to be present.");
527527

528528
// Validate common fields
529-
assert_eq!(log.instrumentation.name, "opentelemetry-appender-tracing");
529+
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
530530
assert_eq!(log.record.severity_number, Some(Severity::Error));
531531

532532
// Validate trace context is none.
@@ -605,7 +605,7 @@ mod tests {
605605
.expect("Atleast one log is expected to be present.");
606606

607607
// validate common fields.
608-
assert_eq!(log.instrumentation.name, "opentelemetry-appender-tracing");
608+
assert_eq!(log.instrumentation.name(), "opentelemetry-appender-tracing");
609609
assert_eq!(log.record.severity_number, Some(Severity::Error));
610610

611611
// validate trace context.

‎opentelemetry-otlp/tests/integration_test/tests/logs.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,15 @@ use integration_test_runner::logs_asserter::{read_logs_from_json, LogsAsserter};
44
use log::{info, Level};
55
use opentelemetry::KeyValue;
66
use opentelemetry_appender_log::OpenTelemetryLogBridge;
7-
use opentelemetry_otlp::{LogExporter, WithExportConfig};
8-
use opentelemetry_sdk::logs::LogError;
7+
use opentelemetry_otlp::LogExporter;
98
use opentelemetry_sdk::logs::LoggerProvider;
109
use opentelemetry_sdk::{logs as sdklogs, runtime, Resource};
1110
use std::error::Error;
1211
use std::fs::File;
1312
use std::os::unix::fs::MetadataExt;
1413

1514
fn init_logs() -> Result<sdklogs::LoggerProvider, LogError> {
16-
let exporter = LogExporter::builder()
17-
.with_tonic()
18-
.with_endpoint("0.0.0.0:4317")
19-
.build()?;
15+
let exporter = LogExporter::builder().with_tonic().build()?;
2016

2117
Ok(LoggerProvider::builder()
2218
.with_batch_exporter(exporter, runtime::Tokio)

‎opentelemetry-proto/src/transform/common.rs‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ pub mod tonic {
6464
}
6565
} else {
6666
InstrumentationScope {
67-
name: library.name.into_owned(),
68-
version: library.version.map(Cow::into_owned).unwrap_or_default(),
69-
attributes: Attributes::from(library.attributes).0,
67+
name: library.name().to_owned(),
68+
version: library.version().map(ToOwned::to_owned).unwrap_or_default(),
69+
attributes: Attributes::from(library.attributes().cloned()).0,
7070
..Default::default()
7171
}
7272
}
@@ -95,13 +95,9 @@ pub mod tonic {
9595
}
9696
} else {
9797
InstrumentationScope {
98-
name: library.name.to_string(),
99-
version: library
100-
.version
101-
.as_ref()
102-
.map(ToString::to_string)
103-
.unwrap_or_default(),
104-
attributes: Attributes::from(library.attributes.clone()).0,
98+
name: library.name().to_owned(),
99+
version: library.version().map(ToOwned::to_owned).unwrap_or_default(),
100+
attributes: Attributes::from(library.attributes().cloned()).0,
105101
..Default::default()
106102
}
107103
}
@@ -112,8 +108,8 @@ pub mod tonic {
112108
#[derive(Default, Debug)]
113109
pub struct Attributes(pub ::std::vec::Vec<crate::proto::tonic::common::v1::KeyValue>);
114110

115-
impl From<Vec<opentelemetry::KeyValue>> for Attributes {
116-
fn from(kvs: Vec<opentelemetry::KeyValue>) -> Self {
111+
impl<I: IntoIterator<Item = opentelemetry::KeyValue>> From<I> for Attributes {
112+
fn from(kvs: I) -> Self {
117113
Attributes(
118114
kvs.into_iter()
119115
.map(|api_kv| KeyValue {

‎opentelemetry-proto/src/transform/logs.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,8 @@ pub mod tonic {
167167
schema_url: resource.schema_url.clone().unwrap_or_default(),
168168
scope_logs: vec![ScopeLogs {
169169
schema_url: instrumentation
170-
.schema_url
171-
.clone()
172-
.map(Into::into)
170+
.schema_url()
171+
.map(ToOwned::to_owned)
173172
.unwrap_or_default(),
174173
scope: Some((instrumentation, log_record.target.clone()).into()),
175174
log_records: vec![log_record.into()],
@@ -196,7 +195,7 @@ pub mod tonic {
196195
let key = log_record
197196
.target
198197
.clone()
199-
.unwrap_or_else(|| Cow::Owned(instrumentation.name.clone().into_owned()));
198+
.unwrap_or_else(|| Cow::Owned(instrumentation.name().to_owned()));
200199
scope_map
201200
.entry(key)
202201
.or_default()

‎opentelemetry-proto/src/transform/metrics.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,8 @@ pub mod tonic {
137137
metrics: sm.metrics.iter().map(Into::into).collect(),
138138
schema_url: sm
139139
.scope
140-
.schema_url
141-
.as_ref()
142-
.map(ToString::to_string)
140+
.schema_url()
141+
.map(ToOwned::to_owned)
143142
.unwrap_or_default(),
144143
}
145144
}

‎opentelemetry-proto/src/transform/trace.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,8 @@ pub mod tonic {
102102
scope_spans: vec![ScopeSpans {
103103
schema_url: source_span
104104
.instrumentation_scope
105-
.schema_url
106-
.as_ref()
107-
.map(ToString::to_string)
105+
.schema_url()
106+
.map(ToOwned::to_owned)
108107
.unwrap_or_default(),
109108
scope: Some((source_span.instrumentation_scope, None).into()),
110109
spans: vec![Span {

‎opentelemetry-sdk/src/logs/log_emitter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ impl opentelemetry::logs::Logger for Logger {
292292
|| processor.event_enabled(
293293
level,
294294
target,
295-
self.instrumentation_scope().name.as_ref(),
295+
self.instrumentation_scope().name().as_ref(),
296296
);
297297
}
298298
enabled

‎opentelemetry-sdk/src/logs/mod.rs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ mod tests {
8989
let log = exported_logs
9090
.first()
9191
.expect("Atleast one log is expected to be present.");
92-
assert_eq!(log.instrumentation.name, "test-logger");
92+
assert_eq!(log.instrumentation.name(), "test-logger");
9393
assert_eq!(log.record.severity_number, Some(Severity::Error));
9494
assert_eq!(log.record.attributes_len(), 10);
9595
for i in 1..=10 {
@@ -113,14 +113,13 @@ mod tests {
113113

114114
let logger = provider.logger_with_scope(scope);
115115
let instrumentation_scope = logger.instrumentation_scope();
116-
let attributes = &instrumentation_scope.attributes;
117-
assert_eq!(instrumentation_scope.name, "test_logger");
116+
assert_eq!(instrumentation_scope.name(), "test_logger");
118117
assert_eq!(
119-
instrumentation_scope.schema_url,
120-
Some("https://opentelemetry.io/schema/1.0.0".into())
118+
instrumentation_scope.schema_url(),
119+
Some("https://opentelemetry.io/schema/1.0.0")
121120
);
122-
assert_eq!(attributes.len(), 1);
123-
assert_eq!(attributes[0].key, "test_k".into());
124-
assert_eq!(attributes[0].value, "test_v".into());
121+
assert!(instrumentation_scope
122+
.attributes()
123+
.eq(&[KeyValue::new("test_k", "test_v")]));
125124
}
126125
}

‎opentelemetry-sdk/src/metrics/instrument.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,11 @@ impl Instrument {
160160
}
161161

162162
pub(crate) fn matches_scope(&self, other: &Instrument) -> bool {
163-
(self.scope.name.is_empty() || self.scope.name.as_ref() == other.scope.name.as_ref())
164-
&& (self.scope.version.is_none()
165-
|| self.scope.version.as_ref().map(AsRef::as_ref)
166-
== other.scope.version.as_ref().map(AsRef::as_ref))
167-
&& (self.scope.schema_url.is_none()
168-
|| self.scope.schema_url.as_ref().map(AsRef::as_ref)
169-
== other.scope.schema_url.as_ref().map(AsRef::as_ref))
163+
(self.scope.name().is_empty() || self.scope.name() == other.scope.name())
164+
&& (self.scope.version().is_none()
165+
|| self.scope.version().as_ref() == other.scope.version().as_ref())
166+
&& (self.scope.schema_url().is_none()
167+
|| self.scope.schema_url().as_ref() == other.scope.schema_url().as_ref())
170168
}
171169
}
172170

0 commit comments

Comments
 (0)