Skip to content

Commit aa7358e

Browse files
authored
Merge branch 'main' into validation-framework-transport-header
2 parents c6d1127 + bc4cec8 commit aa7358e

23 files changed

Lines changed: 3864 additions & 219 deletions

.github/workflows/rust-validation-tests.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ permissions:
1515

1616
on:
1717
workflow_dispatch:
18+
inputs:
19+
pr_number:
20+
description: "Pull request number to run validation tests against"
21+
required: true
22+
type: number
23+
24+
# Cancel in-progress runs for the same PR if a new manual run is started
25+
concurrency:
26+
group: ${{ github.workflow }}-${{ inputs.pr_number }}
27+
cancel-in-progress: true
1828

1929
env:
2030
CARGO_TERM_COLOR: always
@@ -23,9 +33,12 @@ jobs:
2333
validation_tests:
2434
runs-on: ubuntu-latest
2535
steps:
26-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
36+
- name: Checkout PR merge ref
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2738
with:
39+
ref: refs/pull/${{ inputs.pr_number }}/merge
2840
submodules: true
41+
fetch-depth: 0
2942
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
3043
with:
3144
repo-token: ${{ secrets.GITHUB_TOKEN }}

rust/otap-dataflow/crates/pdata/src/otap/transform/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ macro_rules! id_column_dispatch {
7272
pub(crate) use id_column_dispatch;
7373

7474
/// Create a new record batch by taking the specified ranges from the provided record batch.
75-
pub(crate) fn take_record_batch_ranges(
75+
pub fn take_record_batch_ranges(
7676
rb: &RecordBatch,
7777
ranges: &[Range<usize>],
7878
) -> arrow::error::Result<RecordBatch> {

rust/otap-dataflow/crates/query-engine/src/consts.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
pub(crate) const ATTRIBUTES_FIELD_NAME: &str = "attributes";
5+
pub(crate) const BODY_FIELD_NAME: &str = "body";
56
pub(crate) const RESOURCES_FIELD_NAME: &str = "resource";
67
pub(crate) const SCOPE_FIELD_NAME: &str = "instrumentation_scope";
78
pub(crate) const VALUE_FIELD_NAME: &str = "value";

rust/otap-dataflow/crates/query-engine/src/pipeline/assign.rs

Lines changed: 923 additions & 10 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)