Skip to content

Commit 9bddb57

Browse files
authored
Merge branch 'main' into no_attribute_atomic_in_resolved_measure
2 parents 4e1cc8e + 58ec379 commit 9bddb57

File tree

71 files changed

+870
-1127
lines changed

Some content is hidden

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

71 files changed

+870
-1127
lines changed

.cspell.json

+3
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"appenders",
3131
"Bhasin",
3232
"Cijo",
33+
"clippy",
3334
"codecov",
3435
"deque",
3536
"Dirkjan",
@@ -40,6 +41,7 @@
4041
"Kühle",
4142
"Kumar",
4243
"Lalit",
44+
"LIBCLANG",
4345
"msrv",
4446
"Ochtman",
4547
"opentelemetry",
@@ -48,6 +50,7 @@
4850
"quantile",
4951
"Redelmeier",
5052
"reqwest",
53+
"runtimes",
5154
"rustc",
5255
"Tescher",
5356
"tracerprovider",

.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

+14-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:
@@ -131,16 +131,17 @@ jobs:
131131
coverage:
132132
continue-on-error: true
133133
runs-on: ubuntu-latest
134+
if: ${{ ! contains(github.event.pull_request.labels.*.name, 'dependencies') }}
134135
steps:
135-
- uses: actions/checkout@v3
136+
- uses: actions/checkout@v4
136137
with:
137138
submodules: true
138139
- uses: actions-rs/toolchain@v1
139140
with:
140141
toolchain: stable
141142
components: rustfmt,llvm-tools-preview
142143
override: true
143-
- uses: arduino/setup-protoc@v1
144+
- uses: arduino/setup-protoc@v3
144145
- name: cargo install cargo-llvm-cov
145146
uses: taiki-e/install-action@cargo-llvm-cov
146147
- 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

CONTRIBUTING.md

+14-36
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The Rust special interest group (SIG) meets weekly on Tuesdays at 9 AM Pacific
44
Time. The meeting is subject to change depending on contributors'
55
availability. Check the [OpenTelemetry community
6-
calendar](https://calendar.google.com/calendar/embed?src=google.com_b79e3e90j7bbsa2n2p5an5lf60%40group.calendar.google.com)
6+
calendar](https://github.com/open-telemetry/community?tab=readme-ov-file#calendar)
77
for specific dates and for Zoom meeting links. "OTel Rust SIG" is the name of
88
meeting for this group.
99

@@ -17,6 +17,15 @@ regardless of your experience level. Whether you're a seasoned OpenTelemetry
1717
developer, just starting your journey, or simply curious about the work we do,
1818
you're more than welcome to participate!
1919

20+
Even though, anybody can contribute, there are benefits of being a member of our
21+
community. See to the [community membership
22+
document](https://github.com/open-telemetry/community/blob/main/community-membership.md)
23+
on how to become a
24+
[**Member**](https://github.com/open-telemetry/community/blob/main/community-membership.md#member),
25+
[**Approver**](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver)
26+
and
27+
[**Maintainer**](https://github.com/open-telemetry/community/blob/main/community-membership.md#maintainer).
28+
2029
## Pull Requests
2130

2231
### Prerequisites
@@ -65,7 +74,7 @@ Open a pull request against the main
6574
repo.
6675

6776
> **Note**
68-
> It is recommended to run [pre-commit script](precommit.sh) from the root of
77+
> It is recommended to run [pre-commit script](scripts/precommit.sh) from the root of
6978
the repo to catch any issues locally.
7079

7180
### How to Receive Comments
@@ -137,7 +146,7 @@ OpenTelemetry supports multiple ways to configure the API, SDK and other compone
137146
- Environment variables
138147
- Compiling time configurations provided in the source code
139148

140-
### Experimental/Unstable features:
149+
### Experimental/Unstable features
141150

142151
Use `otel_unstable` feature flag for implementation of specification with [experimental](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.27.0/specification/document-status.md) status. This approach ensures clear demarcation and safe integration of new or evolving features. Utilize the following structure:
143152

@@ -147,9 +156,10 @@ Use `otel_unstable` feature flag for implementation of specification with [exper
147156
// Your feature implementation
148157
}
149158
```
159+
150160
It's important to regularly review and remove the `otel_unstable` flag from the code once the feature becomes stable. This cleanup process is crucial to maintain the overall code quality and to ensure that stable features are accurately reflected in the main build.
151161

152-
### Optional features:
162+
### Optional features
153163

154164
The potential features include:
155165

@@ -173,38 +183,6 @@ projects in this workspace.
173183
- Run `cargo bench` - this will run benchmarks to show performance
174184
regressions
175185

176-
## Approvers and Maintainers
177-
178-
For GitHub groups see the [code owners](CODEOWNERS) file.
179-
180-
### Maintainers
181-
182-
* [Cijo Thomas](https://github.com/cijothomas)
183-
* [Harold Dost](https://github.com/hdost)
184-
* [Julian Tescher](https://github.com/jtescher)
185-
* [Zhongyang Wu](https://github.com/TommyCpp)
186-
187-
### Approvers
188-
189-
* [Lalit Kumar Bhasin](https://github.com/lalitb)
190-
* [Shaun Cox](https://github.com/shaun-cox)
191-
192-
### Emeritus
193-
194-
- [Dirkjan Ochtman](https://github.com/djc)
195-
- [Jan Kühle](https://github.com/frigus02)
196-
- [Isobel Redelmeier](https://github.com/iredelmeier)
197-
- [Mike Goldsmith](https://github.com/MikeGoldsmith)
198-
199-
### Become an Approver or a Maintainer
200-
201-
See the [community membership document in OpenTelemetry community
202-
repo](https://github.com/open-telemetry/community/blob/master/community-membership.md).
203-
204-
### Thanks to all the people who have contributed
205-
206-
[![contributors](https://contributors-img.web.app/image?repo=open-telemetry/opentelemetry-rust)](https://github.com/open-telemetry/opentelemetry-rust/graphs/contributors)
207-
208186
## FAQ
209187

210188
### Where should I put third party propagators/exporters, contrib or standalone crates?

Cargo.toml

+15-16
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,31 @@ debug = 1
3838
async-std = "1.10"
3939
async-trait = "0.1"
4040
bytes = "1"
41-
env_logger = "0.10" # env_logger requires a newer MSRV
41+
env_logger = { version = "0.10", default-features = false } # env_logger requires a newer MSRV
4242
futures-core = "0.3"
4343
futures-executor = "0.3"
44-
futures-util = "0.3"
45-
hyper = "0.14"
46-
http = "0.2"
47-
isahc = "1.4"
44+
futures-util = { version = "0.3", default-features = false }
45+
hyper = { version = "0.14", default-features = false }
46+
http = { version = "0.2", default-features = false }
47+
isahc = { version = "1.4", default-features = false }
4848
log = "0.4"
4949
once_cell = "1.13"
5050
ordered-float = "4.0"
5151
pin-project-lite = "0.2"
5252
prost = "0.12"
5353
prost-build = "0.12"
5454
prost-types = "0.12"
55-
rand = "0.8"
56-
reqwest = "0.11"
57-
serde = "1.0"
55+
rand = { version = "0.8", default-features = false }
56+
reqwest = { version = "0.11", default-features = false }
57+
serde = { version = "1.0", default-features = false }
5858
serde_json = "1.0"
59-
surf = "2.0"
6059
temp-env = "0.3.6"
61-
thiserror = "1"
62-
tonic = "0.11"
60+
thiserror = { version = "1", default-features = false }
61+
tonic = { version = "0.11", default-features = false }
6362
tonic-build = "0.11"
64-
tokio = "1"
63+
tokio = { version = "1", default-features = false }
6564
tokio-stream = "0.1.1"
66-
tracing = "0.1"
67-
tracing-core = "0.1"
68-
tracing-subscriber = "0.3"
69-
url = "2.2"
65+
tracing = { version = "0.1", default-features = false }
66+
tracing-core = { version = "0.1", default-features = false }
67+
tracing-subscriber = { version = "0.3", default-features = false }
68+
url = { version = "2.2", default-features = false }

0 commit comments

Comments
 (0)