Skip to content

Commit 29cc07f

Browse files
g-talbotg-talbot
committed
fix: license headers + cfg(not(test)) for quickwit-dst and quickwit-cli
1 parent b764097 commit 29cc07f

13 files changed

Lines changed: 115 additions & 170 deletions

File tree

‎quickwit/quickwit-cli/src/logger.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ pub fn setup_logging_and_tracing(
161161
))
162162
}
163163

164-
#[cfg(not(any(test, feature = "testsuite")))]
164+
#[cfg(not(test))]
165165
pub fn setup_dogstatsd_exporter(build_info: &BuildInfo) -> anyhow::Result<()> {
166166
// Reading both `CLOUDPREM_*` and `CP_*` env vars for backward compatibility. The former is
167167
// deprecated and can be removed after 2026-04-01.
@@ -206,12 +206,12 @@ pub fn setup_dogstatsd_exporter(build_info: &BuildInfo) -> anyhow::Result<()> {
206206
///
207207
/// Must be called after [`setup_dogstatsd_exporter`] so the `metrics` crate
208208
/// has a registered recorder.
209-
#[cfg(not(any(test, feature = "testsuite")))]
209+
#[cfg(not(test))]
210210
pub fn setup_invariant_recorder() {
211211
quickwit_dst::invariants::set_invariant_recorder(invariant_recorder);
212212
}
213213

214-
#[cfg(not(any(test, feature = "testsuite")))]
214+
#[cfg(not(test))]
215215
fn invariant_recorder(id: quickwit_dst::invariants::InvariantId, passed: bool) {
216216
let name = id.as_str();
217217
metrics::counter!("pomsky.invariant.checked", "invariant" => name).increment(1);

‎quickwit/quickwit-cli/src/main.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ async fn main_impl() -> anyhow::Result<()> {
101101
let (env_filter_reload_fn, tracer_provider_opt) =
102102
setup_logging_and_tracing(command.default_log_level(), ansi_colors, build_info)?;
103103

104-
#[cfg(not(any(test, feature = "testsuite")))]
104+
#[cfg(not(test))]
105105
quickwit_cli::logger::setup_dogstatsd_exporter(build_info)?;
106106

107-
#[cfg(not(any(test, feature = "testsuite")))]
107+
#[cfg(not(test))]
108108
quickwit_cli::logger::setup_invariant_recorder();
109109

110110
let return_code: i32 = if let Err(command_error) = command.execute(env_filter_reload_fn).await {

‎quickwit/quickwit-dst/src/invariants/check.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Invariant checking macro — Layers 3 + 4 of the verification stack.
2116
//!

‎quickwit/quickwit-dst/src/invariants/mod.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Shared invariant definitions — the single source of truth.
2116
//!

‎quickwit/quickwit-dst/src/invariants/recorder.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Pluggable invariant recorder — Layer 4 of the verification stack.
2116
//!

‎quickwit/quickwit-dst/src/invariants/registry.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Invariant ID catalog — single source of truth for all invariant definitions.
2116
//!

‎quickwit/quickwit-dst/src/invariants/sort.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Shared null-aware comparison for SS-2 (null ordering invariant).
2116
//!

‎quickwit/quickwit-dst/src/invariants/window.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Shared window math for time-windowed compaction.
2116
//!

‎quickwit/quickwit-dst/src/lib.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Deterministic simulation testing and shared invariants for Quickhouse-Pomsky.
2116
//!

‎quickwit/quickwit-dst/src/models/mod.rs‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1-
// Copyright (C) 2024 Quickwit, Inc.
1+
// Copyright 2021-Present Datadog, Inc.
22
//
3-
// Quickwit is offered under the AGPL v3.0 and as commercial software.
4-
// For commercial licensing, contact us at hello@quickwit.io.
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
56
//
6-
// AGPL:
7-
// This program is free software: you can redistribute it and/or modify
8-
// it under the terms of the GNU Affero General Public License as
9-
// published by the Free Software Foundation, either version 3 of the
10-
// License, or (at your option) any later version.
7+
// http://www.apache.org/licenses/LICENSE-2.0
118
//
12-
// This program is distributed in the hope that it will be useful,
13-
// but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
// GNU Affero General Public License for more details.
16-
//
17-
// You should have received a copy of the GNU Affero General Public License
18-
// along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
1914

2015
//! Stateright models mirroring the TLA+ specifications.
2116

0 commit comments

Comments
 (0)