Skip to content

Commit c9a7cf6

Browse files
committed
entire repo
1 parent d1187df commit c9a7cf6

File tree

12 files changed

+21
-18
lines changed

12 files changed

+21
-18
lines changed

opentelemetry-appender-tracing/benches/logs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
use criterion::{criterion_group, criterion_main, Criterion};
1717
use opentelemetry::InstrumentationScope;
1818
use opentelemetry_appender_tracing::layer as tracing_layer;
19-
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
2019
use opentelemetry_sdk::logs::LogResult;
20+
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
2121
use opentelemetry_sdk::logs::{LogProcessor, LogRecord, LoggerProvider};
2222
use opentelemetry_sdk::Resource;
2323
use pprof::criterion::{Output, PProfProfiler};

opentelemetry-appender-tracing/src/layer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ mod tests {
213213
use opentelemetry::trace::TracerProvider as _;
214214
use opentelemetry::trace::{TraceContextExt, TraceFlags, Tracer};
215215
use opentelemetry::{logs::AnyValue, Key};
216-
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
216+
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
217217
use opentelemetry_sdk::logs::{LogRecord, LogResult, LoggerProvider};
218218
use opentelemetry_sdk::testing::logs::InMemoryLogExporter;
219219
use opentelemetry_sdk::trace::{Sampler, TracerProvider};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::sync::Arc;
22

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

88
use super::OtlpHttpClient;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ use opentelemetry_proto::transform::common::tonic::ResourceAttributesWithSchema;
1313
use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scope;
1414
#[cfg(feature = "trace")]
1515
use opentelemetry_proto::transform::trace::tonic::group_spans_by_resource_and_scope;
16-
#[cfg(feature = "logs")]
17-
use opentelemetry_sdk::export::logs::LogBatch;
1816
#[cfg(feature = "trace")]
1917
use opentelemetry_sdk::export::trace::SpanData;
18+
#[cfg(feature = "logs")]
19+
use opentelemetry_sdk::logs::LogBatch;
2020
use prost::Message;
2121
use std::collections::HashMap;
2222
use std::env;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use opentelemetry::otel_debug;
33
use opentelemetry_proto::tonic::collector::logs::v1::{
44
logs_service_client::LogsServiceClient, ExportLogsServiceRequest,
55
};
6-
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
6+
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
77
use opentelemetry_sdk::logs::{LogError, LogResult};
88
use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
99

opentelemetry-otlp/src/logs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::fmt::Debug;
88

99
use opentelemetry_sdk::logs::LogResult;
1010

11-
use opentelemetry_sdk::export::logs::LogBatch;
11+
use opentelemetry_sdk::logs::LogBatch;
1212

1313
use crate::{HasExportConfig, NoExporterBuilderSet};
1414

@@ -140,7 +140,7 @@ impl LogExporter {
140140
}
141141
}
142142

143-
impl opentelemetry_sdk::export::logs::LogExporter for LogExporter {
143+
impl opentelemetry_sdk::logs::LogExporter for LogExporter {
144144
#[allow(clippy::manual_async_fn)]
145145
fn export(
146146
&self,

opentelemetry-proto/src/transform/logs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub mod tonic {
1212
transform::common::{to_nanos, tonic::ResourceAttributesWithSchema},
1313
};
1414
use opentelemetry::logs::{AnyValue as LogsAnyValue, Severity};
15-
use opentelemetry_sdk::export::logs::LogBatch;
15+
use opentelemetry_sdk::logs::LogBatch;
1616
use std::borrow::Cow;
1717
use std::collections::HashMap;
1818

@@ -222,7 +222,7 @@ mod tests {
222222
use crate::transform::common::tonic::ResourceAttributesWithSchema;
223223
use opentelemetry::logs::LogRecord as _;
224224
use opentelemetry::InstrumentationScope;
225-
use opentelemetry_sdk::{export::logs::LogBatch, logs::LogRecord, Resource};
225+
use opentelemetry_sdk::{logs::LogBatch, logs::LogRecord, Resource};
226226
use std::time::SystemTime;
227227

228228
fn create_test_log_data(

opentelemetry-sdk/CHANGELOG.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,12 @@ hardcoded limit of 2000 and no ability to change it. This feature will be
263263
re-introduced in a future date, along with the ability to change the cardinality
264264
limit.
265265

266-
- Refactor modules.
267-
before: opentelemetry_sdk::export::logs::{ExportResult, LogBatch, LogExporter};
268-
now: opentelemetry_sdk::logs::{ExportResult, LogBatch, LogExporter}
266+
- Refactor modules. This is *Breaking* change, if you author custom
267+
LogExporter,LogProcessor.
268+
before:
269+
`opentelemetry_sdk::export::logs::{ExportResult, LogBatch, LogExporter};`
270+
now:
271+
`opentelemetry_sdk::logs::{ExportResult, LogBatch, LogExporter}`
269272

270273
## 0.27.1
271274

opentelemetry-sdk/src/logs/log_processor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ pub trait LogProcessor: Send + Sync + Debug {
122122
/// ```rust
123123
/// use opentelemetry_sdk::logs::{SimpleLogProcessor, LoggerProvider};
124124
/// use opentelemetry::global;
125-
/// use opentelemetry_sdk::export::logs::LogExporter;
125+
/// use opentelemetry_sdk::logs::LogExporter;
126126
/// use opentelemetry_sdk::testing::logs::InMemoryLogExporter;
127127
///
128128
/// let exporter = InMemoryLogExporter::default(); // Replace with an actual exporter

opentelemetry-stdout/src/logs/exporter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use chrono::{DateTime, Utc};
22
use core::fmt;
3-
use opentelemetry_sdk::export::logs::LogBatch;
3+
use opentelemetry_sdk::logs::LogBatch;
44
use opentelemetry_sdk::logs::LogResult;
55
use opentelemetry_sdk::Resource;
66
use std::sync::atomic;
@@ -29,7 +29,7 @@ impl fmt::Debug for LogExporter {
2929
}
3030
}
3131

32-
impl opentelemetry_sdk::export::logs::LogExporter for LogExporter {
32+
impl opentelemetry_sdk::logs::LogExporter for LogExporter {
3333
/// Export spans to stdout
3434
#[allow(clippy::manual_async_fn)]
3535
fn export(

0 commit comments

Comments
 (0)