Skip to content

Commit

Permalink
Merge branch 'main' into otel-json
Browse files Browse the repository at this point in the history
  • Loading branch information
ramgdev committed Mar 20, 2024
2 parents e50ac0e + e98c61c commit 049e96a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 26 deletions.
29 changes: 6 additions & 23 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,14 @@
[workspace]
members = [
"opentelemetry",
"opentelemetry-http",
"opentelemetry-jaeger",
"opentelemetry-jaeger/examples/actix-udp",
"opentelemetry-jaeger/examples/remote-sampler",
"opentelemetry-jaeger-propagator",
"opentelemetry-appender-log",
"opentelemetry-appender-tracing",
"opentelemetry-otlp",
"opentelemetry-prometheus",
"opentelemetry-proto",
"opentelemetry-sdk",
"opentelemetry-semantic-conventions",
"opentelemetry-stdout",
"opentelemetry-zipkin",
"opentelemetry-otlp/examples/basic-otlp",
"opentelemetry-otlp/examples/basic-otlp-http",
"opentelemetry-otlp/tests/integration_test",
"examples/metrics-basic",
"examples/metrics-advanced",
"examples/logs-basic",
"examples/tracing-grpc",
"examples/tracing-http-propagator",
"examples/tracing-jaeger",
"opentelemetry-*",
"opentelemetry-*/examples/*",
"opentelemetry-otlp/tests/*",
"examples/*",
"stress",
]
# Any deleted crates with remaining README
exclude = []
resolver = "2"

[profile.bench]
Expand Down
8 changes: 5 additions & 3 deletions opentelemetry-sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
[1612](https://github.com/open-telemetry/opentelemetry-rust/pull/1612/files)
- [#1422](https://github.com/open-telemetry/opentelemetry-rust/pull/1422)
Fix metrics aggregation bug when using Views to drop attributes.
- [#1623](https://github.com/open-telemetry/opentelemetry-rust/pull/1623) Add Drop implementation for SdkMeterProvider, which shuts down
metricreaders, thereby allowing metrics still in memory to be flushed out.
- **Breaking** [#1624](https://github.com/open-telemetry/opentelemetry-rust/pull/1624) Remove `OsResourceDetector` and `ProcessResourceDetector` resource detectors, use the `opentelemetry-resource-detector` [crate](https://github.com/open-telemetry/opentelemetry-rust-contrib/tree/main/opentelemetry-resource-detectors) instead.
- [#1623](https://github.com/open-telemetry/opentelemetry-rust/pull/1623) Add Drop implementation for SdkMeterProvider,
which shuts down metricreaders, thereby allowing metrics still in memory to be flushed out.
- **Breaking** [#1624](https://github.com/open-telemetry/opentelemetry-rust/pull/1624) Remove `OsResourceDetector` and
`ProcessResourceDetector` resource detectors, use the
[`opentelemetry-resource-detector`](https://crates.io/crates/opentelemetry-resource-detectors) instead.

## v0.22.1

Expand Down

0 comments on commit 049e96a

Please sign in to comment.