From b4e311b1f90a70c409fe38611ed340c7b4449d24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 08:07:44 +0000 Subject: [PATCH] chore: Update protos Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../jaeger/proto/api_v3/query_service.ts | 44 ++++++++++++++++++- proto/cerbos/audit/v1/audit.proto | 2 +- proto/cerbos/cloud/apikey/v1/apikey.proto | 2 +- .../cerbos/cloud/bootstrap/v1/bootstrap.proto | 2 +- proto/cerbos/cloud/bundle/v1/bundle.proto | 2 +- proto/cerbos/cloud/bundle/v2/bundle.proto | 5 +-- proto/cerbos/cloud/epdp/v1/epdp.proto | 2 +- proto/cerbos/cloud/logs/v1/logs.proto | 2 +- proto/cerbos/cloud/pdp/v1/pdp.proto | 2 +- proto/cerbos/cloud/store/v1/store.proto | 2 +- proto/cerbos/effect/v1/effect.proto | 2 +- proto/cerbos/engine/v1/engine.proto | 2 +- proto/cerbos/policy/v1/policy.proto | 2 +- proto/cerbos/request/v1/request.proto | 2 +- proto/cerbos/response/v1/response.proto | 2 +- proto/cerbos/schema/v1/schema.proto | 2 +- proto/cerbos/svc/v1/svc.proto | 2 +- proto/cerbos/telemetry/v1/telemetry.proto | 2 +- proto/jaeger/proto/api_v3/query_service.proto | 10 +++++ 19 files changed, 70 insertions(+), 21 deletions(-) diff --git a/private/test/src/protobuf/jaeger/proto/api_v3/query_service.ts b/private/test/src/protobuf/jaeger/proto/api_v3/query_service.ts index ab27e8bd..d2e4667e 100644 --- a/private/test/src/protobuf/jaeger/proto/api_v3/query_service.ts +++ b/private/test/src/protobuf/jaeger/proto/api_v3/query_service.ts @@ -27,6 +27,7 @@ export interface GetTraceRequest { traceId: string; startTime: Date | undefined; endTime: Date | undefined; + rawTraces: boolean; } export interface TraceQueryParameters { @@ -38,6 +39,7 @@ export interface TraceQueryParameters { durationMin: Duration | undefined; durationMax: Duration | undefined; searchDepth: number; + rawTraces: boolean; } export interface TraceQueryParameters_AttributesEntry { @@ -70,7 +72,12 @@ export interface GetOperationsResponse { } function createBaseGetTraceRequest(): GetTraceRequest { - return { traceId: "", startTime: undefined, endTime: undefined }; + return { + traceId: "", + startTime: undefined, + endTime: undefined, + rawTraces: false, + }; } export const GetTraceRequest: MessageFns = { @@ -93,6 +100,9 @@ export const GetTraceRequest: MessageFns = { writer.uint32(26).fork(), ).join(); } + if (message.rawTraces !== false) { + writer.uint32(32).bool(message.rawTraces); + } return writer; }, @@ -132,6 +142,14 @@ export const GetTraceRequest: MessageFns = { ); continue; } + case 4: { + if (tag !== 32) { + break; + } + + message.rawTraces = reader.bool(); + continue; + } } if ((tag & 7) === 4 || tag === 0) { break; @@ -150,6 +168,9 @@ export const GetTraceRequest: MessageFns = { endTime: isSet(object.endTime) ? fromJsonTimestamp(object.endTime) : undefined, + rawTraces: isSet(object.rawTraces) + ? globalThis.Boolean(object.rawTraces) + : false, }; }, @@ -164,6 +185,9 @@ export const GetTraceRequest: MessageFns = { if (message.endTime !== undefined) { obj.endTime = message.endTime.toISOString(); } + if (message.rawTraces !== false) { + obj.rawTraces = message.rawTraces; + } return obj; }, }; @@ -178,6 +202,7 @@ function createBaseTraceQueryParameters(): TraceQueryParameters { durationMin: undefined, durationMax: undefined, searchDepth: 0, + rawTraces: false, }; } @@ -219,6 +244,9 @@ export const TraceQueryParameters: MessageFns = { if (message.searchDepth !== 0) { writer.uint32(64).int32(message.searchDepth); } + if (message.rawTraces !== false) { + writer.uint32(72).bool(message.rawTraces); + } return writer; }, @@ -307,6 +335,14 @@ export const TraceQueryParameters: MessageFns = { message.searchDepth = reader.int32(); continue; } + case 9: { + if (tag !== 72) { + break; + } + + message.rawTraces = reader.bool(); + continue; + } } if ((tag & 7) === 4 || tag === 0) { break; @@ -348,6 +384,9 @@ export const TraceQueryParameters: MessageFns = { searchDepth: isSet(object.searchDepth) ? globalThis.Number(object.searchDepth) : 0, + rawTraces: isSet(object.rawTraces) + ? globalThis.Boolean(object.rawTraces) + : false, }; }, @@ -383,6 +422,9 @@ export const TraceQueryParameters: MessageFns = { if (message.searchDepth !== 0) { obj.searchDepth = Math.round(message.searchDepth); } + if (message.rawTraces !== false) { + obj.rawTraces = message.rawTraces; + } return obj; }, }; diff --git a/proto/cerbos/audit/v1/audit.proto b/proto/cerbos/audit/v1/audit.proto index 73cc2149..1b1cc667 100644 --- a/proto/cerbos/audit/v1/audit.proto +++ b/proto/cerbos/audit/v1/audit.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/apikey/v1/apikey.proto b/proto/cerbos/cloud/apikey/v1/apikey.proto index abc3041d..6be71dc1 100644 --- a/proto/cerbos/cloud/apikey/v1/apikey.proto +++ b/proto/cerbos/cloud/apikey/v1/apikey.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/bootstrap/v1/bootstrap.proto b/proto/cerbos/cloud/bootstrap/v1/bootstrap.proto index 0d19ff00..f8283d1b 100644 --- a/proto/cerbos/cloud/bootstrap/v1/bootstrap.proto +++ b/proto/cerbos/cloud/bootstrap/v1/bootstrap.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/bundle/v1/bundle.proto b/proto/cerbos/cloud/bundle/v1/bundle.proto index 28c4dabf..c5c51887 100644 --- a/proto/cerbos/cloud/bundle/v1/bundle.proto +++ b/proto/cerbos/cloud/bundle/v1/bundle.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/bundle/v2/bundle.proto b/proto/cerbos/cloud/bundle/v2/bundle.proto index 063dfc14..ec24e410 100644 --- a/proto/cerbos/cloud/bundle/v2/bundle.proto +++ b/proto/cerbos/cloud/bundle/v2/bundle.proto @@ -1,7 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. -// SPDX-License-Identifier: Apache-2.0 - -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/epdp/v1/epdp.proto b/proto/cerbos/cloud/epdp/v1/epdp.proto index d96a1716..909c4c3b 100644 --- a/proto/cerbos/cloud/epdp/v1/epdp.proto +++ b/proto/cerbos/cloud/epdp/v1/epdp.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/logs/v1/logs.proto b/proto/cerbos/cloud/logs/v1/logs.proto index 42b61bca..8faa32e8 100644 --- a/proto/cerbos/cloud/logs/v1/logs.proto +++ b/proto/cerbos/cloud/logs/v1/logs.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/pdp/v1/pdp.proto b/proto/cerbos/cloud/pdp/v1/pdp.proto index ac603fa1..8c4230ae 100644 --- a/proto/cerbos/cloud/pdp/v1/pdp.proto +++ b/proto/cerbos/cloud/pdp/v1/pdp.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/cloud/store/v1/store.proto b/proto/cerbos/cloud/store/v1/store.proto index 17db7517..df8623e7 100644 --- a/proto/cerbos/cloud/store/v1/store.proto +++ b/proto/cerbos/cloud/store/v1/store.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/effect/v1/effect.proto b/proto/cerbos/effect/v1/effect.proto index 97c37a8c..8e3f47d3 100644 --- a/proto/cerbos/effect/v1/effect.proto +++ b/proto/cerbos/effect/v1/effect.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/engine/v1/engine.proto b/proto/cerbos/engine/v1/engine.proto index 6ae64118..8f1313c3 100644 --- a/proto/cerbos/engine/v1/engine.proto +++ b/proto/cerbos/engine/v1/engine.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/policy/v1/policy.proto b/proto/cerbos/policy/v1/policy.proto index 84ebfb78..edec9822 100644 --- a/proto/cerbos/policy/v1/policy.proto +++ b/proto/cerbos/policy/v1/policy.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/request/v1/request.proto b/proto/cerbos/request/v1/request.proto index 2874b546..d3db53c0 100644 --- a/proto/cerbos/request/v1/request.proto +++ b/proto/cerbos/request/v1/request.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/response/v1/response.proto b/proto/cerbos/response/v1/response.proto index 322329b8..dd44a997 100644 --- a/proto/cerbos/response/v1/response.proto +++ b/proto/cerbos/response/v1/response.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/schema/v1/schema.proto b/proto/cerbos/schema/v1/schema.proto index a15fde9e..6f78fb7e 100644 --- a/proto/cerbos/schema/v1/schema.proto +++ b/proto/cerbos/schema/v1/schema.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/svc/v1/svc.proto b/proto/cerbos/svc/v1/svc.proto index 7eefa374..7439fad5 100644 --- a/proto/cerbos/svc/v1/svc.proto +++ b/proto/cerbos/svc/v1/svc.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/cerbos/telemetry/v1/telemetry.proto b/proto/cerbos/telemetry/v1/telemetry.proto index 2854ac94..ae475d02 100644 --- a/proto/cerbos/telemetry/v1/telemetry.proto +++ b/proto/cerbos/telemetry/v1/telemetry.proto @@ -1,4 +1,4 @@ -// Copyright 2021-2024 Zenauth Ltd. +// Copyright 2021-2025 Zenauth Ltd. // SPDX-License-Identifier: Apache-2.0 syntax = "proto3"; diff --git a/proto/jaeger/proto/api_v3/query_service.proto b/proto/jaeger/proto/api_v3/query_service.proto index d4b1bb89..517ac2e4 100644 --- a/proto/jaeger/proto/api_v3/query_service.proto +++ b/proto/jaeger/proto/api_v3/query_service.proto @@ -33,6 +33,11 @@ message GetTraceRequest { // Optional. The end time to search trace ID. google.protobuf.Timestamp end_time = 3; + + // Optional. If set to true, the response will not include any + // enrichments to the trace, such as clock skew adjustment. + // Instead, the trace will be returned exactly as stored. + bool raw_traces = 4; } // Query parameters to find traces. Except for num_traces, all fields should be treated @@ -72,6 +77,11 @@ message TraceQueryParameters { // but not all implementations support such accuracy and for those // the larger depth value simply means more traces returned. int32 search_depth = 8; + + // Optional. If set to true, the response will not include any + // enrichments to the trace, such as clock skew adjustment. + // Instead, the trace will be returned exactly as stored. + bool raw_traces = 9; } // Request object to search traces.