Skip to content

Commit 0aaf7e9

Browse files
Copilotlalitb
andcommitted
Fix orphan rule violations in transform logic (WIP)
Co-authored-by: lalitb <[email protected]>
1 parent b71c323 commit 0aaf7e9

File tree

4 files changed

+17
-29
lines changed

4 files changed

+17
-29
lines changed

opentelemetry-otlp/src/exporter/http/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ pub(crate) struct OtlpHttpClient {
263263
_timeout: Duration,
264264
#[allow(dead_code)]
265265
// <allow dead> would be removed once we support set_resource for metrics and traces.
266-
resource: opentelemetry_proto::transform::common::tonic::ResourceAttributesWithSchema,
266+
resource: crate::transform::common::tonic::ResourceAttributesWithSchema,
267267
}
268268

269269
impl OtlpHttpClient {

opentelemetry-otlp/src/transform/logs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ pub mod tonic {
156156
.schema_url()
157157
.map(ToOwned::to_owned)
158158
.unwrap_or_default(),
159-
scope: Some((instrumentation, log_record.target().cloned()).into()),
159+
scope: Some(super::common::tonic::instrumentation_scope_from_scope_ref_and_target(instrumentation, log_record.target().cloned())),
160160
log_records: vec![log_record.into()],
161161
}],
162162
}

opentelemetry-otlp/src/transform/metrics.rs

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,40 +38,28 @@ pub mod tonic {
3838
};
3939
use crate::transform::common::to_nanos;
4040

41-
impl From<u64> for exemplar::Value {
42-
fn from(value: u64) -> Self {
43-
exemplar::Value::AsInt(i64::try_from(value).unwrap_or_default())
44-
}
41+
pub fn exemplar_value_from_u64(value: u64) -> exemplar::Value {
42+
exemplar::Value::AsInt(i64::try_from(value).unwrap_or_default())
4543
}
4644

47-
impl From<i64> for exemplar::Value {
48-
fn from(value: i64) -> Self {
49-
exemplar::Value::AsInt(value)
50-
}
45+
pub fn exemplar_value_from_i64(value: i64) -> exemplar::Value {
46+
exemplar::Value::AsInt(value)
5147
}
5248

53-
impl From<f64> for exemplar::Value {
54-
fn from(value: f64) -> Self {
55-
exemplar::Value::AsDouble(value)
56-
}
49+
pub fn exemplar_value_from_f64(value: f64) -> exemplar::Value {
50+
exemplar::Value::AsDouble(value)
5751
}
5852

59-
impl From<u64> for number_data_point::Value {
60-
fn from(value: u64) -> Self {
61-
number_data_point::Value::AsInt(i64::try_from(value).unwrap_or_default())
62-
}
53+
pub fn number_data_point_value_from_u64(value: u64) -> number_data_point::Value {
54+
number_data_point::Value::AsInt(i64::try_from(value).unwrap_or_default())
6355
}
6456

65-
impl From<i64> for number_data_point::Value {
66-
fn from(value: i64) -> Self {
67-
number_data_point::Value::AsInt(value)
68-
}
57+
pub fn number_data_point_value_from_i64(value: i64) -> number_data_point::Value {
58+
number_data_point::Value::AsInt(value)
6959
}
7060

71-
impl From<f64> for number_data_point::Value {
72-
fn from(value: f64) -> Self {
73-
number_data_point::Value::AsDouble(value)
74-
}
61+
pub fn number_data_point_value_from_f64(value: f64) -> number_data_point::Value {
62+
number_data_point::Value::AsDouble(value)
7563
}
7664

7765
impl From<(&Key, &Value)> for KeyValue {
@@ -139,7 +127,7 @@ pub mod tonic {
139127
impl From<&SdkScopeMetrics> for TonicScopeMetrics {
140128
fn from(sm: &SdkScopeMetrics) -> Self {
141129
TonicScopeMetrics {
142-
scope: Some((sm.scope(), None).into()),
130+
scope: Some(super::common::tonic::instrumentation_scope_from_scope_ref_and_target(sm.scope(), None)),
143131
metrics: sm.metrics().map(Into::into).collect(),
144132
schema_url: sm
145133
.scope()

opentelemetry-otlp/src/transform/trace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ pub mod tonic {
106106
.schema_url()
107107
.map(ToOwned::to_owned)
108108
.unwrap_or_default(),
109-
scope: Some((source_span.instrumentation_scope, None).into()),
109+
scope: Some(super::common::tonic::instrumentation_scope_from_scope_and_target(source_span.instrumentation_scope, None)),
110110
spans: vec![Span {
111111
trace_id: source_span.span_context.trace_id().to_bytes().to_vec(),
112112
span_id: source_span.span_context.span_id().to_bytes().to_vec(),
@@ -169,7 +169,7 @@ pub mod tonic {
169169
let scope_spans = scope_map
170170
.into_iter()
171171
.map(|(instrumentation, span_records)| ScopeSpans {
172-
scope: Some((instrumentation, None).into()),
172+
scope: Some(super::common::tonic::instrumentation_scope_from_scope_ref_and_target(instrumentation, None)),
173173
schema_url: resource.schema_url.clone().unwrap_or_default(),
174174
spans: span_records
175175
.into_iter()

0 commit comments

Comments
 (0)