Skip to content

Commit 8fafa7a

Browse files
cijothomascijothomas
authored
Merge branch 'main' into poc-create_aggregation
2 parents bdc6ecd + b3879b6 commit 8fafa7a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+782
-534
lines changed

‎.cspell.json

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
// workspace dictionary.
2727
"words": [
2828
"actix",
29+
"anyvalue",
2930
"appender",
3031
"appenders",
3132
"Bhasin",
@@ -37,6 +38,7 @@
3738
"deque",
3839
"Dirkjan",
3940
"EPYC",
41+
"flamegraph",
4042
"hasher",
4143
"Isobel",
4244
"jaegertracing",
@@ -53,6 +55,7 @@
5355
"OTELCOL",
5456
"OTLP",
5557
"periodicreader",
58+
"pprof",
5659
"prost",
5760
"protoc",
5861
"quantile",

‎.github/workflows/integration_tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ jobs:
99
integration_tests:
1010
runs-on: ubuntu-latest
1111
timeout-minutes: 10
12-
if: ${{ github.event.label.name == 'integration tests' || contains(github.event.pull_request.labels.*.name, 'integration tests') }}
1312
steps:
1413
- name: Free disk space
1514
run: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ mod tests {
769769
use super::OpenTelemetryLogBridge;
770770

771771
use opentelemetry::{logs::AnyValue, StringValue};
772-
use opentelemetry_sdk::{logs::LoggerProvider, testing::logs::InMemoryLogExporter};
772+
use opentelemetry_sdk::{logs::InMemoryLogExporter, logs::LoggerProvider};
773773

774774
use log::Log;
775775

‎opentelemetry-appender-tracing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ criterion = { workspace = true }
2828
tokio = { workspace = true, features = ["full"]}
2929

3030
[target.'cfg(not(target_os = "windows"))'.dev-dependencies]
31-
pprof = { version = "0.13", features = ["flamegraph", "criterion"] }
31+
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
3232

3333
[features]
3434
experimental_metadata_attributes = ["dep:tracing-log"]

‎opentelemetry-appender-tracing/benches/logs.rs

+1-1
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ 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::InMemoryLogExporter;
217+
use opentelemetry_sdk::logs::{LogBatch, LogExporter};
217218
use opentelemetry_sdk::logs::{LogRecord, LogResult, LoggerProvider};
218-
use opentelemetry_sdk::testing::logs::InMemoryLogExporter;
219219
use opentelemetry_sdk::trace::{Sampler, TracerProvider};
220220
use tracing::{error, warn};
221221
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;

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

+1-1
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

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ use opentelemetry_proto::transform::logs::tonic::group_logs_by_resource_and_scop
1414
#[cfg(feature = "trace")]
1515
use opentelemetry_proto::transform::trace::tonic::group_spans_by_resource_and_scope;
1616
#[cfg(feature = "logs")]
17-
use opentelemetry_sdk::export::logs::LogBatch;
17+
use opentelemetry_sdk::logs::LogBatch;
1818
#[cfg(feature = "trace")]
19-
use opentelemetry_sdk::export::trace::SpanData;
19+
use opentelemetry_sdk::trace::SpanData;
2020
use prost::Message;
2121
use std::collections::HashMap;
2222
use std::env;
@@ -27,6 +27,9 @@ use std::time::Duration;
2727
#[cfg(feature = "metrics")]
2828
mod metrics;
2929

30+
#[cfg(feature = "metrics")]
31+
use opentelemetry_sdk::metrics::data::ResourceMetrics;
32+
3033
#[cfg(feature = "logs")]
3134
pub(crate) mod logs;
3235

@@ -336,7 +339,7 @@ impl OtlpHttpClient {
336339
#[cfg(feature = "metrics")]
337340
fn build_metrics_export_body(
338341
&self,
339-
metrics: &mut opentelemetry_sdk::metrics::data::ResourceMetrics,
342+
metrics: &mut ResourceMetrics,
340343
) -> opentelemetry_sdk::metrics::MetricResult<(Vec<u8>, &'static str)> {
341344
use opentelemetry_proto::tonic::collector::metrics::v1::ExportMetricsServiceRequest;
342345

‎opentelemetry-otlp/src/exporter/http/trace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::sync::Arc;
33
use futures_core::future::BoxFuture;
44
use http::{header::CONTENT_TYPE, Method};
55
use opentelemetry::{otel_debug, trace::TraceError};
6-
use opentelemetry_sdk::export::trace::{ExportResult, SpanData, SpanExporter};
6+
use opentelemetry_sdk::trace::{ExportResult, SpanData, SpanExporter};
77

88
use super::OtlpHttpClient;
99

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

+1-1
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/exporter/tonic/trace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use opentelemetry::{otel_debug, trace::TraceError};
55
use opentelemetry_proto::tonic::collector::trace::v1::{
66
trace_service_client::TraceServiceClient, ExportTraceServiceRequest,
77
};
8-
use opentelemetry_sdk::export::trace::{ExportResult, SpanData, SpanExporter};
8+
use opentelemetry_sdk::trace::{ExportResult, SpanData, SpanExporter};
99
use tonic::{codegen::CompressionEncoding, service::Interceptor, transport::Channel, Request};
1010

1111
use opentelemetry_proto::transform::trace::tonic::group_spans_by_resource_and_scope;

‎opentelemetry-otlp/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ pub use crate::exporter::{
262262
OTEL_EXPORTER_OTLP_TIMEOUT_DEFAULT,
263263
};
264264

265-
use opentelemetry_sdk::export::ExportError;
265+
use opentelemetry_sdk::ExportError;
266266

267267
/// Type to indicate the builder does not have a client set.
268268
#[derive(Debug, Default, Clone)]

‎opentelemetry-otlp/src/logs.rs

+2-2
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-otlp/src/span.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use std::fmt::Debug;
66

77
use futures_core::future::BoxFuture;
8-
use opentelemetry_sdk::export::trace::{ExportResult, SpanData};
8+
use opentelemetry_sdk::trace::{ExportResult, SpanData};
99

1010
#[cfg(feature = "grpc-tonic")]
1111
use crate::{
@@ -107,7 +107,7 @@ impl HasHttpConfig for SpanExporterBuilder<HttpExporterBuilderSet> {
107107

108108
/// OTLP exporter that sends tracing information
109109
#[derive(Debug)]
110-
pub struct SpanExporter(Box<dyn opentelemetry_sdk::export::trace::SpanExporter>);
110+
pub struct SpanExporter(Box<dyn opentelemetry_sdk::trace::SpanExporter>);
111111

112112
impl SpanExporter {
113113
/// Obtain a builder to configure a [SpanExporter].
@@ -116,12 +116,12 @@ impl SpanExporter {
116116
}
117117

118118
/// Build a new span exporter from a client
119-
pub fn new(client: impl opentelemetry_sdk::export::trace::SpanExporter + 'static) -> Self {
119+
pub fn new(client: impl opentelemetry_sdk::trace::SpanExporter + 'static) -> Self {
120120
SpanExporter(Box::new(client))
121121
}
122122
}
123123

124-
impl opentelemetry_sdk::export::trace::SpanExporter for SpanExporter {
124+
impl opentelemetry_sdk::trace::SpanExporter for SpanExporter {
125125
fn export(&mut self, batch: Vec<SpanData>) -> BoxFuture<'static, ExportResult> {
126126
self.0.export(batch)
127127
}

0 commit comments

Comments
 (0)