Skip to content

Commit 826cda0

Browse files
authored
remove APIs deprecated on 0.4 (#62)
* remove APIs deprecated on 0.4 * accept test diff
1 parent ef5ef52 commit 826cda0

File tree

3 files changed

+3
-79
lines changed

3 files changed

+3
-79
lines changed

src/exporters.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub fn span_exporter(
9999
}
100100

101101
/// Build a [`PushMetricExporter`] for passing to
102-
/// [`with_metrics_options()`][crate::LogfireConfigBuilder::with_metrics_options].
102+
/// [`with_metrics()`][crate::LogfireConfigBuilder::with_metrics].
103103
///
104104
/// This uses `OTEL_EXPORTER_OTLP_PROTOCOL` and `OTEL_EXPORTER_OTLP_TRACES_PROTOCOL` environment
105105
/// variables to determine the protocol to use (or otherwise defaults to [`Protocol::HttpBinary`]).

src/lib.rs

Lines changed: 1 addition & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -190,39 +190,6 @@ pub enum ConfigureError {
190190
Other(#[from] Box<dyn std::error::Error + Send + Sync>),
191191
}
192192

193-
#[expect(deprecated)]
194-
mod deprecated {
195-
use std::str::FromStr;
196-
197-
/// Whether to print to the console.
198-
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
199-
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
200-
#[cfg_attr(feature = "serde", serde(rename_all = "lowercase"))]
201-
#[deprecated(since = "0.4.0", note = "use `ConsoleOptions` instead")]
202-
pub enum ConsoleMode {
203-
/// Write to console if no logfire token
204-
#[default]
205-
Fallback,
206-
/// Force write to console
207-
Force,
208-
}
209-
210-
impl FromStr for ConsoleMode {
211-
type Err = String;
212-
213-
fn from_str(s: &str) -> Result<Self, Self::Err> {
214-
match s {
215-
"fallback" => Ok(ConsoleMode::Fallback),
216-
"force" => Ok(ConsoleMode::Force),
217-
_ => Err(format!("invalid console mode: {s}")),
218-
}
219-
}
220-
}
221-
}
222-
223-
#[expect(deprecated)]
224-
use deprecated::ConsoleMode;
225-
226193
/// Main entry point to configure logfire.
227194
///
228195
/// This should be called once at the start of the program.
@@ -251,8 +218,6 @@ pub fn configure() -> LogfireConfigBuilder {
251218
send_to_logfire: None,
252219
token: None,
253220
console_options: Some(ConsoleOptions::default()),
254-
#[expect(deprecated)]
255-
console_mode: ConsoleMode::Force,
256221
additional_span_processors: Vec::new(),
257222
advanced: None,
258223
metrics: Some(MetricsOptions::default()),
@@ -271,10 +236,6 @@ pub struct LogfireConfigBuilder {
271236
// service_version: Option<String>,
272237
// environment: Option<String>,
273238
console_options: Option<ConsoleOptions>,
274-
/// Deprecated setting, `Force` implies use `console_options`, `Fallback` will filter
275-
/// them out if `send_to_logfire` is false.
276-
#[expect(deprecated)]
277-
console_mode: ConsoleMode,
278239

279240
// config_dir: Option<PathBuf>,
280241
// data_dir: Option<Path>,
@@ -336,21 +297,6 @@ impl LogfireConfigBuilder {
336297
self
337298
}
338299

339-
/// Whether to log to the console.
340-
#[must_use]
341-
#[deprecated(since = "0.4.0", note = "use `with_console()` instead")]
342-
#[expect(deprecated)]
343-
pub fn console_mode(mut self, console_mode: ConsoleMode) -> Self {
344-
// FIXME: remove this API and make it match Python, see `console_options()` below
345-
match console_mode {
346-
ConsoleMode::Fallback => {
347-
self.console_options = None;
348-
}
349-
ConsoleMode::Force => self.console_options = Some(ConsoleOptions::default()),
350-
}
351-
self
352-
}
353-
354300
/// Sets console options. Set to `None` to disable console logging.
355301
///
356302
/// If not set, will use `ConsoleOptions::default()`.
@@ -400,22 +346,6 @@ impl LogfireConfigBuilder {
400346
self
401347
}
402348

403-
/// Configure [metrics options](crate::config::MetricsOptions).
404-
#[must_use]
405-
#[deprecated(since = "0.4.0", note = "use `with_metrics` instead")]
406-
pub fn with_metrics_options(mut self, metrics: MetricsOptions) -> Self {
407-
self.metrics = Some(metrics);
408-
self
409-
}
410-
411-
/// Whether to enable metrics.
412-
#[must_use]
413-
#[deprecated(since = "0.4.0", note = "use `with_metrics(None)` to disable metrics")]
414-
pub fn enable_metrics(mut self, enable: bool) -> Self {
415-
self.enable_metrics = enable;
416-
self
417-
}
418-
419349
/// Finish configuring Logfire.
420350
///
421351
/// Because this configures global state for the opentelemetry SDK, this can typically only ever be called once per program.
@@ -537,13 +467,7 @@ impl LogfireConfigBuilder {
537467

538468
let console_writer = self
539469
.console_options
540-
// NB deprecated behaviour: if set to fallback and sending to logfire, disable console
541-
.filter(
542-
#[expect(deprecated)]
543-
|_| !(self.console_mode == ConsoleMode::Fallback && send_to_logfire),
544-
)
545-
.map(ConsoleWriter::new)
546-
.map(Arc::new);
470+
.map(|o| Arc::new(ConsoleWriter::new(o)));
547471

548472
if let Some(console_writer) = console_writer.clone() {
549473
tracer_provider_builder = tracer_provider_builder

tests/test_basic_exports.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ fn test_basic_span() {
13061306
"code.lineno",
13071307
),
13081308
value: I64(
1309-
713,
1309+
637,
13101310
),
13111311
},
13121312
KeyValue {

0 commit comments

Comments
 (0)