Skip to content

Commit fa9237b

Browse files
committed
fix build
1 parent 16ffb3e commit fa9237b

File tree

26 files changed

+46
-46
lines changed

26 files changed

+46
-46
lines changed

opentelemetry-appender-tracing/src/layer.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,12 @@ const fn severity_of_level(level: &Level) -> Severity {
210210
mod tests {
211211
use crate::layer;
212212
use async_trait::async_trait;
213-
use opentelemetry::logs::{LogResult, Severity};
213+
use opentelemetry::logs::Severity;
214214
use opentelemetry::trace::TracerProvider as _;
215215
use opentelemetry::trace::{TraceContextExt, TraceFlags, Tracer};
216216
use opentelemetry::{logs::AnyValue, Key};
217217
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
218-
use opentelemetry_sdk::logs::{LogRecord, LoggerProvider};
218+
use opentelemetry_sdk::logs::{LogRecord, LogResult, LoggerProvider};
219219
use opentelemetry_sdk::testing::logs::InMemoryLogExporter;
220220
use opentelemetry_sdk::trace;
221221
use opentelemetry_sdk::trace::{Sampler, TracerProvider};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::sync::Arc;
22

33
use async_trait::async_trait;
44
use http::{header::CONTENT_TYPE, Method};
5-
use opentelemetry::logs::{LogError, LogResult};
65
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
6+
use opentelemetry_sdk::logs::{LogError, LogResult};
77

88
use super::OtlpHttpClient;
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ use std::sync::Arc;
22

33
use async_trait::async_trait;
44
use http::{header::CONTENT_TYPE, Method};
5-
use opentelemetry::metrics::{MetricError, MetricResult};
65
use opentelemetry_sdk::metrics::data::ResourceMetrics;
6+
use opentelemetry_sdk::metrics::{MetricError, MetricResult};
77

88
use crate::{metric::MetricsClient, Error};
99

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

+8-6
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ impl HttpExporterBuilder {
223223

224224
/// Create a log exporter with the current configuration
225225
#[cfg(feature = "logs")]
226-
pub fn build_log_exporter(mut self) -> opentelemetry::logs::LogResult<crate::LogExporter> {
226+
pub fn build_log_exporter(mut self) -> opentelemetry_sdk::logs::LogResult<crate::LogExporter> {
227227
use crate::{
228228
OTEL_EXPORTER_OTLP_LOGS_ENDPOINT, OTEL_EXPORTER_OTLP_LOGS_HEADERS,
229229
OTEL_EXPORTER_OTLP_LOGS_TIMEOUT,
@@ -244,7 +244,7 @@ impl HttpExporterBuilder {
244244
pub fn build_metrics_exporter(
245245
mut self,
246246
temporality: opentelemetry_sdk::metrics::data::Temporality,
247-
) -> opentelemetry::metrics::MetricResult<crate::MetricExporter> {
247+
) -> opentelemetry_sdk::metrics::MetricResult<crate::MetricExporter> {
248248
use crate::{
249249
OTEL_EXPORTER_OTLP_METRICS_ENDPOINT, OTEL_EXPORTER_OTLP_METRICS_HEADERS,
250250
OTEL_EXPORTER_OTLP_METRICS_TIMEOUT,
@@ -315,7 +315,7 @@ impl OtlpHttpClient {
315315
fn build_logs_export_body(
316316
&self,
317317
logs: LogBatch<'_>,
318-
) -> opentelemetry::logs::LogResult<(Vec<u8>, &'static str)> {
318+
) -> opentelemetry_sdk::logs::LogResult<(Vec<u8>, &'static str)> {
319319
use opentelemetry_proto::tonic::collector::logs::v1::ExportLogsServiceRequest;
320320
let resource_logs = group_logs_by_resource_and_scope(logs, &self.resource);
321321
let req = ExportLogsServiceRequest { resource_logs };
@@ -324,7 +324,7 @@ impl OtlpHttpClient {
324324
#[cfg(feature = "http-json")]
325325
Protocol::HttpJson => match serde_json::to_string_pretty(&req) {
326326
Ok(json) => Ok((json.into(), "application/json")),
327-
Err(e) => Err(opentelemetry::logs::LogError::from(e.to_string())),
327+
Err(e) => Err(opentelemetry_sdk::logs::LogError::from(e.to_string())),
328328
},
329329
_ => Ok((req.encode_to_vec(), "application/x-protobuf")),
330330
}
@@ -334,7 +334,7 @@ impl OtlpHttpClient {
334334
fn build_metrics_export_body(
335335
&self,
336336
metrics: &mut opentelemetry_sdk::metrics::data::ResourceMetrics,
337-
) -> opentelemetry::metrics::MetricResult<(Vec<u8>, &'static str)> {
337+
) -> opentelemetry_sdk::metrics::MetricResult<(Vec<u8>, &'static str)> {
338338
use opentelemetry_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
339339

340340
let req: ExportMetricsServiceRequest = (&*metrics).into();
@@ -343,7 +343,9 @@ impl OtlpHttpClient {
343343
#[cfg(feature = "http-json")]
344344
Protocol::HttpJson => match serde_json::to_string_pretty(&req) {
345345
Ok(json) => Ok((json.into(), "application/json")),
346-
Err(e) => Err(opentelemetry::metrics::MetricError::Other(e.to_string())),
346+
Err(e) => Err(opentelemetry_sdk::metrics::MetricError::Other(
347+
e.to_string(),
348+
)),
347349
},
348350
_ => Ok((req.encode_to_vec(), "application/x-protobuf")),
349351
}

opentelemetry-otlp/src/exporter/tonic/logs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use async_trait::async_trait;
22
use core::fmt;
3-
use opentelemetry::logs::{LogError, LogResult};
43
use opentelemetry_proto::tonic::collector::logs::v1::{
54
logs_service_client::LogsServiceClient, ExportLogsServiceRequest,
65
};
76
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
7+
use opentelemetry_sdk::logs::{LogError, LogResult};
88
use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
99

1010
use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scope;

opentelemetry-otlp/src/exporter/tonic/metrics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ use core::fmt;
22
use std::sync::Mutex;
33

44
use async_trait::async_trait;
5-
use opentelemetry::metrics::{MetricError, MetricResult};
65
use opentelemetry_proto::tonic::collector::metrics::v1::{
76
metrics_service_client::MetricsServiceClient, ExportMetricsServiceRequest,
87
};
98
use opentelemetry_sdk::metrics::data::ResourceMetrics;
9+
use opentelemetry_sdk::metrics::{MetricError, MetricResult};
1010
use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
1111

1212
use super::BoxInterceptor;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ impl TonicExporterBuilder {
254254
#[cfg(feature = "logs")]
255255
pub(crate) fn build_log_exporter(
256256
self,
257-
) -> Result<crate::logs::LogExporter, opentelemetry::logs::LogError> {
257+
) -> Result<crate::logs::LogExporter, opentelemetry_sdk::logs::LogError> {
258258
use crate::exporter::tonic::logs::TonicLogsClient;
259259

260260
let (channel, interceptor, compression) = self.build_channel(
@@ -274,7 +274,7 @@ impl TonicExporterBuilder {
274274
pub(crate) fn build_metrics_exporter(
275275
self,
276276
temporality: opentelemetry_sdk::metrics::data::Temporality,
277-
) -> opentelemetry::metrics::MetricResult<crate::MetricExporter> {
277+
) -> opentelemetry_sdk::metrics::MetricResult<crate::MetricExporter> {
278278
use crate::MetricExporter;
279279
use metrics::TonicMetricsClient;
280280

opentelemetry-otlp/src/logs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use async_trait::async_trait;
66
use std::fmt::Debug;
77

8-
use opentelemetry::logs::LogResult;
8+
use opentelemetry_sdk::logs::LogResult;
99

1010
use opentelemetry_sdk::export::logs::LogBatch;
1111

@@ -62,14 +62,14 @@ impl LogExporterBuilder<NoExporterBuilderSet> {
6262

6363
#[cfg(feature = "grpc-tonic")]
6464
impl LogExporterBuilder<TonicExporterBuilderSet> {
65-
pub fn build(self) -> Result<LogExporter, opentelemetry::logs::LogError> {
65+
pub fn build(self) -> Result<LogExporter, opentelemetry_sdk::logs::LogError> {
6666
self.client.0.build_log_exporter()
6767
}
6868
}
6969

7070
#[cfg(any(feature = "http-proto", feature = "http-json"))]
7171
impl LogExporterBuilder<HttpExporterBuilderSet> {
72-
pub fn build(self) -> Result<LogExporter, opentelemetry::logs::LogError> {
72+
pub fn build(self) -> Result<LogExporter, opentelemetry_sdk::logs::LogError> {
7373
self.client.0.build_log_exporter()
7474
}
7575
}

opentelemetry-otlp/src/metric.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use crate::NoExporterBuilderSet;
1616

1717
use async_trait::async_trait;
1818
use core::fmt;
19-
use opentelemetry::metrics::MetricResult;
19+
use opentelemetry_sdk::metrics::MetricResult;
2020

2121
use opentelemetry_sdk::metrics::{
2222
data::{ResourceMetrics, Temporality},

opentelemetry-sdk/benches/log.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@ use std::time::SystemTime;
2020

2121
use criterion::{criterion_group, criterion_main, Criterion};
2222

23-
use opentelemetry::logs::{
24-
AnyValue, LogRecord as _, LogResult, Logger as _, LoggerProvider as _, Severity,
25-
};
23+
use opentelemetry::logs::{AnyValue, LogRecord as _, Logger as _, LoggerProvider as _, Severity};
2624
use opentelemetry::trace::Tracer;
2725
use opentelemetry::trace::TracerProvider as _;
2826
use opentelemetry::{InstrumentationScope, Key};
29-
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, Logger, LoggerProvider};
27+
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, Logger, LoggerProvider};
3028
use opentelemetry_sdk::trace;
3129
use opentelemetry_sdk::trace::{Sampler, TracerProvider};
3230

opentelemetry-sdk/benches/log_exporter.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ use std::time::SystemTime;
1616
use async_trait::async_trait;
1717
use criterion::{criterion_group, criterion_main, Criterion};
1818

19-
use opentelemetry::logs::{LogRecord as _, LogResult, Logger as _, LoggerProvider as _, Severity};
19+
use opentelemetry::logs::{LogRecord as _, Logger as _, LoggerProvider as _, Severity};
20+
use opentelemetry_sdk::logs::LogResult;
2021

2122
use opentelemetry::InstrumentationScope;
2223
use opentelemetry_sdk::export::logs::LogBatch;

opentelemetry-sdk/benches/log_processor.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ use std::{
1919

2020
use criterion::{criterion_group, criterion_main, Criterion};
2121
use opentelemetry::{
22-
logs::{LogRecord as _, LogResult, Logger as _, LoggerProvider as _, Severity},
22+
logs::{LogRecord as _, Logger as _, LoggerProvider as _, Severity},
2323
InstrumentationScope,
2424
};
25-
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, Logger, LoggerProvider};
25+
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LogResult, Logger, LoggerProvider};
2626

2727
// Run this benchmark with:
2828
// cargo bench --bench log_processor

opentelemetry-sdk/benches/metric.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ use std::sync::{Arc, Weak};
33

44
use criterion::{criterion_group, criterion_main, Bencher, Criterion};
55
use opentelemetry::{
6-
metrics::{Counter, Histogram, MeterProvider as _, MetricResult},
6+
metrics::{Counter, Histogram, MeterProvider as _},
77
Key, KeyValue,
88
};
99
use opentelemetry_sdk::{
1010
metrics::{
1111
data::{ResourceMetrics, Temporality},
1212
new_view,
1313
reader::MetricReader,
14-
Aggregation, Instrument, InstrumentKind, ManualReader, Pipeline, SdkMeterProvider, Stream,
15-
View,
14+
Aggregation, Instrument, InstrumentKind, ManualReader, MetricResult, Pipeline,
15+
SdkMeterProvider, Stream, View,
1616
},
1717
Resource,
1818
};

opentelemetry-sdk/src/error.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//! Wrapper for error from trace, logs and metrics part of open telemetry.
12
use std::sync::PoisonError;
23

34
#[cfg(feature = "logs")]

opentelemetry-sdk/src/logs/log_processor.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,7 @@ mod tests {
530530
};
531531
use crate::export::logs::{LogBatch, LogExporter};
532532
use crate::logs::LogRecord;
533+
use crate::logs::LogResult;
533534
use crate::testing::logs::InMemoryLogExporterBuilder;
534535
use crate::{
535536
logs::{
@@ -547,7 +548,7 @@ mod tests {
547548
use opentelemetry::logs::AnyValue;
548549
use opentelemetry::logs::LogRecord as _;
549550
use opentelemetry::logs::{Logger, LoggerProvider as _};
550-
use opentelemetry::{logs::LogResult, KeyValue};
551+
use opentelemetry::KeyValue;
551552
use opentelemetry::{InstrumentationScope, Key};
552553
use std::sync::atomic::{AtomicUsize, Ordering};
553554
use std::sync::{Arc, Mutex};

opentelemetry-sdk/src/metrics/aggregation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ mod tests {
153153
internal::{EXPO_MAX_SCALE, EXPO_MIN_SCALE},
154154
Aggregation,
155155
};
156-
use opentelemetry::metrics::{MetricError, MetricResult};
156+
use crate::metrics::{MetricError, MetricResult};
157157

158158
#[test]
159159
fn validate_aggregation() {

opentelemetry-sdk/src/metrics/meter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ where
634634
mod tests {
635635
use std::borrow::Cow;
636636

637-
use opentelemetry::metrics::MetricError;
637+
use crate::metrics::MetricError;
638638

639639
use super::{
640640
validate_instrument_name, validate_instrument_unit, INSTRUMENT_NAME_FIRST_ALPHABETIC,

opentelemetry-sdk/src/metrics/periodic_reader.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,12 @@ impl MetricReader for PeriodicReader {
386386
#[cfg(all(test, feature = "testing"))]
387387
mod tests {
388388
use super::PeriodicReader;
389+
use crate::metrics::MetricError;
389390
use crate::{
390391
metrics::data::ResourceMetrics, metrics::reader::MetricReader, metrics::SdkMeterProvider,
391392
runtime, testing::metrics::InMemoryMetricExporter, Resource,
392393
};
393-
use opentelemetry::metrics::{MeterProvider, MetricError};
394+
use opentelemetry::metrics::MeterProvider;
394395
use std::sync::mpsc;
395396

396397
#[test]

opentelemetry-sdk/src/testing/logs/in_memory_exporter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::export::logs::{LogBatch, LogExporter};
22
use crate::logs::LogRecord;
3+
use crate::logs::{LogError, LogResult};
34
use crate::Resource;
45
use async_trait::async_trait;
5-
use opentelemetry::logs::{LogError, LogResult};
66
use opentelemetry::InstrumentationScope;
77
use std::borrow::Cow;
88
use std::sync::{Arc, Mutex};

opentelemetry-sdk/src/testing/metrics/in_memory_exporter.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::metrics::data;
22
use crate::metrics::data::{Histogram, Metric, ResourceMetrics, ScopeMetrics, Temporality};
33
use crate::metrics::exporter::PushMetricExporter;
4+
use crate::metrics::MetricError;
5+
use crate::metrics::MetricResult;
46
use async_trait::async_trait;
5-
use opentelemetry::metrics::MetricError;
6-
use opentelemetry::metrics::MetricResult;
77
use std::collections::VecDeque;
88
use std::fmt;
99
use std::sync::{Arc, Mutex};

opentelemetry-sdk/src/testing/metrics/metric_reader.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use std::sync::{Arc, Mutex, Weak};
22

3+
use crate::metrics::MetricResult;
34
use crate::metrics::{
45
data::{ResourceMetrics, Temporality},
56
pipeline::Pipeline,
67
reader::MetricReader,
78
InstrumentKind,
89
};
9-
use opentelemetry::metrics::MetricResult;
1010

1111
#[derive(Debug, Clone)]
1212
pub struct TestMetricReader {

opentelemetry-sdk/src/testing/trace/span_exporters.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
use crate::{
2-
export::{
3-
trace::{ExportResult, SpanData, SpanExporter},
4-
ExportError,
5-
},
2+
export::trace::{ExportResult, SpanData, SpanExporter},
63
trace::{SpanEvents, SpanLinks},
74
};
85
use futures_util::future::BoxFuture;
@@ -80,7 +77,7 @@ pub struct TestExportError(String);
8077

8178
impl std::error::Error for TestExportError {}
8279

83-
impl ExportError for TestExportError {
80+
impl opentelemetry::trace::ExportError for TestExportError {
8481
fn exporter_name(&self) -> &'static str {
8582
"test"
8683
}

opentelemetry-stdout/src/logs/exporter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use async_trait::async_trait;
22
use chrono::{DateTime, Utc};
33
use core::fmt;
4-
use opentelemetry::logs::LogResult;
54
use opentelemetry_sdk::export::logs::LogBatch;
5+
use opentelemetry_sdk::logs::LogResult;
66
use opentelemetry_sdk::Resource;
77
use std::sync::atomic;
88

opentelemetry-stdout/src/metrics/exporter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use async_trait::async_trait;
22
use chrono::{DateTime, Utc};
33
use core::{f64, fmt};
4-
use opentelemetry::metrics::{MetricError, MetricResult};
54
use opentelemetry_sdk::metrics::{
65
data::{self, ScopeMetrics, Temporality},
76
exporter::PushMetricExporter,
87
};
8+
use opentelemetry_sdk::metrics::{MetricError, MetricResult};
99
use std::fmt::Debug;
1010
use std::sync::atomic;
1111

opentelemetry/src/global/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ mod metrics;
137137
mod propagation;
138138
#[cfg(feature = "trace")]
139139
mod trace;
140-
pub use error_handler::Error;
141140

142141
#[cfg(feature = "metrics")]
143142
#[cfg_attr(docsrs, doc(cfg(feature = "metrics")))]

stress/src/logs.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ impl LogProcessor for NoOpLogProcessor {
2828
) {
2929
}
3030

31-
fn force_flush(&self) -> opentelemetry::logs::LogResult<()> {
31+
fn force_flush(&self) -> opentelemetry_sdk::logs::LogResult<()> {
3232
Ok(())
3333
}
3434

35-
fn shutdown(&self) -> opentelemetry::logs::LogResult<()> {
35+
fn shutdown(&self) -> opentelemetry_sdk::logs::LogResult<()> {
3636
Ok(())
3737
}
3838
}

0 commit comments

Comments
 (0)