Skip to content

Commit f2b0156

Browse files
committed
build error
1 parent fa9237b commit f2b0156

File tree

6 files changed

+18
-11
lines changed

6 files changed

+18
-11
lines changed

examples/self-diagnostics/src/main.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use opentelemetry::global::{self, Error as OtelError};
1+
use opentelemetry::global;
22
use opentelemetry::KeyValue;
33
use opentelemetry_appender_tracing::layer;
44
use opentelemetry_otlp::{LogExporter, MetricExporter, WithExportConfig};
@@ -7,10 +7,6 @@ use tracing_subscriber::prelude::*;
77

88
use std::error::Error;
99

10-
use once_cell::sync::Lazy;
11-
use std::collections::HashSet;
12-
use std::sync::{Arc, Mutex};
13-
1410
use std::sync::mpsc::channel;
1511

1612
fn init_logger_provider() -> opentelemetry_sdk::logs::LoggerProvider {

opentelemetry-otlp/examples/basic-otlp-http/src/main.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
use once_cell::sync::Lazy;
33
use opentelemetry::{
44
global,
5-
metrics::MetricError,
65
trace::{TraceContextExt, TraceError, Tracer},
76
InstrumentationScope, KeyValue,
87
};
@@ -11,7 +10,7 @@ use opentelemetry_otlp::WithExportConfig;
1110
use opentelemetry_otlp::{LogExporter, MetricExporter, Protocol, SpanExporter};
1211
use opentelemetry_sdk::{
1312
logs::LoggerProvider,
14-
metrics::{PeriodicReader, SdkMeterProvider},
13+
metrics::{MetricError, PeriodicReader, SdkMeterProvider},
1514
runtime,
1615
trace::{self as sdktrace, Config, TracerProvider},
1716
};
@@ -31,7 +30,7 @@ static RESOURCE: Lazy<Resource> = Lazy::new(|| {
3130
)])
3231
});
3332

34-
fn init_logs() -> Result<sdklogs::LoggerProvider, opentelemetry::logs::LogError> {
33+
fn init_logs() -> Result<sdklogs::LoggerProvider, opentelemetry_sdk::logs::LogError> {
3534
let exporter = LogExporter::builder()
3635
.with_http()
3736
.with_endpoint("http://localhost:4318/v1/logs")

opentelemetry-otlp/examples/basic-otlp/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use once_cell::sync::Lazy;
2-
use opentelemetry::logs::LogError;
3-
use opentelemetry::metrics::MetricError;
42
use opentelemetry::trace::{TraceContextExt, TraceError, Tracer};
53
use opentelemetry::KeyValue;
64
use opentelemetry::{global, InstrumentationScope};
75
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
86
use opentelemetry_otlp::{LogExporter, MetricExporter, SpanExporter, WithExportConfig};
7+
use opentelemetry_sdk::logs::LogError;
98
use opentelemetry_sdk::logs::LoggerProvider;
9+
use opentelemetry_sdk::metrics::MetricError;
1010
use opentelemetry_sdk::metrics::{PeriodicReader, SdkMeterProvider};
1111
use opentelemetry_sdk::trace::Config;
1212
use opentelemetry_sdk::{runtime, trace as sdktrace, Resource};

opentelemetry-otlp/src/lib.rs

+6
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,12 @@ impl ExportError for Error {
391391
}
392392
}
393393

394+
impl opentelemetry::trace::ExportError for Error {
395+
fn exporter_name(&self) -> &'static str {
396+
"otlp"
397+
}
398+
}
399+
394400
/// The communication protocol to use when exporting data.
395401
#[cfg_attr(feature = "serialize", derive(Deserialize, Serialize))]
396402
#[derive(Clone, Copy, Debug, Eq, PartialEq)]

opentelemetry-otlp/tests/integration_test/tests/logs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
use integration_test_runner::logs_asserter::{read_logs_from_json, LogsAsserter};
44
use log::{info, Level};
5-
use opentelemetry::logs::LogError;
65
use opentelemetry::KeyValue;
76
use opentelemetry_appender_log::OpenTelemetryLogBridge;
87
use opentelemetry_otlp::{LogExporter, WithExportConfig};
8+
use opentelemetry_sdk::logs::LogError;
99
use opentelemetry_sdk::logs::LoggerProvider;
1010
use opentelemetry_sdk::{logs as sdklogs, runtime, Resource};
1111
use std::error::Error;

opentelemetry-zipkin/src/exporter/mod.rs

+6
Original file line numberDiff line numberDiff line change
@@ -252,3 +252,9 @@ impl ExportError for Error {
252252
"zipkin"
253253
}
254254
}
255+
256+
impl opentelemetry::trace::ExportError for Error {
257+
fn exporter_name(&self) -> &'static str {
258+
"zipkin"
259+
}
260+
}

0 commit comments

Comments
 (0)