Skip to content

Commit be68e0a

Browse files
lalitblalitb
authored
Merge branch 'main' into logs-integration-test
2 parents 254bad5 + 2863632 commit be68e0a

File tree

48 files changed

+414
-226
lines changed

Some content is hidden

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

48 files changed

+414
-226
lines changed

‎.github/workflows/ci.yml

+12
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
- name: "Set rustup profile"
4141
run: rustup set profile minimal
4242
- uses: arduino/setup-protoc@v3
43+
with:
44+
repo-token: ${{ secrets.GITHUB_TOKEN }}
4345
- name: Test
4446
run: bash ./scripts/test.sh
4547
lint:
@@ -52,6 +54,8 @@ jobs:
5254
with:
5355
components: rustfmt
5456
- uses: arduino/setup-protoc@v3
57+
with:
58+
repo-token: ${{ secrets.GITHUB_TOKEN }}
5559
- uses: actions-rs/cargo@v1
5660
with:
5761
command: fmt
@@ -88,6 +92,8 @@ jobs:
8892
with:
8993
components: rustfmt
9094
- uses: arduino/setup-protoc@v3
95+
with:
96+
repo-token: ${{ secrets.GITHUB_TOKEN }}
9197
- name: Build
9298
run: |
9399
cd ${{ matrix.example }}
@@ -126,6 +132,8 @@ jobs:
126132
with:
127133
components: rustfmt
128134
- uses: arduino/setup-protoc@v3
135+
with:
136+
repo-token: ${{ secrets.GITHUB_TOKEN }}
129137
- name: doc
130138
run: cargo doc --no-deps --all-features
131139
env:
@@ -144,6 +152,8 @@ jobs:
144152
toolchain: stable
145153
components: rustfmt,llvm-tools-preview
146154
- uses: arduino/setup-protoc@v3
155+
with:
156+
repo-token: ${{ secrets.GITHUB_TOKEN }}
147157
- name: cargo install cargo-llvm-cov
148158
uses: taiki-e/install-action@cargo-llvm-cov
149159
- name: cargo generate-lockfile
@@ -153,5 +163,7 @@ jobs:
153163
run: cargo llvm-cov --locked --all-features --workspace --lcov --output-path lcov.info
154164
- name: Upload to codecov.io
155165
uses: codecov/codecov-action@v4
166+
env:
167+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
156168
with:
157169
fail_ci_if_error: true

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Registry](https://opentelemetry.io/ecosystem/registry/?language=rust).
159159
## Supported Rust Versions
160160

161161
OpenTelemetry is built against the latest stable release. The minimum supported
162-
version is 1.64. The current OpenTelemetry version is not guaranteed to build
162+
version is 1.65. The current OpenTelemetry version is not guaranteed to build
163163
on Rust versions earlier than the minimum supported version.
164164

165165
The current stable Rust compiler and the three most recent minor versions

‎RELEASING.md

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ A draft PR can be created, but before releasing consider the following:
4242
5. [Publish](#publishing-crates) to crates.io using the version as of the release commit
4343
6. Post to [#otel-rust](https://cloud-native.slack.com/archives/C03GDP0H023) on CNCF Slack.
4444

45+
[Publish.sh](./scripts/publish.sh) may be used to automate steps 3 and 5.
46+
4547
## Tagging Convention
4648

4749
For each crate: it should be `<crate-name>-<version>` `<version>` being the simple `X.Y.Z`.

‎opentelemetry-appender-log/CHANGELOG.md

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

33
## vNext
44

5+
## v0.4.0
6+
57
- Add log key-values as attributes [#1628](https://github.com/open-telemetry/opentelemetry-rust/pull/1628)
8+
- Update `opentelemetry` dependency version to 0.23
69

710
## v0.3.0
811

‎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.3.0"
3+
version = "0.4.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.22", path = "../opentelemetry", features = ["logs"]}
14+
opentelemetry = { version = "0.23", 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

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

33
## vNext
44

5+
## v0.4.0
6+
57
- Removed unwanted dependency on opentelemetry-sdk.
8+
- Update `opentelemetry` dependency version to 0.23
69

710
## v0.3.0
811

‎opentelemetry-appender-tracing/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-appender-tracing"
3-
version = "0.3.0"
3+
version = "0.4.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"
@@ -13,7 +13,7 @@ rust-version = "1.65"
1313
[dependencies]
1414
log = { workspace = true, optional = true }
1515
once_cell = { workspace = true }
16-
opentelemetry = { version = "0.22", path = "../opentelemetry", features = ["logs"] }
16+
opentelemetry = { version = "0.23", path = "../opentelemetry", features = ["logs"] }
1717
tracing = { workspace = true, features = ["std"]}
1818
tracing-core = { workspace = true }
1919
tracing-log = { version = "0.2", optional = true }
@@ -29,7 +29,7 @@ criterion = "0.5.1"
2929

3030
[features]
3131
experimental_metadata_attributes = ["dep:tracing-log"]
32-
logs_level_enabled = ["opentelemetry/logs_level_enabled", "opentelemetry_sdk/logs_level_enabled"]
32+
logs_level_enabled = ["opentelemetry/logs_level_enabled"]
3333
default = ["logs_level_enabled"]
3434

3535

‎opentelemetry-http/CHANGELOG.md

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

33
## vNext
44

5+
## v0.12.0
6+
57
- Add `reqwest-rustls-webkpi-roots` feature flag to configure [`reqwest`](https://docs.rs/reqwest/0.11.27/reqwest/index.html#optional-features) to use embedded `webkpi-roots`.
8+
- Update `opentelemetry` dependency version to 0.23
69

710
## v0.11.1
811

‎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.11.1"
3+
version = "0.12.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"
@@ -19,6 +19,6 @@ bytes = { workspace = true }
1919
http = { workspace = true }
2020
hyper = { workspace = true, features = ["http2", "client", "tcp"], optional = true }
2121
isahc = { workspace = true, optional = true }
22-
opentelemetry = { version = "0.22", path = "../opentelemetry", features = ["trace"] }
22+
opentelemetry = { version = "0.23", path = "../opentelemetry", features = ["trace"] }
2323
reqwest = { workspace = true, features = ["blocking"], optional = true }
2424
tokio = { workspace = true, features = ["time"], optional = true }

‎opentelemetry-http/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ analysis in order to understand your software's performance and behavior. This
1818
crate provides a HTTP client interface for use by trace exporters, as well as
1919
helper types to inject and extract key value pairs into/from HTTP headers.
2020

21-
*Compiler support: [requires `rustc` 1.64+][msrv]*
21+
*Compiler support: [requires `rustc` 1.65+][msrv]*
2222

2323
[`OpenTelemetry`]: https://crates.io/crates/opentelemetry
2424
[msrv]: #supported-rust-versions
2525

2626
## Supported Rust Versions
2727

2828
OpenTelemetry is built against the latest stable release. The minimum supported
29-
version is 1.64. The current OpenTelemetry version is not guaranteed to build
29+
version is 1.65. The current OpenTelemetry version is not guaranteed to build
3030
on Rust versions earlier than the minimum supported version.
3131

3232
The current stable Rust compiler and the three most recent minor versions

‎opentelemetry-jaeger-propagator/CHANGELOG.md

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

33
## vNext
44

5+
## v0.2.0
6+
57
### Changed
68

79
- Propagation error will be reported to global error handler [#1640](https://github.com/open-telemetry/opentelemetry-rust/pull/1640)
10+
- Update `opentelemetry` dependency version to 0.23
811

912
## v0.1.0
1013

‎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.1.0"
3+
version = "0.2.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.22", default-features = false, features = [
23+
opentelemetry = { version = "0.23", default-features = false, features = [
2424
"trace",
2525
], path = "../opentelemetry" }
2626

‎opentelemetry-jaeger-propagator/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ generate, collect, and export telemetry data (metrics, logs, and traces) for
1919
analysis in order to understand your software's performance and behavior. This
2020
crate provides the ability to create and interact with a Jaeger propagator.
2121

22-
*Compiler support: [requires `rustc` 1.64+][msrv]*
22+
*Compiler support: [requires `rustc` 1.65+][msrv]*
2323

2424
[`Jaeger`]: https://www.jaegertracing.io/
2525
[`OpenTelemetry`]: https://crates.io/crates/opentelemetry
@@ -28,7 +28,7 @@ crate provides the ability to create and interact with a Jaeger propagator.
2828
## Supported Rust Versions
2929

3030
OpenTelemetry is built against the latest stable release. The minimum supported
31-
version is 1.64. The current OpenTelemetry version is not guaranteed to build
31+
version is 1.65. The current OpenTelemetry version is not guaranteed to build
3232
on Rust versions earlier than the minimum supported version.
3333

3434
The current stable Rust compiler and the three most recent minor versions

‎opentelemetry-jaeger/CHANGELOG.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,15 @@ Starting with [Jaeger v1.38](https://github.com/jaegertracing/jaeger/releases/ta
77

88
Please check the [README](https://crates.io/crates/opentelemetry-jaeger) for more information.
99

10-
## vNext
10+
## v0.22.0
11+
12+
- **This is the last release of this crate.**
13+
Jaeger propagator is part of [opentelemetry-jaeger-propagator](../opentelemetry-jaeger-propagator/).
14+
For exporting to Jaeger, use [opentelemetry-otlp](../opentelemetry-otlp/).
15+
- Update `opentelemetry` dependency version to 0.23
16+
- Update `opentelemetry_sdk` dependency version to 0.23
17+
- Update `opentelemetry-http` dependency version to 0.12
18+
- Update `opentelemetry-semantic-conventions` dependency version to 0.15
1119

1220
## v0.21.0
1321

‎opentelemetry-jaeger/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-jaeger"
3-
version = "0.21.0"
3+
version = "0.22.0"
44
description = "Jaeger exporter for OpenTelemetry"
55
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger"
66
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger"
@@ -32,10 +32,10 @@ hyper = { workspace = true, features = ["client"], optional = true }
3232
hyper-tls = { version = "0.5.0", default-features = false, optional = true }
3333
isahc = { workspace = true, optional = true }
3434
js-sys = { version = "0.3", optional = true }
35-
opentelemetry = { version = "0.22", default-features = false, features = ["trace"], path = "../opentelemetry" }
36-
opentelemetry_sdk = { version = "0.22", default-features = false, features = ["trace"], path = "../opentelemetry-sdk" }
37-
opentelemetry-http = { version = "0.11", path = "../opentelemetry-http", optional = true }
38-
opentelemetry-semantic-conventions = { version = "0.14", path = "../opentelemetry-semantic-conventions" }
35+
opentelemetry = { version = "0.23", default-features = false, features = ["trace"], path = "../opentelemetry" }
36+
opentelemetry_sdk = { version = "0.23", default-features = false, features = ["trace"], path = "../opentelemetry-sdk" }
37+
opentelemetry-http = { version = "0.12", path = "../opentelemetry-http", optional = true }
38+
opentelemetry-semantic-conventions = { version = "0.15", path = "../opentelemetry-semantic-conventions" }
3939
pin-project-lite = { workspace = true, optional = true }
4040
reqwest = { workspace = true, optional = true }
4141
thrift = "0.17.0"
@@ -56,7 +56,7 @@ futures-util = { workspace = true, features = ["std", "alloc"]}
5656
tokio = { workspace = true, features = ["net", "sync"] }
5757
bytes = { workspace = true }
5858
futures-executor = { workspace = true }
59-
opentelemetry-jaeger-propagator = { version = "0.1", path = "../opentelemetry-jaeger-propagator" } # for doctests
59+
opentelemetry-jaeger-propagator = { path = "../opentelemetry-jaeger-propagator" } # for doctests
6060
opentelemetry_sdk = { features = ["trace", "testing", "rt-tokio"], path = "../opentelemetry-sdk" }
6161

6262
[dependencies.web-sys]

‎opentelemetry-jaeger/README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The opentelemetry-jaeger crate previously contained both a Jaeger exporter and a
1414
To prepare for the deprecation of the Jaeger exporter, the Jaeger propagator implementation has been migrated to
1515
[opentelemetry-jaeger-propagator](../opentelemetry-jaeger-propagator/).
1616

17-
The plan is to have 0.22.0 be the last release of the Jaeger exporter. This means that future versions of the OpenTelemetry
17+
The 0.22.0 is the last release of the Jaeger exporter. This means that future versions of the OpenTelemetry
1818
SDK will not work with the exporter.
1919

2020
If you have any questions please comment on the [Jaeger Deprecation Issue][deprecation-issue].
@@ -35,14 +35,14 @@ analysis in order to understand your software's performance and behavior. This
3535
crate provides a trace pipeline and exporter for sending span information to a
3636
Jaeger `agent` or `collector` endpoint for processing and visualization.
3737

38-
*Compiler support: [requires `rustc` 1.64+][msrv]*
38+
*Compiler support: [requires `rustc` 1.65+][msrv]*
3939

4040
[`Jaeger`]: https://www.jaegertracing.io/
4141
[jaeger-otlp]: https://medium.com/jaegertracing/introducing-native-support-for-opentelemetry-in-jaeger-eb661be8183c
4242
[jaeger-deprecation]: https://opentelemetry.io/blog/2022/jaeger-native-otlp/
4343
[exporting-otlp]: https://github.com/open-telemetry/opentelemetry-rust/tree/main/examples/tracing-jaeger
4444
[Jaeger 1.35.0]: https://github.com/jaegertracing/jaeger/releases/tag/v1.35.0
45-
[deprecation-issue]: https://github.com/open-telemetry/opentelemetry-rust/pull/995
45+
[deprecation-issue]: https://github.com/open-telemetry/opentelemetry-rust/issues/995
4646
[`OpenTelemetry`]: https://crates.io/crates/opentelemetry
4747
[msrv]: #supported-rust-versions
4848

@@ -167,7 +167,7 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
167167
## Supported Rust Versions
168168

169169
OpenTelemetry is built against the latest stable release. The minimum supported
170-
version is 1.64. The current OpenTelemetry version is not guaranteed to build
170+
version is 1.65. The current OpenTelemetry version is not guaranteed to build
171171
on Rust versions earlier than the minimum supported version.
172172

173173
The current stable Rust compiler and the three most recent minor versions

‎opentelemetry-otlp/CHANGELOG.md

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

33
## vNext
44

5+
## v0.16.0
6+
57
### Fixed
68

79
- URL encoded values in `OTEL_EXPORTER_OTLP_HEADERS` are now correctly decoded. [#1578](https://github.com/open-telemetry/opentelemetry-rust/pull/1578)
@@ -11,10 +13,6 @@
1113

1214
### Added
1315

14-
- Aded `http/json` support for all signals ([#1585])
15-
16-
[#1585]: https://github.com/open-telemetry/opentelemetry-rust/pull/1585
17-
1816
- Added `DeltaTemporalitySelector` ([#1568])
1917
- Add `webkpi-roots` features to `reqwest` and `tonic` backends
2018

@@ -24,6 +22,10 @@
2422
- **Breaking** Remove global provider for Logs [#1691](https://github.com/open-telemetry/opentelemetry-rust/pull/1691/)
2523
- The method OtlpLogPipeline::install_simple() and OtlpLogPipeline::install_batch() now return `LoggerProvider` instead of
2624
`Logger`. Refer to the [basic-otlp](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-otlp/examples/basic-otlp/src/main.rs) and [basic-otlp-http](https://github.com/open-telemetry/opentelemetry-rust/blob/main/opentelemetry-otlp/examples/basic-otlp-http/src/main.rs) examples for how to initialize OTLP Log Exporter to use with OpenTelemetryLogBridge and OpenTelemetryTracingBridge respectively.
25+
- Update `opentelemetry` dependency version to 0.23
26+
- Update `opentelemetry_sdk` dependency version to 0.23
27+
- Update `opentelemetry-http` dependency version to 0.12
28+
- Update `opentelemetry-proto` dependency version to 0.6
2729

2830
## v0.15.0
2931

‎opentelemetry-otlp/Cargo.toml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opentelemetry-otlp"
3-
version = "0.15.0"
3+
version = "0.16.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,11 +28,10 @@ rustdoc-args = ["--cfg", "docsrs"]
2828
[dependencies]
2929
async-trait = { workspace = true }
3030
futures-core = { workspace = true }
31-
opentelemetry = { version = "0.22", default-features = false, path = "../opentelemetry" }
32-
opentelemetry_sdk = { version = "0.22", default-features = false, path = "../opentelemetry-sdk" }
33-
opentelemetry-http = { version = "0.11", path = "../opentelemetry-http", optional = true }
34-
opentelemetry-proto = { version = "0.5", path = "../opentelemetry-proto", default-features = false }
35-
opentelemetry-semantic-conventions = { version = "0.14", path = "../opentelemetry-semantic-conventions" }
31+
opentelemetry = { version = "0.23", default-features = false, path = "../opentelemetry" }
32+
opentelemetry_sdk = { version = "0.23", default-features = false, path = "../opentelemetry-sdk" }
33+
opentelemetry-http = { version = "0.12", path = "../opentelemetry-http", optional = true }
34+
opentelemetry-proto = { version = "0.6", path = "../opentelemetry-proto", default-features = false }
3635

3736
prost = { workspace = true, optional = true }
3837
tonic = { workspace = true, optional = true }
@@ -72,7 +71,7 @@ tls-webkpi-roots = ["tls", "tonic/tls-webpki-roots"]
7271

7372
# http binary
7473
http-proto = ["prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "http", "trace", "metrics"]
75-
# http json
74+
# http json This does not work today due to known issue. See https://github.com/open-telemetry/opentelemetry-rust/issues/1763.
7675
http-json = ["serde_json", "prost", "opentelemetry-http", "opentelemetry-proto/gen-tonic-messages", "opentelemetry-proto/with-serde", "http", "trace", "metrics"]
7776
reqwest-blocking-client = ["reqwest/blocking", "opentelemetry-http/reqwest"]
7877
reqwest-client = ["reqwest", "opentelemetry-http/reqwest"]

0 commit comments

Comments
 (0)