Skip to content

Commit f5b733f

Browse files
cijothomascijothomas
authored
Merge branch 'main' into trace-jaeger-remote-sampler-internal-log
2 parents c2e6b8d + 1b2d841 commit f5b733f

File tree

10 files changed

+59
-59
lines changed

10 files changed

+59
-59
lines changed

‎examples/self-diagnostics/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ cargo run
6565

6666
- If the docker instance for collector is running, below error should be logged into the container. There won't be any logs from the `hyper`, `reqwest` and `tonic` crates.
6767
```
68-
otel-collector-1 | 2024-06-05T17:09:46.926Z info LogsExporter {"kind": "exporter", "data_type": "logs", "name": "logging", "resource logs": 1, "log records": 1}
68+
otel-collector-1 | 2024-06-05T17:09:46.926Z info LogExporter {"kind": "exporter", "data_type": "logs", "name": "logging", "resource logs": 1, "log records": 1}
6969
otel-collector-1 | 2024-06-05T17:09:46.926Z info ResourceLog #0
7070
otel-collector-1 | Resource SchemaURL:
7171
otel-collector-1 | Resource attributes:

‎opentelemetry-appender-log/src/lib.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -753,13 +753,13 @@ mod tests {
753753
use super::OpenTelemetryLogBridge;
754754

755755
use opentelemetry::{logs::AnyValue, StringValue};
756-
use opentelemetry_sdk::{logs::LoggerProvider, testing::logs::InMemoryLogsExporter};
756+
use opentelemetry_sdk::{logs::LoggerProvider, testing::logs::InMemoryLogExporter};
757757

758758
use log::Log;
759759

760760
#[test]
761761
fn logbridge_with_default_metadata_is_enabled() {
762-
let exporter = InMemoryLogsExporter::default();
762+
let exporter = InMemoryLogExporter::default();
763763

764764
let logger_provider = LoggerProvider::builder()
765765
.with_simple_exporter(exporter)
@@ -778,7 +778,7 @@ mod tests {
778778

779779
#[test]
780780
fn logbridge_with_record_can_log() {
781-
let exporter = InMemoryLogsExporter::default();
781+
let exporter = InMemoryLogExporter::default();
782782

783783
let logger_provider = LoggerProvider::builder()
784784
.with_simple_exporter(exporter.clone())
@@ -892,7 +892,7 @@ mod tests {
892892
}
893893
}
894894

895-
let exporter = InMemoryLogsExporter::default();
895+
let exporter = InMemoryLogExporter::default();
896896

897897
let logger_provider = LoggerProvider::builder()
898898
.with_simple_exporter(exporter.clone())
@@ -1158,7 +1158,7 @@ mod tests {
11581158
CODE_FILEPATH, CODE_LINENO, CODE_NAMESPACE,
11591159
};
11601160

1161-
let exporter = InMemoryLogsExporter::default();
1161+
let exporter = InMemoryLogExporter::default();
11621162

11631163
let logger_provider = LoggerProvider::builder()
11641164
.with_simple_exporter(exporter.clone())
@@ -1201,7 +1201,7 @@ mod tests {
12011201

12021202
#[test]
12031203
fn test_flush() {
1204-
let exporter = InMemoryLogsExporter::default();
1204+
let exporter = InMemoryLogExporter::default();
12051205

12061206
let logger_provider = LoggerProvider::builder()
12071207
.with_simple_exporter(exporter)

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ mod tests {
216216
use opentelemetry::{logs::AnyValue, Key};
217217
use opentelemetry_sdk::export::logs::{LogBatch, LogExporter};
218218
use opentelemetry_sdk::logs::{LogRecord, LoggerProvider};
219-
use opentelemetry_sdk::testing::logs::InMemoryLogsExporter;
219+
use opentelemetry_sdk::testing::logs::InMemoryLogExporter;
220220
use opentelemetry_sdk::trace;
221221
use opentelemetry_sdk::trace::{Sampler, TracerProvider};
222222
use tracing::{error, warn};
@@ -231,7 +231,7 @@ mod tests {
231231
}
232232

233233
fn create_tracing_subscriber(
234-
_exporter: InMemoryLogsExporter,
234+
_exporter: InMemoryLogExporter,
235235
logger_provider: &LoggerProvider,
236236
) -> impl tracing::Subscriber {
237237
let level_filter = tracing_subscriber::filter::LevelFilter::WARN; // Capture WARN and ERROR levels
@@ -309,7 +309,7 @@ mod tests {
309309
#[test]
310310
fn tracing_appender_standalone() {
311311
// Arrange
312-
let exporter: InMemoryLogsExporter = InMemoryLogsExporter::default();
312+
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
313313
let logger_provider = LoggerProvider::builder()
314314
.with_simple_exporter(exporter.clone())
315315
.build();
@@ -389,7 +389,7 @@ mod tests {
389389
#[test]
390390
fn tracing_appender_inside_tracing_context() {
391391
// Arrange
392-
let exporter: InMemoryLogsExporter = InMemoryLogsExporter::default();
392+
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
393393
let logger_provider = LoggerProvider::builder()
394394
.with_simple_exporter(exporter.clone())
395395
.build();
@@ -500,7 +500,7 @@ mod tests {
500500
#[test]
501501
fn tracing_appender_standalone_with_tracing_log() {
502502
// Arrange
503-
let exporter: InMemoryLogsExporter = InMemoryLogsExporter::default();
503+
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
504504
let logger_provider = LoggerProvider::builder()
505505
.with_simple_exporter(exporter.clone())
506506
.build();
@@ -565,7 +565,7 @@ mod tests {
565565
#[test]
566566
fn tracing_appender_inside_tracing_context_with_tracing_log() {
567567
// Arrange
568-
let exporter: InMemoryLogsExporter = InMemoryLogsExporter::default();
568+
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
569569
let logger_provider = LoggerProvider::builder()
570570
.with_simple_exporter(exporter.clone())
571571
.build();

‎opentelemetry-otlp/examples/basic-otlp/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Value: 10
150150
### Logs
151151

152152
```text
153-
2024-05-22T20:25:42.914Z info LogsExporter {"kind": "exporter", "data_type": "logs", "name": "logging", "resource logs": 2, "log records": 2}
153+
2024-05-22T20:25:42.914Z info LogExporter {"kind": "exporter", "data_type": "logs", "name": "logging", "resource logs": 2, "log records": 2}
154154
2024-05-22T20:25:42.914Z info ResourceLog #0
155155
Resource SchemaURL:
156156
Resource attributes:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ mod tests {
309309
resource::{
310310
SERVICE_NAME, TELEMETRY_SDK_LANGUAGE, TELEMETRY_SDK_NAME, TELEMETRY_SDK_VERSION,
311311
},
312-
testing::logs::InMemoryLogsExporter,
312+
testing::logs::InMemoryLogExporter,
313313
trace::TracerProvider,
314314
Resource,
315315
};
@@ -480,7 +480,7 @@ mod tests {
480480

481481
#[test]
482482
fn trace_context_test() {
483-
let exporter = InMemoryLogsExporter::default();
483+
let exporter = InMemoryLogExporter::default();
484484

485485
let logger_provider = LoggerProvider::builder()
486486
.with_simple_exporter(exporter.clone())

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ mod tests {
533533
};
534534
use crate::export::logs::{LogBatch, LogExporter};
535535
use crate::logs::LogRecord;
536-
use crate::testing::logs::InMemoryLogsExporterBuilder;
536+
use crate::testing::logs::InMemoryLogExporterBuilder;
537537
use crate::{
538538
logs::{
539539
log_processor::{
@@ -543,7 +543,7 @@ mod tests {
543543
BatchConfig, BatchConfigBuilder, LogProcessor, LoggerProvider, SimpleLogProcessor,
544544
},
545545
runtime,
546-
testing::logs::InMemoryLogsExporter,
546+
testing::logs::InMemoryLogExporter,
547547
Resource,
548548
};
549549
use async_trait::async_trait;
@@ -690,7 +690,7 @@ mod tests {
690690
];
691691
temp_env::with_vars(env_vars.clone(), || {
692692
let builder =
693-
BatchLogProcessor::builder(InMemoryLogsExporter::default(), runtime::Tokio);
693+
BatchLogProcessor::builder(InMemoryLogExporter::default(), runtime::Tokio);
694694

695695
assert_eq!(builder.config.max_export_batch_size, 500);
696696
assert_eq!(
@@ -711,7 +711,7 @@ mod tests {
711711

712712
temp_env::with_vars(env_vars, || {
713713
let builder =
714-
BatchLogProcessor::builder(InMemoryLogsExporter::default(), runtime::Tokio);
714+
BatchLogProcessor::builder(InMemoryLogExporter::default(), runtime::Tokio);
715715
assert_eq!(builder.config.max_export_batch_size, 120);
716716
assert_eq!(builder.config.max_queue_size, 120);
717717
});
@@ -726,7 +726,7 @@ mod tests {
726726
.with_max_queue_size(4)
727727
.build();
728728

729-
let builder = BatchLogProcessor::builder(InMemoryLogsExporter::default(), runtime::Tokio)
729+
let builder = BatchLogProcessor::builder(InMemoryLogExporter::default(), runtime::Tokio)
730730
.with_batch_config(expected);
731731

732732
let actual = &builder.config;
@@ -784,7 +784,7 @@ mod tests {
784784
async fn test_batch_shutdown() {
785785
// assert we will receive an error
786786
// setup
787-
let exporter = InMemoryLogsExporterBuilder::default()
787+
let exporter = InMemoryLogExporterBuilder::default()
788788
.keep_records_on_shutdown()
789789
.build();
790790
let processor = BatchLogProcessor::new(
@@ -806,7 +806,7 @@ mod tests {
806806

807807
#[test]
808808
fn test_simple_shutdown() {
809-
let exporter = InMemoryLogsExporterBuilder::default()
809+
let exporter = InMemoryLogExporterBuilder::default()
810810
.keep_records_on_shutdown()
811811
.build();
812812
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
@@ -831,7 +831,7 @@ mod tests {
831831
#[tokio::test(flavor = "current_thread")]
832832
#[ignore = "See issue https://github.com/open-telemetry/opentelemetry-rust/issues/1968"]
833833
async fn test_batch_log_processor_shutdown_with_async_runtime_current_flavor_multi_thread() {
834-
let exporter = InMemoryLogsExporterBuilder::default().build();
834+
let exporter = InMemoryLogExporterBuilder::default().build();
835835
let processor = BatchLogProcessor::new(
836836
Box::new(exporter.clone()),
837837
BatchConfig::default(),
@@ -846,7 +846,7 @@ mod tests {
846846

847847
#[tokio::test(flavor = "current_thread")]
848848
async fn test_batch_log_processor_shutdown_with_async_runtime_current_flavor_current_thread() {
849-
let exporter = InMemoryLogsExporterBuilder::default().build();
849+
let exporter = InMemoryLogExporterBuilder::default().build();
850850
let processor = BatchLogProcessor::new(
851851
Box::new(exporter.clone()),
852852
BatchConfig::default(),
@@ -858,7 +858,7 @@ mod tests {
858858

859859
#[tokio::test(flavor = "multi_thread")]
860860
async fn test_batch_log_processor_shutdown_with_async_runtime_multi_flavor_multi_thread() {
861-
let exporter = InMemoryLogsExporterBuilder::default().build();
861+
let exporter = InMemoryLogExporterBuilder::default().build();
862862
let processor = BatchLogProcessor::new(
863863
Box::new(exporter.clone()),
864864
BatchConfig::default(),
@@ -870,7 +870,7 @@ mod tests {
870870

871871
#[tokio::test(flavor = "multi_thread")]
872872
async fn test_batch_log_processor_shutdown_with_async_runtime_multi_flavor_current_thread() {
873-
let exporter = InMemoryLogsExporterBuilder::default().build();
873+
let exporter = InMemoryLogExporterBuilder::default().build();
874874
let processor = BatchLogProcessor::new(
875875
Box::new(exporter.clone()),
876876
BatchConfig::default(),
@@ -989,7 +989,7 @@ mod tests {
989989

990990
#[test]
991991
fn test_simple_processor_sync_exporter_without_runtime() {
992-
let exporter = InMemoryLogsExporterBuilder::default().build();
992+
let exporter = InMemoryLogExporterBuilder::default().build();
993993
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
994994

995995
let mut record: LogRecord = Default::default();
@@ -1002,7 +1002,7 @@ mod tests {
10021002

10031003
#[tokio::test(flavor = "multi_thread", worker_threads = 1)]
10041004
async fn test_simple_processor_sync_exporter_with_runtime() {
1005-
let exporter = InMemoryLogsExporterBuilder::default().build();
1005+
let exporter = InMemoryLogExporterBuilder::default().build();
10061006
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
10071007

10081008
let mut record: LogRecord = Default::default();
@@ -1015,7 +1015,7 @@ mod tests {
10151015

10161016
#[tokio::test(flavor = "multi_thread")]
10171017
async fn test_simple_processor_sync_exporter_with_multi_thread_runtime() {
1018-
let exporter = InMemoryLogsExporterBuilder::default().build();
1018+
let exporter = InMemoryLogExporterBuilder::default().build();
10191019
let processor = Arc::new(SimpleLogProcessor::new(Box::new(exporter.clone())));
10201020

10211021
let mut handles = vec![];
@@ -1038,7 +1038,7 @@ mod tests {
10381038

10391039
#[tokio::test(flavor = "current_thread")]
10401040
async fn test_simple_processor_sync_exporter_with_current_thread_runtime() {
1041-
let exporter = InMemoryLogsExporterBuilder::default().build();
1041+
let exporter = InMemoryLogExporterBuilder::default().build();
10421042
let processor = SimpleLogProcessor::new(Box::new(exporter.clone()));
10431043

10441044
let mut record: LogRecord = Default::default();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub struct LogData {
2323
#[cfg(all(test, feature = "testing"))]
2424
mod tests {
2525
use super::*;
26-
use crate::testing::logs::InMemoryLogsExporter;
26+
use crate::testing::logs::InMemoryLogExporter;
2727
use crate::Resource;
2828
use opentelemetry::logs::LogRecord;
2929
use opentelemetry::logs::{Logger, LoggerProvider as _, Severity};
@@ -40,7 +40,7 @@ mod tests {
4040
KeyValue::new("k3", "v3"),
4141
KeyValue::new("k4", "v4"),
4242
]);
43-
let exporter: InMemoryLogsExporter = InMemoryLogsExporter::default();
43+
let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
4444
let logger_provider = LoggerProvider::builder()
4545
.with_resource(resource.clone())
4646
.with_log_processor(SimpleLogProcessor::new(Box::new(exporter.clone())))

0 commit comments

Comments
 (0)