Skip to content

Commit ad38303

Browse files
authored
Add conditional compilation to avoid build warnings (#2619)
1 parent 1fbaaf2 commit ad38303

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

.cspell.json

+6
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,15 @@
3030
"appender",
3131
"appenders",
3232
"Bhasin",
33+
"BLRP",
3334
"Cijo",
3435
"clippy",
3536
"clonable",
3637
"codecov",
3738
"datapoint",
3839
"deque",
3940
"Dirkjan",
41+
"docsrs",
4042
"Dwarnings",
4143
"EPYC",
4244
"flamegraph",
@@ -56,12 +58,14 @@
5658
"OTELCOL",
5759
"OTLP",
5860
"periodicreader",
61+
"Pillai",
5962
"pprof",
6063
"prost",
6164
"protoc",
6265
"quantile",
6366
"Redelmeier",
6467
"reqwest",
68+
"rstest",
6569
"runtimes",
6670
"rustc",
6771
"serde",
@@ -72,7 +76,9 @@
7276
"testresults",
7377
"thiserror",
7478
"tracerprovider",
79+
"Umesan",
7580
"updown",
81+
"Utkarsh",
7682
"Zhongyang",
7783
"zipkin"
7884
],

opentelemetry-sdk/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ temp-env = { workspace = true }
4242
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
4343

4444
[features]
45-
default = ["trace", "metrics", "logs", "internal-logs", "experimental_trace_batch_span_processor_with_async_runtime", "experimental_async_runtime"]
45+
default = ["trace", "metrics", "logs", "internal-logs"]
4646
trace = ["opentelemetry/trace", "rand", "percent-encoding"]
4747
jaeger_remote_sampler = ["trace", "opentelemetry-http", "http", "serde", "serde_json", "url"]
4848
logs = ["opentelemetry/logs", "serde_json"]

opentelemetry-sdk/src/logs/log_processor.rs

+12-5
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ impl BatchLogProcessor {
508508
let mut logs = Vec::with_capacity(config.max_export_batch_size);
509509
let current_batch_size = current_batch_size_for_thread;
510510

511-
// This method gets upto `max_export_batch_size` amount of logs from the channel and exports them.
511+
// This method gets up to `max_export_batch_size` amount of logs from the channel and exports them.
512512
// It returns the result of the export operation.
513513
// It expects the logs vec to be empty when it's called.
514514
#[inline]
@@ -871,16 +871,18 @@ impl BatchConfigBuilder {
871871
#[cfg(all(test, feature = "testing", feature = "logs"))]
872872
mod tests {
873873
use super::{
874-
BatchLogProcessor, OTEL_BLRP_EXPORT_TIMEOUT, OTEL_BLRP_MAX_EXPORT_BATCH_SIZE,
875-
OTEL_BLRP_MAX_QUEUE_SIZE, OTEL_BLRP_SCHEDULE_DELAY,
874+
BatchLogProcessor, OTEL_BLRP_MAX_EXPORT_BATCH_SIZE, OTEL_BLRP_MAX_QUEUE_SIZE,
875+
OTEL_BLRP_SCHEDULE_DELAY,
876876
};
877+
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
878+
use super::{OTEL_BLRP_EXPORT_TIMEOUT, OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT};
877879
use crate::logs::LogResult;
878880
use crate::logs::{LogBatch, LogExporter, SdkLogRecord};
879881
use crate::{
880882
logs::{
881883
log_processor::{
882-
OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT, OTEL_BLRP_MAX_EXPORT_BATCH_SIZE_DEFAULT,
883-
OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT, OTEL_BLRP_SCHEDULE_DELAY_DEFAULT,
884+
OTEL_BLRP_MAX_EXPORT_BATCH_SIZE_DEFAULT, OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT,
885+
OTEL_BLRP_SCHEDULE_DELAY_DEFAULT,
884886
},
885887
BatchConfig, BatchConfigBuilder, InMemoryLogExporter, InMemoryLogExporterBuilder,
886888
LogProcessor, SdkLoggerProvider, SimpleLogProcessor,
@@ -933,7 +935,9 @@ mod tests {
933935
fn test_default_const_values() {
934936
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY, "OTEL_BLRP_SCHEDULE_DELAY");
935937
assert_eq!(OTEL_BLRP_SCHEDULE_DELAY_DEFAULT, 1_000);
938+
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
936939
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT, "OTEL_BLRP_EXPORT_TIMEOUT");
940+
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
937941
assert_eq!(OTEL_BLRP_EXPORT_TIMEOUT_DEFAULT, 30_000);
938942
assert_eq!(OTEL_BLRP_MAX_QUEUE_SIZE, "OTEL_BLRP_MAX_QUEUE_SIZE");
939943
assert_eq!(OTEL_BLRP_MAX_QUEUE_SIZE_DEFAULT, 2_048);
@@ -949,6 +953,7 @@ mod tests {
949953
// The following environment variables are expected to be unset so that their default values are used.
950954
let env_vars = vec![
951955
OTEL_BLRP_SCHEDULE_DELAY,
956+
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
952957
OTEL_BLRP_EXPORT_TIMEOUT,
953958
OTEL_BLRP_MAX_QUEUE_SIZE,
954959
OTEL_BLRP_MAX_EXPORT_BATCH_SIZE,
@@ -976,6 +981,7 @@ mod tests {
976981
fn test_batch_config_configurable_by_env_vars() {
977982
let env_vars = vec![
978983
(OTEL_BLRP_SCHEDULE_DELAY, Some("2000")),
984+
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
979985
(OTEL_BLRP_EXPORT_TIMEOUT, Some("60000")),
980986
(OTEL_BLRP_MAX_QUEUE_SIZE, Some("4096")),
981987
(OTEL_BLRP_MAX_EXPORT_BATCH_SIZE, Some("1024")),
@@ -1035,6 +1041,7 @@ mod tests {
10351041
let mut env_vars = vec![
10361042
(OTEL_BLRP_MAX_EXPORT_BATCH_SIZE, Some("500")),
10371043
(OTEL_BLRP_SCHEDULE_DELAY, Some("I am not number")),
1044+
#[cfg(feature = "experimental_logs_batch_log_processor_with_async_runtime")]
10381045
(OTEL_BLRP_EXPORT_TIMEOUT, Some("2046")),
10391046
];
10401047
temp_env::with_vars(env_vars.clone(), || {

stress/src/traces.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
use lazy_static::lazy_static;
1313
use opentelemetry::{
14-
trace::{Span, SpanBuilder, TraceResult, Tracer, TracerProvider},
14+
trace::{Span, SpanBuilder, Tracer, TracerProvider},
1515
Context, KeyValue,
1616
};
1717
use opentelemetry_sdk::{

0 commit comments

Comments
 (0)