Skip to content

Commit 70bd531

Browse files
lalitblalitb
authored
Merge branch 'main' into wasm32-no-reqwest-blocking
2 parents b049138 + ff9d50b commit 70bd531

File tree

67 files changed

+1845
-672
lines changed

Some content is hidden

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

67 files changed

+1845
-672
lines changed

‎Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resolver = "2"
1616
debug = 1
1717

1818
[workspace.dependencies]
19-
async-std = "1.10"
19+
async-std = "1.13"
2020
async-trait = "0.1"
2121
bytes = "1"
2222
criterion = "0.5"
@@ -42,7 +42,7 @@ temp-env = "0.3.6"
4242
thiserror = { version = "1", default-features = false }
4343
tonic = { version = "0.12", default-features = false }
4444
tonic-build = "0.12"
45-
tokio = { version = "~1.38.0", default-features = false } #1.39 needs msrv bump to rustc 1.70
45+
tokio = { version = "1", default-features = false }
4646
tokio-stream = "0.1.1"
4747
tracing = { version = "0.1", default-features = false }
4848
tracing-core = { version = "0.1", default-features = false }

‎examples/self-diagnostics/src/main.rs

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use once_cell::sync::Lazy;
1212
use std::collections::HashSet;
1313
use std::sync::{Arc, Mutex};
1414

15-
use ctrlc;
1615
use std::sync::mpsc::channel;
1716

1817
struct ErrorState {

‎opentelemetry-appender-log/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## vNext
44

5+
## v0.25.0
6+
7+
- Update `opentelemetry` dependency version to 0.25
8+
- Starting with this version, this crate will align with `opentelemetry` crate
9+
on major,minor versions.
10+
511
## v0.5.0
612

713
- [1869](https://github.com/open-telemetry/opentelemetry-rust/pull/1869) Utilize the `LogRecord::set_target()` method to pass the log target to the SDK.

‎opentelemetry-appender-log/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-appender-log"
3-
version = "0.5.0"
3+
version = "0.25.0"
44
description = "An OpenTelemetry appender for the log crate"
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-log"
66
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-log"
@@ -11,7 +11,7 @@ rust-version = "1.65"
1111
edition = "2021"
1212

1313
[dependencies]
14-
opentelemetry = { version = "0.24", path = "../opentelemetry", features = ["logs"]}
14+
opentelemetry = { version = "0.25", path = "../opentelemetry", features = ["logs"]}
1515
log = { workspace = true, features = ["kv", "std"]}
1616
serde = { workspace = true, optional = true, features = ["std"] }
1717

‎opentelemetry-appender-tracing/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## vNext
44

5+
- [2101](https://github.com/open-telemetry/opentelemetry-rust/pull/2101) The `log` events emitted via the `tracing` pipeline using the `log-tracing` crate no longer include the target metadata as attributes. Exporters or backends that rely on this attribute should now access the target directly from the `LogRecord::target` field.
6+
7+
8+
## v0.25.0
9+
10+
- Update `opentelemetry` dependency version to 0.25
11+
- Starting with this version, this crate will align with `opentelemetry` crate
12+
on major,minor versions.
513
- Reduce heap allocation by using `&'static str` for `SeverityText`.
614

715
## v0.5.0

‎opentelemetry-appender-tracing/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-appender-tracing"
3-
version = "0.5.0"
3+
version = "0.25.0"
44
edition = "2021"
55
description = "An OpenTelemetry log appender for the tracing crate"
66
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-tracing"
@@ -12,7 +12,7 @@ rust-version = "1.65"
1212

1313
[dependencies]
1414
log = { workspace = true, optional = true }
15-
opentelemetry = { version = "0.24", path = "../opentelemetry", features = ["logs"] }
15+
opentelemetry = { version = "0.25", path = "../opentelemetry", features = ["logs"] }
1616
tracing = { workspace = true, features = ["std"]}
1717
tracing-core = { workspace = true }
1818
tracing-log = { version = "0.2", optional = true }

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

+9-13
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ impl<'a, LR: LogRecord> EventVisitor<'a, LR> {
4444

4545
#[cfg(feature = "experimental_metadata_attributes")]
4646
fn visit_experimental_metadata(&mut self, meta: &Metadata) {
47-
self.log_record.add_attribute(
48-
Key::new("log.target"),
49-
AnyValue::from(meta.target().to_owned()),
50-
);
51-
5247
if let Some(module_path) = meta.module_path() {
5348
self.log_record.add_attribute(
5449
Key::new("code.namespace"),
@@ -164,6 +159,7 @@ where
164159
) {
165160
#[cfg(feature = "experimental_metadata_attributes")]
166161
let normalized_meta = event.normalized_metadata();
162+
167163
#[cfg(feature = "experimental_metadata_attributes")]
168164
let meta = normalized_meta.as_ref().unwrap_or_else(|| event.metadata());
169165

@@ -269,7 +265,7 @@ mod tests {
269265
#[cfg(not(feature = "experimental_metadata_attributes"))]
270266
assert_eq!(log.record.attributes_iter().count(), 3);
271267
#[cfg(feature = "experimental_metadata_attributes")]
272-
assert_eq!(log.record.attributes_iter().count(), 8);
268+
assert_eq!(log.record.attributes_iter().count(), 7);
273269
assert!(attributes_contains(
274270
&log.record,
275271
&Key::new("event_id"),
@@ -307,7 +303,7 @@ mod tests {
307303
.collect();
308304
assert!(attributes_key.contains(&Key::new("code.filepath")));
309305
assert!(attributes_key.contains(&Key::new("code.lineno")));
310-
assert!(attributes_key.contains(&Key::new("log.target")));
306+
assert!(!attributes_key.contains(&Key::new("log.target")));
311307
}
312308
}
313309

@@ -381,7 +377,7 @@ mod tests {
381377
#[cfg(not(feature = "experimental_metadata_attributes"))]
382378
assert_eq!(log.record.attributes_iter().count(), 3);
383379
#[cfg(feature = "experimental_metadata_attributes")]
384-
assert_eq!(log.record.attributes_iter().count(), 8);
380+
assert_eq!(log.record.attributes_iter().count(), 7);
385381
assert!(attributes_contains(
386382
&log.record,
387383
&Key::new("event_id"),
@@ -419,7 +415,7 @@ mod tests {
419415
.collect();
420416
assert!(attributes_key.contains(&Key::new("code.filepath")));
421417
assert!(attributes_key.contains(&Key::new("code.lineno")));
422-
assert!(attributes_key.contains(&Key::new("log.target")));
418+
assert!(!attributes_key.contains(&Key::new("log.target")));
423419
}
424420
}
425421

@@ -461,7 +457,7 @@ mod tests {
461457

462458
// Attributes can be polluted when we don't use this feature.
463459
#[cfg(feature = "experimental_metadata_attributes")]
464-
assert_eq!(log.record.attributes_iter().count(), 5);
460+
assert_eq!(log.record.attributes_iter().count(), 4);
465461

466462
#[cfg(feature = "experimental_metadata_attributes")]
467463
{
@@ -485,7 +481,7 @@ mod tests {
485481
.collect();
486482
assert!(attributes_key.contains(&Key::new("code.filepath")));
487483
assert!(attributes_key.contains(&Key::new("code.lineno")));
488-
assert!(attributes_key.contains(&Key::new("log.target")));
484+
assert!(!attributes_key.contains(&Key::new("log.target")));
489485
}
490486
}
491487

@@ -558,7 +554,7 @@ mod tests {
558554

559555
// Attributes can be polluted when we don't use this feature.
560556
#[cfg(feature = "experimental_metadata_attributes")]
561-
assert_eq!(log.record.attributes_iter().count(), 5);
557+
assert_eq!(log.record.attributes_iter().count(), 4);
562558

563559
#[cfg(feature = "experimental_metadata_attributes")]
564560
{
@@ -582,7 +578,7 @@ mod tests {
582578
.collect();
583579
assert!(attributes_key.contains(&Key::new("code.filepath")));
584580
assert!(attributes_key.contains(&Key::new("code.lineno")));
585-
assert!(attributes_key.contains(&Key::new("log.target")));
581+
assert!(!attributes_key.contains(&Key::new("log.target")));
586582
}
587583
}
588584
}

‎opentelemetry-http/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## vNext
44

5+
## v0.25.0
6+
7+
- Update `opentelemetry` dependency version to 0.25
8+
- Starting with this version, this crate will align with `opentelemetry` crate
9+
on major,minor versions.
10+
511
## v0.13.0
612

713
- **Breaking** Correct the misspelling of "webkpi" to "webpki" in features [#1842](https://github.com/open-telemetry/opentelemetry-rust/pull/1842)

‎opentelemetry-http/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-http"
3-
version = "0.13.0"
3+
version = "0.25.0"
44
description = "Helper implementations for sending HTTP requests. Uses include propagating and extracting context over http, exporting telemetry, requesting sampling strategies."
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust"
66
repository = "https://github.com/open-telemetry/opentelemetry-rust"
@@ -21,6 +21,6 @@ http = { workspace = true }
2121
http-body-util = { workspace = true, optional = true }
2222
hyper = { workspace = true, optional = true }
2323
hyper-util = { workspace = true, features = ["client-legacy", "http2"], optional = true }
24-
opentelemetry = { version = "0.24", path = "../opentelemetry", features = ["trace"] }
24+
opentelemetry = { version = "0.25", path = "../opentelemetry", features = ["trace"] }
2525
reqwest = { workspace = true, features = ["blocking"], optional = true }
2626
tokio = { workspace = true, features = ["time"], optional = true }

‎opentelemetry-jaeger-propagator/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## vNext
44

5+
## v0.25.0
6+
7+
- Update `opentelemetry` dependency version to 0.25
8+
- Starting with this version, this crate will align with `opentelemetry` crate
9+
on major,minor versions.
10+
511
## v0.3.0
612
- Update `opentelemetry` dependency version to 0.24
713

‎opentelemetry-jaeger-propagator/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-jaeger-propagator"
3-
version = "0.3.0"
3+
version = "0.25.0"
44
description = "Jaeger propagator for OpenTelemetry"
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger-propagator"
66
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger-propagator"
@@ -20,7 +20,7 @@ all-features = true
2020
rustdoc-args = ["--cfg", "docsrs"]
2121

2222
[dependencies]
23-
opentelemetry = { version = "0.24", default-features = false, features = [
23+
opentelemetry = { version = "0.25", default-features = false, features = [
2424
"trace",
2525
], path = "../opentelemetry" }
2626

‎opentelemetry-otlp/CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
## vNext
44

5+
## v0.25.0
6+
7+
- Update `opentelemetry` dependency version to 0.25
8+
- Update `opentelemetry_sdk` dependency version to 0.25
9+
- Update `opentelemetry-http` dependency version to 0.25
10+
- Update `opentelemetry-proto` dependency version to 0.25
11+
- Starting with this version, this crate will align with `opentelemetry` crate
12+
on major,minor versions.
513
- **Breaking**
614
The logrecord event-name is added as an attribute only if the feature flag
715
`populate-logs-event-name` is enabled. The name of the attribute is changed from
@@ -13,7 +21,7 @@ The logrecord event-name is added as an attribute only if the feature flag
1321

1422
- Add "metrics", "logs" to default features. With this, default feature list is
1523
"trace", "metrics" and "logs".
16-
- `OtlpMetricPipeline.build()` no longer invoke the
24+
- **Breaking** `OtlpMetricPipeline.build()` no longer invoke the
1725
`global::set_meter_provider`. User who setup the pipeline must do it
1826
themselves using `global::set_meter_provider(meter_provider.clone());`.
1927
- Add `with_resource` on `OtlpLogPipeline`, replacing the `with_config` method.

‎opentelemetry-otlp/Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-otlp"
3-
version = "0.17.0"
3+
version = "0.25.0"
44
description = "Exporter for the OpenTelemetry Collector"
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp"
66
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp"
@@ -28,10 +28,10 @@ rustdoc-args = ["--cfg", "docsrs"]
2828
[dependencies]
2929
async-trait = { workspace = true }
3030
futures-core = { workspace = true }
31-
opentelemetry = { version = "0.24", default-features = false, path = "../opentelemetry" }
32-
opentelemetry_sdk = { version = "0.24", default-features = false, path = "../opentelemetry-sdk" }
33-
opentelemetry-http = { version = "0.13", path = "../opentelemetry-http", optional = true }
34-
opentelemetry-proto = { version = "0.7", path = "../opentelemetry-proto", default-features = false }
31+
opentelemetry = { version = "0.25", default-features = false, path = "../opentelemetry" }
32+
opentelemetry_sdk = { version = "0.25", default-features = false, path = "../opentelemetry-sdk" }
33+
opentelemetry-http = { version = "0.25", path = "../opentelemetry-http", optional = true }
34+
opentelemetry-proto = { version = "0.25", path = "../opentelemetry-proto", default-features = false }
3535

3636
prost = { workspace = true, optional = true }
3737
tonic = { workspace = true, optional = true }

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use opentelemetry::{
33
global,
44
metrics::MetricsError,
55
trace::{TraceContextExt, TraceError, Tracer, TracerProvider as _},
6-
Key, KeyValue,
6+
KeyValue,
77
};
88
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
99
use opentelemetry_otlp::Protocol;
@@ -146,7 +146,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
146146
let span = cx.span();
147147
span.add_event(
148148
"Nice operation!".to_string(),
149-
vec![Key::new("bogons").i64(100)],
149+
vec![KeyValue::new("bogons", 100)],
150150
);
151151
span.set_attribute(KeyValue::new("another.key", "yes"));
152152

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use opentelemetry::metrics::MetricsError;
55
use opentelemetry::trace::{TraceError, TracerProvider};
66
use opentelemetry::{
77
trace::{TraceContextExt, Tracer},
8-
Key, KeyValue,
8+
KeyValue,
99
};
1010
use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge;
1111
use opentelemetry_otlp::{ExportConfig, WithExportConfig};
@@ -136,7 +136,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
136136
let span = cx.span();
137137
span.add_event(
138138
"Nice operation!".to_string(),
139-
vec![Key::new("bogons").i64(100)],
139+
vec![KeyValue::new("bogons", 100)],
140140
);
141141
span.set_attribute(KeyValue::new("another.key", "yes"));
142142

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl Default for HttpConfig {
7878
/// ```
7979
/// # #[cfg(feature="metrics")]
8080
/// use opentelemetry_sdk::metrics::reader::{
81-
/// DefaultAggregationSelector, DefaultTemporalitySelector,
81+
/// DefaultTemporalitySelector,
8282
/// };
8383
///
8484
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -91,7 +91,6 @@ impl Default for HttpConfig {
9191
/// let metrics_exporter = opentelemetry_otlp::new_exporter()
9292
/// .http()
9393
/// .build_metrics_exporter(
94-
/// Box::new(DefaultAggregationSelector::new()),
9594
/// Box::new(DefaultTemporalitySelector::new()),
9695
/// )?;
9796
///
@@ -252,7 +251,6 @@ impl HttpExporterBuilder {
252251
#[cfg(feature = "metrics")]
253252
pub fn build_metrics_exporter(
254253
mut self,
255-
aggregation_selector: Box<dyn opentelemetry_sdk::metrics::reader::AggregationSelector>,
256254
temporality_selector: Box<dyn opentelemetry_sdk::metrics::reader::TemporalitySelector>,
257255
) -> opentelemetry::metrics::Result<crate::MetricsExporter> {
258256
use crate::{
@@ -267,11 +265,7 @@ impl HttpExporterBuilder {
267265
OTEL_EXPORTER_OTLP_METRICS_HEADERS,
268266
)?;
269267

270-
Ok(crate::MetricsExporter::new(
271-
client,
272-
temporality_selector,
273-
aggregation_selector,
274-
))
268+
Ok(crate::MetricsExporter::new(client, temporality_selector))
275269
}
276270
}
277271

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

+2-8
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ fn resolve_compression(
9797
/// ```no_run
9898
/// # #[cfg(feature="metrics")]
9999
/// use opentelemetry_sdk::metrics::reader::{
100-
/// DefaultAggregationSelector, DefaultTemporalitySelector,
100+
/// DefaultTemporalitySelector,
101101
/// };
102102
///
103103
/// # fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -110,7 +110,6 @@ fn resolve_compression(
110110
/// let metrics_exporter = opentelemetry_otlp::new_exporter()
111111
/// .tonic()
112112
/// .build_metrics_exporter(
113-
/// Box::new(DefaultAggregationSelector::new()),
114113
/// Box::new(DefaultTemporalitySelector::new()),
115114
/// )?;
116115
///
@@ -332,7 +331,6 @@ impl TonicExporterBuilder {
332331
#[cfg(feature = "metrics")]
333332
pub fn build_metrics_exporter(
334333
self,
335-
aggregation_selector: Box<dyn opentelemetry_sdk::metrics::reader::AggregationSelector>,
336334
temporality_selector: Box<dyn opentelemetry_sdk::metrics::reader::TemporalitySelector>,
337335
) -> opentelemetry::metrics::Result<crate::MetricsExporter> {
338336
use crate::MetricsExporter;
@@ -347,11 +345,7 @@ impl TonicExporterBuilder {
347345

348346
let client = TonicMetricsClient::new(channel, interceptor, compression);
349347

350-
Ok(MetricsExporter::new(
351-
client,
352-
temporality_selector,
353-
aggregation_selector,
354-
))
348+
Ok(MetricsExporter::new(client, temporality_selector))
355349
}
356350

357351
/// Build a new tonic span exporter

0 commit comments

Comments
 (0)