Skip to content

Commit c140e1d

Browse files
authored
Merge branch 'main' into bump-versions
2 parents d6a31b3 + 1be83bb commit c140e1d

File tree

11 files changed

+97
-23
lines changed

11 files changed

+97
-23
lines changed

.github/dependabot.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "cargo"
4+
directory: "/"
5+
schedule:
6+
interval: "monthly"
7+
open-pull-requests-limit: 10
8+
- package-ecosystem: "docker"
9+
directory: "/"
10+
schedule:
11+
interval: "monthly"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "monthly"

.github/workflows/ci.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,29 @@ jobs:
2121
sudo rm -rf /usr/local/lib/android
2222
sudo rm -rf /usr/share/dotnet
2323
df -h
24-
- uses: actions/checkout@v1
24+
- uses: actions/checkout@v4
2525
with:
2626
submodules: true
2727
- uses: actions-rs/toolchain@v1
2828
with:
2929
toolchain: ${{ matrix.rust }}
3030
components: rustfmt
3131
profile: minimal
32-
- uses: arduino/setup-protoc@v1
32+
- uses: arduino/setup-protoc@v3
3333
- name: Test
3434
run: ./scripts/test.sh
3535
lint:
3636
runs-on: ubuntu-latest
3737
steps:
38-
- uses: actions/checkout@v1
38+
- uses: actions/checkout@v4
3939
with:
4040
submodules: true
4141
- uses: actions-rs/toolchain@v1
4242
with:
4343
toolchain: stable
4444
components: rustfmt
4545
profile: minimal
46-
- uses: arduino/setup-protoc@v1
46+
- uses: arduino/setup-protoc@v3
4747
- uses: actions-rs/cargo@v1
4848
with:
4949
command: fmt
@@ -56,7 +56,7 @@ jobs:
5656
example: [opentelemetry, opentelemetry-sdk]
5757
runs-on: ubuntu-latest
5858
steps:
59-
- uses: actions/checkout@v2
59+
- uses: actions/checkout@v4
6060
- uses: actions-rs/toolchain@v1
6161
with:
6262
toolchain: nightly-2024-02-07
@@ -73,23 +73,23 @@ jobs:
7373
example: [opentelemetry-otlp/examples/basic-otlp]
7474
runs-on: ubuntu-latest
7575
steps:
76-
- uses: actions/checkout@v1
76+
- uses: actions/checkout@v4
7777
with:
7878
submodules: true
7979
- uses: actions-rs/toolchain@v1
8080
with:
8181
toolchain: stable
8282
components: rustfmt
8383
profile: minimal
84-
- uses: arduino/setup-protoc@v1
84+
- uses: arduino/setup-protoc@v3
8585
- name: Build
8686
run: |
8787
cd ${{ matrix.example }}
8888
cargo build --verbose
8989
msrv:
9090
runs-on: ubuntu-latest
9191
steps:
92-
- uses: actions/checkout@v1
92+
- uses: actions/checkout@v4
9393
with:
9494
submodules: true
9595
- uses: actions-rs/toolchain@v1
@@ -108,21 +108,21 @@ jobs:
108108
runs-on: ubuntu-latest
109109
continue-on-error: true # Prevent sudden announcement of a new advisory from failing ci
110110
steps:
111-
- uses: actions/checkout@v2
111+
- uses: actions/checkout@v4
112112
- uses: EmbarkStudios/cargo-deny-action@v1
113113
with:
114114
command: check advisories
115115
docs:
116116
continue-on-error: true
117117
runs-on: ubuntu-latest
118118
steps:
119-
- uses: actions/checkout@v2
119+
- uses: actions/checkout@v4
120120
- uses: actions-rs/toolchain@v1
121121
with:
122122
toolchain: nightly
123123
components: rustfmt
124124
override: true
125-
- uses: arduino/setup-protoc@v1
125+
- uses: arduino/setup-protoc@v3
126126
- name: doc
127127
run: cargo doc --no-deps --all-features
128128
env:
@@ -132,15 +132,15 @@ jobs:
132132
continue-on-error: true
133133
runs-on: ubuntu-latest
134134
steps:
135-
- uses: actions/checkout@v3
135+
- uses: actions/checkout@v4
136136
with:
137137
submodules: true
138138
- uses: actions-rs/toolchain@v1
139139
with:
140140
toolchain: stable
141141
components: rustfmt,llvm-tools-preview
142142
override: true
143-
- uses: arduino/setup-protoc@v1
143+
- uses: arduino/setup-protoc@v3
144144
- name: cargo install cargo-llvm-cov
145145
uses: taiki-e/install-action@cargo-llvm-cov
146146
- name: cargo generate-lockfile

.github/workflows/integration_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717
sudo rm -rf /usr/local/lib/android
1818
sudo rm -rf /usr/share/dotnet
1919
df -h
20-
- uses: actions/checkout@v1
20+
- uses: actions/checkout@v4
2121
with:
2222
submodules: true
2323
- uses: actions-rs/toolchain@v1
2424
with:
2525
toolchain: stable
2626
components: rustfmt
2727
profile: minimal
28-
- uses: arduino/setup-protoc@v1
28+
- uses: arduino/setup-protoc@v3
2929
- name: Run integration tests using docker compose
3030
run: ./scripts/integration_tests.sh
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Markdown link check
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
paths:
9+
- '**/*.md'
10+
11+
jobs:
12+
markdown-link-check:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
17+
- name: Install markdown-link-check
18+
run: npm install -g markdown-link-check
19+
20+
- name: Run markdown-link-check
21+
run: |
22+
find . -type f \
23+
-name '*.md' \
24+
-not -path '**/CHANGELOG.md' \
25+
| xargs ./scripts/markdown-link-check-with-retry.sh

opentelemetry-jaeger/README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ opentelemetry-jaeger = { version = "..", features = ["isahc_collector_client"] }
108108

109109
Then you can use the [`with_collector_endpoint`] method to specify the endpoint:
110110

111-
[`with_collector_endpoint`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/struct.PipelineBuilder.html#method.with_collector_endpoint
111+
[`with_collector_endpoint`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/config/collector/struct.CollectorPipeline.html#method.with_endpoint
112112

113113
```rust
114114
// Note that this requires one of the following features enabled so that there is a default http client implementation
@@ -143,10 +143,11 @@ fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
143143

144144
## Kitchen Sink Full Configuration
145145

146-
[Example]((https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/#kitchen-sink-full-configuration)) showing how to override all configuration options. See the
147-
[`PipelineBuilder`] docs for details of each option.
146+
[`Example`] showing how to override all configuration options. See the
147+
[`AgentPipeline`] docs for details of each option.
148148

149-
[`PipelineBuilder`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/struct.PipelineBuilder.html
149+
[`Example`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/#kitchen-sink-full-configuration
150+
[`AgentPipeline`]: https://docs.rs/opentelemetry-jaeger/latest/opentelemetry_jaeger/config/agent/struct.AgentPipeline.html
150151

151152
## Supported Rust Versions
152153

opentelemetry-sdk/README.md

+5
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ From the root directory, run the following command:
3434
```sh
3535
cargo bench
3636
```
37+
38+
## Supported Rust Versions
39+
OpenTelemetry is built against the latest stable release. The minimum supported version is 1.64. The current OpenTelemetry version is not guaranteed to build on Rust versions earlier than the minimum supported version.
40+
41+
The current stable Rust compiler and the three most recent minor versions before it will always be supported. For example, if the current stable compiler version is 1.64, the minimum supported version will not be increased past 1.46, three minor versions prior. Increasing the minimum supported compiler version is not considered a semver breaking change as long as doing so complies with this policy.

opentelemetry-zipkin/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ opentelemetry-http = { version = "0.11", path = "../opentelemetry-http" }
3434
opentelemetry-semantic-conventions = { version = "0.14", path = "../opentelemetry-semantic-conventions" }
3535
serde_json = { workspace = true }
3636
serde = { workspace = true, features = ["derive"] }
37-
typed-builder = "0.12"
37+
typed-builder = "0.18"
3838
http = { workspace = true }
3939
reqwest = { workspace = true, optional = true}
4040
thiserror = { workspace = true }

opentelemetry-zipkin/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ available so be sure to match them appropriately.
9999
[Example](https://docs.rs/opentelemetry-zipkin/latest/opentelemetry_zipkin/#kitchen-sink-full-configuration) showing how to override all configuration options. See the
100100
[`ZipkinPipelineBuilder`] docs for details of each option.
101101

102-
[`ZipkinPipelineBuilder`]: struct.ZipkinPipelineBuilder.html
102+
[`ZipkinPipelineBuilder`]: https://docs.rs/opentelemetry-zipkin/latest/opentelemetry_zipkin/struct.ZipkinPipelineBuilder.html
103103

104104
## Supported Rust Versions
105105

opentelemetry/README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ In particular, the following crates are likely to be of interest:
7171
- [`opentelemetry-contrib`] provides additional exporters and propagators that
7272
are experimental.
7373
- [`opentelemetry-datadog`] provides additional exporters to [`Datadog`].
74-
- [`opentelemetry-dynatrace`] *Deprecated, last release 0.4.0* provides additional exporters to [`Dynatrace`]. See [README](opentelemetry-dynatrace/README.md)
74+
- [`opentelemetry-dynatrace`] *Deprecated, last release 0.4.0* provides additional exporters to [`Dynatrace`]. See [README][`opentelemetry-dynatrace-readme`]
7575
- [`opentelemetry-http`] provides an interface for injecting and extracting
7676
trace information from [`http`] headers.
7777
- [`opentelemetry-jaeger`] provides a pipeline and exporter for sending trace
@@ -119,6 +119,7 @@ above, please let us know! We'd love to add your project to the list!
119119
[`Dynatrace`]: https://www.dynatrace.com
120120
[`opentelemetry-datadog`]: https://crates.io/crates/opentelemetry-datadog
121121
[`opentelemetry-dynatrace`]: https://crates.io/crates/opentelemetry-dynatrace
122+
[`opentelemetry-dynatrace-readme`]: https://github.com/open-telemetry/opentelemetry-rust-contrib/blob/main/opentelemetry-dynatrace/README.md
122123
[`opentelemetry-semantic-conventions`]: https://crates.io/crates/opentelemetry-semantic-conventions
123124
[`http`]: https://crates.io/crates/http
124125

@@ -148,4 +149,4 @@ this policy.
148149

149150
## Contributing
150151

151-
See the [contributing file](CONTRIBUTING.md).
152+
See the [contributing file](../CONTRIBUTING.md).
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"httpHeaders": [
3+
{
4+
"urls": ["https://crates.io"],
5+
"headers": {
6+
"Accept": "text/html"
7+
}
8+
}
9+
]
10+
}
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash -e
2+
3+
# this script helps to reduce sporadic link check failures by retrying at a file-by-file level
4+
5+
retry_count=3
6+
7+
for file in "$@"; do
8+
for i in $(seq 1 $retry_count); do
9+
if markdown-link-check --config "$(dirname "$0")/markdown-link-check-config.json" \
10+
"$file"; then
11+
break
12+
elif [[ $i -eq $retry_count ]]; then
13+
exit 1
14+
fi
15+
sleep 5
16+
done
17+
done

0 commit comments

Comments
 (0)