Skip to content

Commit 23d1d8b

Browse files
authored
Merge branch 'main' into extractor_get_all
2 parents a8d975e + 7b3db0b commit 23d1d8b

File tree

13 files changed

+557
-225
lines changed

13 files changed

+557
-225
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
with:
7373
toolchain: stable
7474
components: rustfmt, clippy
75-
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
75+
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
7676
with:
7777
tool: cargo-hack
7878
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -100,7 +100,7 @@ jobs:
100100
# https://github.com/awslabs/cargo-check-external-types/releases
101101
toolchain: nightly-2025-05-04
102102
components: rustfmt
103-
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
103+
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
104104
with:
105105
106106
- name: external-type-check
@@ -124,7 +124,7 @@ jobs:
124124
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
125125
with:
126126
toolchain: stable
127-
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
127+
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
128128
with:
129129
tool: cargo-msrv
130130
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
@@ -206,7 +206,7 @@ jobs:
206206
with:
207207
repo-token: ${{ secrets.GITHUB_TOKEN }}
208208
- name: Install cargo-llvm-cov
209-
uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
209+
uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
210210
with:
211211
tool: cargo-llvm-cov
212212
- name: cargo generate-lockfile
@@ -215,7 +215,7 @@ jobs:
215215
- name: cargo llvm-cov
216216
run: cargo llvm-cov --locked --all-features --workspace --lcov --lib --output-path lcov.info
217217
- name: Upload to codecov.io
218-
uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
218+
uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
219219
env:
220220
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
221221
with:
@@ -253,7 +253,7 @@ jobs:
253253
- uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b
254254
with:
255255
toolchain: stable
256-
- uses: taiki-e/install-action@33734a118689b0b418824fb78ea2bf18e970b43b # v2.50.4
256+
- uses: taiki-e/install-action@735e5933943122c5ac182670a935f54a949265c1 # v2.52.4
257257
with:
258258
tool: cargo-machete
259259
- name: cargo machete

.github/workflows/fossa.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2121

22-
- uses: fossas/fossa-action@c0a7d013f84c8ee5e910593186598625513cc1e4 # v1.6.0
22+
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
2323
with:
2424
api-key: ${{secrets.FOSSA_API_KEY}}
2525
team: OpenTelemetry

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
persist-credentials: false
3131

32-
- uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
32+
- uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3333
with:
3434
results_file: results.sarif
3535
results_format: sarif

opentelemetry-proto/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## vNext
44

5+
- Update proto definitions to v1.7.0.
6+
57
## 0.30.0
68

79
Released 2025-May-23

opentelemetry-proto/src/proto/tonic/opentelemetry.proto.profiles.v1development.rs

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,35 @@
11
// This file is @generated by prost-build.
2+
/// ProfilesDictionary represents the profiles data shared across the
3+
/// entire message being sent.
4+
#[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
5+
#[cfg_attr(feature = "with-serde", derive(serde::Serialize, serde::Deserialize))]
6+
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
7+
#[derive(Clone, PartialEq, ::prost::Message)]
8+
pub struct ProfilesDictionary {
9+
/// Mappings from address ranges to the image/binary/library mapped
10+
/// into that address range referenced by locations via Location.mapping_index.
11+
#[prost(message, repeated, tag = "1")]
12+
pub mapping_table: ::prost::alloc::vec::Vec<Mapping>,
13+
/// Locations referenced by samples via Profile.location_indices.
14+
#[prost(message, repeated, tag = "2")]
15+
pub location_table: ::prost::alloc::vec::Vec<Location>,
16+
/// Functions referenced by locations via Line.function_index.
17+
#[prost(message, repeated, tag = "3")]
18+
pub function_table: ::prost::alloc::vec::Vec<Function>,
19+
/// Links referenced by samples via Sample.link_index.
20+
#[prost(message, repeated, tag = "4")]
21+
pub link_table: ::prost::alloc::vec::Vec<Link>,
22+
/// A common table for strings referenced by various messages.
23+
/// string_table\[0\] must always be "".
24+
#[prost(string, repeated, tag = "5")]
25+
pub string_table: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
26+
/// A common table for attributes referenced by various messages.
27+
#[prost(message, repeated, tag = "6")]
28+
pub attribute_table: ::prost::alloc::vec::Vec<super::super::common::v1::KeyValue>,
29+
/// Represents a mapping between Attribute Keys and Units.
30+
#[prost(message, repeated, tag = "7")]
31+
pub attribute_units: ::prost::alloc::vec::Vec<AttributeUnit>,
32+
}
233
/// ProfilesData represents the profiles data that can be stored in persistent storage,
334
/// OR can be embedded by other protocols that transfer OTLP profiles data but do not
435
/// implement the OTLP protocol.
@@ -23,29 +54,9 @@ pub struct ProfilesData {
2354
/// Resource.attributes and semantic conventions.
2455
#[prost(message, repeated, tag = "1")]
2556
pub resource_profiles: ::prost::alloc::vec::Vec<ResourceProfiles>,
26-
/// Mappings from address ranges to the image/binary/library mapped
27-
/// into that address range referenced by locations via Location.mapping_index.
28-
#[prost(message, repeated, tag = "2")]
29-
pub mapping_table: ::prost::alloc::vec::Vec<Mapping>,
30-
/// Locations referenced by samples via Profile.location_indices.
31-
#[prost(message, repeated, tag = "3")]
32-
pub location_table: ::prost::alloc::vec::Vec<Location>,
33-
/// Functions referenced by locations via Line.function_index.
34-
#[prost(message, repeated, tag = "4")]
35-
pub function_table: ::prost::alloc::vec::Vec<Function>,
36-
/// Links referenced by samples via Sample.link_index.
37-
#[prost(message, repeated, tag = "5")]
38-
pub link_table: ::prost::alloc::vec::Vec<Link>,
39-
/// A common table for strings referenced by various messages.
40-
/// string_table\[0\] must always be "".
41-
#[prost(string, repeated, tag = "6")]
42-
pub string_table: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
43-
/// A common table for attributes referenced by various messages.
44-
#[prost(message, repeated, tag = "7")]
45-
pub attribute_table: ::prost::alloc::vec::Vec<super::super::common::v1::KeyValue>,
46-
/// Represents a mapping between Attribute Keys and Units.
47-
#[prost(message, repeated, tag = "8")]
48-
pub attribute_units: ::prost::alloc::vec::Vec<AttributeUnit>,
57+
/// One instance of ProfilesDictionary
58+
#[prost(message, optional, tag = "2")]
59+
pub dictionary: ::core::option::Option<ProfilesDictionary>,
4960
}
5061
/// A collection of ScopeProfiles from a Resource.
5162
#[cfg_attr(feature = "with-schemars", derive(schemars::JsonSchema))]
@@ -116,7 +127,7 @@ pub struct Profile {
116127
/// The set of samples recorded in this profile.
117128
#[prost(message, repeated, tag = "2")]
118129
pub sample: ::prost::alloc::vec::Vec<Sample>,
119-
/// References to locations in ProfilesData.location_table.
130+
/// References to locations in ProfilesDictionary.location_table.
120131
#[prost(int32, repeated, tag = "3")]
121132
pub location_indices: ::prost::alloc::vec::Vec<i32>,
122133
/// Time of collection (UTC) represented as nanoseconds past the epoch.
@@ -145,7 +156,7 @@ pub struct Profile {
145156
/// for human-friendly content. The profile must stay functional if this field
146157
/// is cleaned.
147158
///
148-
/// Indices into ProfilesData.string_table.
159+
/// Indices into ProfilesDictionary.string_table.
149160
#[prost(int32, repeated, tag = "8")]
150161
pub comment_strindices: ::prost::alloc::vec::Vec<i32>,
151162
/// Index into the sample_type array to the default sample type.
@@ -230,10 +241,10 @@ pub struct Link {
230241
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
231242
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
232243
pub struct ValueType {
233-
/// Index into ProfilesData.string_table.
244+
/// Index into ProfilesDictionary.string_table.
234245
#[prost(int32, tag = "1")]
235246
pub type_strindex: i32,
236-
/// Index into ProfilesData.string_table.
247+
/// Index into ProfilesDictionary.string_table.
237248
#[prost(int32, tag = "2")]
238249
pub unit_strindex: i32,
239250
#[prost(enumeration = "AggregationTemporality", tag = "3")]
@@ -263,10 +274,10 @@ pub struct Sample {
263274
/// lists of the originals.
264275
#[prost(int64, repeated, tag = "3")]
265276
pub value: ::prost::alloc::vec::Vec<i64>,
266-
/// References to attributes in ProfilesData.attribute_table. \[optional\]
277+
/// References to attributes in ProfilesDictionary.attribute_table. \[optional\]
267278
#[prost(int32, repeated, tag = "4")]
268279
pub attribute_indices: ::prost::alloc::vec::Vec<i32>,
269-
/// Reference to link in ProfilesData.link_table. \[optional\]
280+
/// Reference to link in ProfilesDictionary.link_table. \[optional\]
270281
#[prost(int32, optional, tag = "5")]
271282
pub link_index: ::core::option::Option<i32>,
272283
/// Timestamps associated with Sample represented in nanoseconds. These timestamps are expected
@@ -301,10 +312,10 @@ pub struct Mapping {
301312
/// disk for the main binary and shared libraries, or virtual
302313
/// abstractions like "\[vdso\]".
303314
///
304-
/// Index into ProfilesData.string_table.
315+
/// Index into ProfilesDictionary.string_table.
305316
#[prost(int32, tag = "4")]
306317
pub filename_strindex: i32,
307-
/// References to attributes in ProfilesData.attribute_table. \[optional\]
318+
/// References to attributes in ProfilesDictionary.attribute_table. \[optional\]
308319
#[prost(int32, repeated, tag = "5")]
309320
pub attribute_indices: ::prost::alloc::vec::Vec<i32>,
310321
/// The following fields indicate the resolution of symbolic info.
@@ -323,7 +334,7 @@ pub struct Mapping {
323334
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
324335
#[derive(Clone, PartialEq, ::prost::Message)]
325336
pub struct Location {
326-
/// Reference to mapping in ProfilesData.mapping_table.
337+
/// Reference to mapping in ProfilesDictionary.mapping_table.
327338
/// It can be unset if the mapping is unknown or not applicable for
328339
/// this profile type.
329340
#[prost(int32, optional, tag = "1")]
@@ -351,7 +362,7 @@ pub struct Location {
351362
/// profile changes.
352363
#[prost(bool, tag = "4")]
353364
pub is_folded: bool,
354-
/// References to attributes in ProfilesData.attribute_table. \[optional\]
365+
/// References to attributes in ProfilesDictionary.attribute_table. \[optional\]
355366
#[prost(int32, repeated, tag = "5")]
356367
pub attribute_indices: ::prost::alloc::vec::Vec<i32>,
357368
}
@@ -361,7 +372,7 @@ pub struct Location {
361372
#[cfg_attr(feature = "with-serde", serde(rename_all = "camelCase"))]
362373
#[derive(Clone, Copy, PartialEq, ::prost::Message)]
363374
pub struct Line {
364-
/// Reference to function in ProfilesData.function_table.
375+
/// Reference to function in ProfilesDictionary.function_table.
365376
#[prost(int32, tag = "1")]
366377
pub function_index: i32,
367378
/// Line number in source code. 0 means unset.

opentelemetry-semantic-conventions/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## vNext
44

5+
- Update to [v1.34.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.34.0) of the semantic conventions.
6+
57
## 0.30.0
68

79
Released 2025-May-23

opentelemetry-semantic-conventions/scripts/generate-consts-from-spec.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
55
CRATE_DIR="${SCRIPT_DIR}/../"
66

77
# freeze the spec version and generator version to make generation reproducible
8-
SPEC_VERSION=1.33.0
9-
WEAVER_VERSION=v0.15.0
8+
SPEC_VERSION=1.34.0
9+
WEAVER_VERSION=v0.15.2
1010

1111
cd "$CRATE_DIR"
1212

opentelemetry-semantic-conventions/scripts/templates/registry/rust/weaver.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ comment_formats:
1414
default_comment_format: rust
1515

1616
params:
17-
schema_url: "https://opentelemetry.io/schemas/1.33.0"
17+
schema_url: "https://opentelemetry.io/schemas/1.34.0"
1818
exclude_root_namespace: []
1919
excluded_attributes: ["messaging.client_id"]
2020

0 commit comments

Comments
 (0)