diff --git a/opentelemetry-collector-patch/pdata/internal/generated_enum_countminsketchencoding.go b/opentelemetry-collector-patch/pdata/internal/generated_enum_countminsketchencoding.go index df2b9a0b..3f68751a 100644 --- a/opentelemetry-collector-patch/pdata/internal/generated_enum_countminsketchencoding.go +++ b/opentelemetry-collector-patch/pdata/internal/generated_enum_countminsketchencoding.go @@ -7,9 +7,11 @@ package internal const ( - CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED = CountMinSketchEncoding(0) - CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_PROTO = CountMinSketchEncoding(1) - CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_DELTA = CountMinSketchEncoding(2) + CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED = CountMinSketchEncoding(0) + CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_PROTO = CountMinSketchEncoding(1) + CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_DELTA = CountMinSketchEncoding(2) + CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_MSGPACK = CountMinSketchEncoding(3) + CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_MSGPACK_DELTA = CountMinSketchEncoding(4) ) // CountMinSketchEncoding identifies how the CountMinSketch payload bytes are encoded. @@ -19,10 +21,14 @@ var CountMinSketchEncoding_name = map[int32]string{ 0: "COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED", 1: "COUNT_MIN_SKETCH_ENCODING_PROTO", 2: "COUNT_MIN_SKETCH_ENCODING_DELTA", + 3: "COUNT_MIN_SKETCH_ENCODING_MSGPACK", + 4: "COUNT_MIN_SKETCH_ENCODING_MSGPACK_DELTA", } var CountMinSketchEncoding_value = map[string]int32{ - "COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED": 0, - "COUNT_MIN_SKETCH_ENCODING_PROTO": 1, - "COUNT_MIN_SKETCH_ENCODING_DELTA": 2, + "COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED": 0, + "COUNT_MIN_SKETCH_ENCODING_PROTO": 1, + "COUNT_MIN_SKETCH_ENCODING_DELTA": 2, + "COUNT_MIN_SKETCH_ENCODING_MSGPACK": 3, + "COUNT_MIN_SKETCH_ENCODING_MSGPACK_DELTA": 4, } diff --git a/opentelemetry-collector-patch/pdata/internal/generated_enum_countsketchencoding.go b/opentelemetry-collector-patch/pdata/internal/generated_enum_countsketchencoding.go index 4ac3260a..d3ad6cf4 100644 --- a/opentelemetry-collector-patch/pdata/internal/generated_enum_countsketchencoding.go +++ b/opentelemetry-collector-patch/pdata/internal/generated_enum_countsketchencoding.go @@ -7,9 +7,11 @@ package internal const ( - CountSketchEncoding_COUNT_SKETCH_ENCODING_UNSPECIFIED = CountSketchEncoding(0) - CountSketchEncoding_COUNT_SKETCH_ENCODING_PROTO = CountSketchEncoding(1) - CountSketchEncoding_COUNT_SKETCH_ENCODING_DELTA = CountSketchEncoding(2) + CountSketchEncoding_COUNT_SKETCH_ENCODING_UNSPECIFIED = CountSketchEncoding(0) + CountSketchEncoding_COUNT_SKETCH_ENCODING_PROTO = CountSketchEncoding(1) + CountSketchEncoding_COUNT_SKETCH_ENCODING_DELTA = CountSketchEncoding(2) + CountSketchEncoding_COUNT_SKETCH_ENCODING_MSGPACK = CountSketchEncoding(3) + CountSketchEncoding_COUNT_SKETCH_ENCODING_MSGPACK_DELTA = CountSketchEncoding(4) ) // CountSketchEncoding identifies how the CountSketch payload bytes are encoded. @@ -19,10 +21,14 @@ var CountSketchEncoding_name = map[int32]string{ 0: "COUNT_SKETCH_ENCODING_UNSPECIFIED", 1: "COUNT_SKETCH_ENCODING_PROTO", 2: "COUNT_SKETCH_ENCODING_DELTA", + 3: "COUNT_SKETCH_ENCODING_MSGPACK", + 4: "COUNT_SKETCH_ENCODING_MSGPACK_DELTA", } var CountSketchEncoding_value = map[string]int32{ - "COUNT_SKETCH_ENCODING_UNSPECIFIED": 0, - "COUNT_SKETCH_ENCODING_PROTO": 1, - "COUNT_SKETCH_ENCODING_DELTA": 2, + "COUNT_SKETCH_ENCODING_UNSPECIFIED": 0, + "COUNT_SKETCH_ENCODING_PROTO": 1, + "COUNT_SKETCH_ENCODING_DELTA": 2, + "COUNT_SKETCH_ENCODING_MSGPACK": 3, + "COUNT_SKETCH_ENCODING_MSGPACK_DELTA": 4, } diff --git a/opentelemetry-collector-patch/pdata/internal/generated_enum_ddsketchencoding.go b/opentelemetry-collector-patch/pdata/internal/generated_enum_ddsketchencoding.go index 21ccabb8..9ba17d2b 100644 --- a/opentelemetry-collector-patch/pdata/internal/generated_enum_ddsketchencoding.go +++ b/opentelemetry-collector-patch/pdata/internal/generated_enum_ddsketchencoding.go @@ -7,9 +7,11 @@ package internal const ( - DDSketchEncoding_DDSKETCH_ENCODING_UNSPECIFIED = DDSketchEncoding(0) - DDSketchEncoding_DDSKETCH_ENCODING_PROTO = DDSketchEncoding(1) - DDSketchEncoding_DDSKETCH_ENCODING_PROTO_DELTA = DDSketchEncoding(2) + DDSketchEncoding_DDSKETCH_ENCODING_UNSPECIFIED = DDSketchEncoding(0) + DDSketchEncoding_DDSKETCH_ENCODING_PROTO = DDSketchEncoding(1) + DDSketchEncoding_DDSKETCH_ENCODING_PROTO_DELTA = DDSketchEncoding(2) + DDSketchEncoding_DDSKETCH_ENCODING_MSGPACK = DDSketchEncoding(3) + DDSketchEncoding_DDSKETCH_ENCODING_MSGPACK_DELTA = DDSketchEncoding(4) ) // DDSketchEncoding identifies how the DDSketch payload bytes are encoded. @@ -19,10 +21,14 @@ var DDSketchEncoding_name = map[int32]string{ 0: "DDSKETCH_ENCODING_UNSPECIFIED", 1: "DDSKETCH_ENCODING_PROTO", 2: "DDSKETCH_ENCODING_PROTO_DELTA", + 3: "DDSKETCH_ENCODING_MSGPACK", + 4: "DDSKETCH_ENCODING_MSGPACK_DELTA", } var DDSketchEncoding_value = map[string]int32{ - "DDSKETCH_ENCODING_UNSPECIFIED": 0, - "DDSKETCH_ENCODING_PROTO": 1, - "DDSKETCH_ENCODING_PROTO_DELTA": 2, + "DDSKETCH_ENCODING_UNSPECIFIED": 0, + "DDSKETCH_ENCODING_PROTO": 1, + "DDSKETCH_ENCODING_PROTO_DELTA": 2, + "DDSKETCH_ENCODING_MSGPACK": 3, + "DDSKETCH_ENCODING_MSGPACK_DELTA": 4, } diff --git a/opentelemetry-collector-patch/pdata/internal/generated_enum_hllsketchencoding.go b/opentelemetry-collector-patch/pdata/internal/generated_enum_hllsketchencoding.go index 6a8dcef6..0a935744 100644 --- a/opentelemetry-collector-patch/pdata/internal/generated_enum_hllsketchencoding.go +++ b/opentelemetry-collector-patch/pdata/internal/generated_enum_hllsketchencoding.go @@ -7,9 +7,11 @@ package internal const ( - HLLSketchEncoding_HLL_SKETCH_ENCODING_UNSPECIFIED = HLLSketchEncoding(0) - HLLSketchEncoding_HLL_SKETCH_ENCODING_PROTO = HLLSketchEncoding(1) - HLLSketchEncoding_HLL_SKETCH_ENCODING_DELTA = HLLSketchEncoding(2) + HLLSketchEncoding_HLL_SKETCH_ENCODING_UNSPECIFIED = HLLSketchEncoding(0) + HLLSketchEncoding_HLL_SKETCH_ENCODING_PROTO = HLLSketchEncoding(1) + HLLSketchEncoding_HLL_SKETCH_ENCODING_DELTA = HLLSketchEncoding(2) + HLLSketchEncoding_HLL_SKETCH_ENCODING_MSGPACK = HLLSketchEncoding(3) + HLLSketchEncoding_HLL_SKETCH_ENCODING_MSGPACK_DELTA = HLLSketchEncoding(4) ) // HLLSketchEncoding identifies how the HLL sketch payload bytes are encoded. @@ -19,10 +21,14 @@ var HLLSketchEncoding_name = map[int32]string{ 0: "HLL_SKETCH_ENCODING_UNSPECIFIED", 1: "HLL_SKETCH_ENCODING_PROTO", 2: "HLL_SKETCH_ENCODING_DELTA", + 3: "HLL_SKETCH_ENCODING_MSGPACK", + 4: "HLL_SKETCH_ENCODING_MSGPACK_DELTA", } var HLLSketchEncoding_value = map[string]int32{ - "HLL_SKETCH_ENCODING_UNSPECIFIED": 0, - "HLL_SKETCH_ENCODING_PROTO": 1, - "HLL_SKETCH_ENCODING_DELTA": 2, + "HLL_SKETCH_ENCODING_UNSPECIFIED": 0, + "HLL_SKETCH_ENCODING_PROTO": 1, + "HLL_SKETCH_ENCODING_DELTA": 2, + "HLL_SKETCH_ENCODING_MSGPACK": 3, + "HLL_SKETCH_ENCODING_MSGPACK_DELTA": 4, } diff --git a/opentelemetry-collector-patch/pdata/internal/generated_enum_kllsketchencoding.go b/opentelemetry-collector-patch/pdata/internal/generated_enum_kllsketchencoding.go index 1eadab58..6c75b349 100644 --- a/opentelemetry-collector-patch/pdata/internal/generated_enum_kllsketchencoding.go +++ b/opentelemetry-collector-patch/pdata/internal/generated_enum_kllsketchencoding.go @@ -7,8 +7,10 @@ package internal const ( - KLLSketchEncoding_KLL_SKETCH_ENCODING_UNSPECIFIED = KLLSketchEncoding(0) - KLLSketchEncoding_KLL_SKETCH_ENCODING_PROTO = KLLSketchEncoding(1) + KLLSketchEncoding_KLL_SKETCH_ENCODING_UNSPECIFIED = KLLSketchEncoding(0) + KLLSketchEncoding_KLL_SKETCH_ENCODING_PROTO = KLLSketchEncoding(1) + KLLSketchEncoding_KLL_SKETCH_ENCODING_MSGPACK = KLLSketchEncoding(3) + KLLSketchEncoding_KLL_SKETCH_ENCODING_MSGPACK_DELTA = KLLSketchEncoding(4) ) // KLLSketchEncoding identifies how the KLL sketch payload bytes are encoded. @@ -17,9 +19,13 @@ type KLLSketchEncoding int32 var KLLSketchEncoding_name = map[int32]string{ 0: "KLL_SKETCH_ENCODING_UNSPECIFIED", 1: "KLL_SKETCH_ENCODING_PROTO", + 3: "KLL_SKETCH_ENCODING_MSGPACK", + 4: "KLL_SKETCH_ENCODING_MSGPACK_DELTA", } var KLLSketchEncoding_value = map[string]int32{ - "KLL_SKETCH_ENCODING_UNSPECIFIED": 0, - "KLL_SKETCH_ENCODING_PROTO": 1, + "KLL_SKETCH_ENCODING_UNSPECIFIED": 0, + "KLL_SKETCH_ENCODING_PROTO": 1, + "KLL_SKETCH_ENCODING_MSGPACK": 3, + "KLL_SKETCH_ENCODING_MSGPACK_DELTA": 4, } diff --git a/opentelemetry-collector-patch/pdata/pmetric/countminsketch_encoding.go b/opentelemetry-collector-patch/pdata/pmetric/countminsketch_encoding.go index 3d7d0289..1c8eea51 100644 --- a/opentelemetry-collector-patch/pdata/pmetric/countminsketch_encoding.go +++ b/opentelemetry-collector-patch/pdata/pmetric/countminsketch_encoding.go @@ -13,8 +13,19 @@ const ( CountMinSketchEncodingUnspecified = CountMinSketchEncoding(internal.CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_UNSPECIFIED) // CountMinSketchEncodingProto indicates the payload is proto-encoded. CountMinSketchEncodingProto = CountMinSketchEncoding(internal.CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_PROTO) - // CountMinSketchEncodingDelta indicates the payload is delta-encoded. + // CountMinSketchEncodingDelta indicates the payload is delta-encoded (proto diff). CountMinSketchEncodingDelta = CountMinSketchEncoding(internal.CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_DELTA) + // CountMinSketchEncodingMsgpack indicates the payload is encoded as the + // cross-language sketch-core MessagePack wire format — matching + // sketchlib-go's `wire/asapmsgpack.MarshalCountMinSketch` output and + // ASAPQuery-backend's `sketch_core::count_min::CountMinSketch::deserialize_msgpack` + // consumer. Used by DataCollector PR flow (ASAPQuery PRs #9-#12). + CountMinSketchEncodingMsgpack = CountMinSketchEncoding(internal.CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_MSGPACK) + // CountMinSketchEncodingMsgpackDelta reserves the delta variant of the + // msgpack wire format. Not yet implemented end-to-end — the Rust decoder + // currently rejects it and falls through to the §5.2 fallback. Will be + // wired once sketch-core grows an `apply_delta` API. + CountMinSketchEncodingMsgpackDelta = CountMinSketchEncoding(internal.CountMinSketchEncoding_COUNT_MIN_SKETCH_ENCODING_MSGPACK_DELTA) ) // String returns the string representation of the CountMinSketchEncoding. @@ -26,6 +37,10 @@ func (e CountMinSketchEncoding) String() string { return "Proto" case CountMinSketchEncodingDelta: return "Delta" + case CountMinSketchEncodingMsgpack: + return "Msgpack" + case CountMinSketchEncodingMsgpackDelta: + return "MsgpackDelta" } return "" } diff --git a/opentelemetry-collector-patch/pdata/pmetric/countsketch_encoding.go b/opentelemetry-collector-patch/pdata/pmetric/countsketch_encoding.go index c2ca543f..ef4e27c4 100644 --- a/opentelemetry-collector-patch/pdata/pmetric/countsketch_encoding.go +++ b/opentelemetry-collector-patch/pdata/pmetric/countsketch_encoding.go @@ -13,8 +13,17 @@ const ( CountSketchEncodingUnspecified = CountSketchEncoding(internal.CountSketchEncoding_COUNT_SKETCH_ENCODING_UNSPECIFIED) // CountSketchEncodingProto indicates the payload is proto-encoded. CountSketchEncodingProto = CountSketchEncoding(internal.CountSketchEncoding_COUNT_SKETCH_ENCODING_PROTO) - // CountSketchEncodingDelta indicates the payload is delta-encoded. + // CountSketchEncodingDelta indicates the payload is delta-encoded (proto diff). CountSketchEncodingDelta = CountSketchEncoding(internal.CountSketchEncoding_COUNT_SKETCH_ENCODING_DELTA) + // CountSketchEncodingMsgpack indicates the payload is encoded as the + // cross-language sketch-core MessagePack wire format — matching + // sketchlib-go's `wire/asapmsgpack.MarshalCountSketch` output and + // ASAPQuery-backend's `sketch_core::count_sketch::CountSketch::deserialize_msgpack` + // consumer. + CountSketchEncodingMsgpack = CountSketchEncoding(internal.CountSketchEncoding_COUNT_SKETCH_ENCODING_MSGPACK) + // CountSketchEncodingMsgpackDelta reserves the delta variant; not yet + // wired end-to-end (Rust decoder rejects it pending `apply_delta` API). + CountSketchEncodingMsgpackDelta = CountSketchEncoding(internal.CountSketchEncoding_COUNT_SKETCH_ENCODING_MSGPACK_DELTA) ) // String returns the string representation of the CountSketchEncoding. @@ -26,6 +35,10 @@ func (e CountSketchEncoding) String() string { return "Proto" case CountSketchEncodingDelta: return "Delta" + case CountSketchEncodingMsgpack: + return "Msgpack" + case CountSketchEncodingMsgpackDelta: + return "MsgpackDelta" } return "" } diff --git a/opentelemetry-collector-patch/pdata/pmetric/ddsketch_encoding.go b/opentelemetry-collector-patch/pdata/pmetric/ddsketch_encoding.go index f6bd7214..c33058ad 100644 --- a/opentelemetry-collector-patch/pdata/pmetric/ddsketch_encoding.go +++ b/opentelemetry-collector-patch/pdata/pmetric/ddsketch_encoding.go @@ -15,6 +15,18 @@ const ( DDSketchEncodingProto = DDSketchEncoding(internal.DDSketchEncoding_DDSKETCH_ENCODING_PROTO) // DDSketchEncodingProtoDelta indicates the payload is encoded as a delta-compressed DataDog sketch proto. DDSketchEncodingProtoDelta = DDSketchEncoding(internal.DDSketchEncoding_DDSKETCH_ENCODING_PROTO_DELTA) + // DDSketchEncodingMsgpack indicates the payload is encoded as the + // cross-language sketch-core MessagePack wire format — matching + // sketchlib-go's `wire/asapmsgpack.MarshalDDSketch` output and + // ASAPQuery-backend's `sketch_core::dd_sketch::DdSketch::deserialize_msgpack` + // consumer. Note: the DataDog DDSketch library's internal state does + // not map directly to sketchlib-go's cross-language wire format — + // producers using this encoding need to convert gamma → alpha and + // extract bucket counts / offsets explicitly. + DDSketchEncodingMsgpack = DDSketchEncoding(internal.DDSketchEncoding_DDSKETCH_ENCODING_MSGPACK) + // DDSketchEncodingMsgpackDelta reserves the delta variant; not yet + // wired end-to-end (Rust decoder rejects it pending `apply_delta` API). + DDSketchEncodingMsgpackDelta = DDSketchEncoding(internal.DDSketchEncoding_DDSKETCH_ENCODING_MSGPACK_DELTA) ) // String returns the string representation of the DDSketchEncoding. @@ -26,6 +38,10 @@ func (e DDSketchEncoding) String() string { return "Proto" case DDSketchEncodingProtoDelta: return "ProtoDelta" + case DDSketchEncodingMsgpack: + return "Msgpack" + case DDSketchEncodingMsgpackDelta: + return "MsgpackDelta" } return "" } diff --git a/opentelemetry-collector-patch/pdata/pmetric/hllsketch_encoding.go b/opentelemetry-collector-patch/pdata/pmetric/hllsketch_encoding.go index f54cd742..2bff9c24 100644 --- a/opentelemetry-collector-patch/pdata/pmetric/hllsketch_encoding.go +++ b/opentelemetry-collector-patch/pdata/pmetric/hllsketch_encoding.go @@ -15,6 +15,16 @@ const ( HLLSketchEncodingProto = HLLSketchEncoding(internal.HLLSketchEncoding_HLL_SKETCH_ENCODING_PROTO) // HLLSketchEncodingDelta indicates the payload is delta-encoded. HLLSketchEncodingDelta = HLLSketchEncoding(internal.HLLSketchEncoding_HLL_SKETCH_ENCODING_DELTA) + // HLLSketchEncodingMsgpack indicates the payload is encoded as the + // cross-language sketch-core MessagePack wire format — matching + // sketchlib-go's `wire/asapmsgpack.MarshalHLLSketch` output and + // ASAPQuery-backend's `sketch_core::hll_sketch::HllSketch::deserialize_msgpack` + // consumer. The Rust consumer pins the variant string to + // `HllVariant::Datafusion` for sketchlib-go producers. + HLLSketchEncodingMsgpack = HLLSketchEncoding(internal.HLLSketchEncoding_HLL_SKETCH_ENCODING_MSGPACK) + // HLLSketchEncodingMsgpackDelta reserves the delta variant; not yet + // wired end-to-end. + HLLSketchEncodingMsgpackDelta = HLLSketchEncoding(internal.HLLSketchEncoding_HLL_SKETCH_ENCODING_MSGPACK_DELTA) ) // String returns the string representation of the HLLSketchEncoding. @@ -26,6 +36,10 @@ func (e HLLSketchEncoding) String() string { return "Proto" case HLLSketchEncodingDelta: return "Delta" + case HLLSketchEncodingMsgpack: + return "Msgpack" + case HLLSketchEncodingMsgpackDelta: + return "MsgpackDelta" } return "" } diff --git a/opentelemetry-collector-patch/pdata/pmetric/kllsketch_encoding.go b/opentelemetry-collector-patch/pdata/pmetric/kllsketch_encoding.go index 761beca8..8ce02c51 100644 --- a/opentelemetry-collector-patch/pdata/pmetric/kllsketch_encoding.go +++ b/opentelemetry-collector-patch/pdata/pmetric/kllsketch_encoding.go @@ -13,6 +13,17 @@ const ( KLLSketchEncodingUnspecified = KLLSketchEncoding(internal.KLLSketchEncoding_KLL_SKETCH_ENCODING_UNSPECIFIED) // KLLSketchEncodingProto indicates the payload is proto-encoded. KLLSketchEncodingProto = KLLSketchEncoding(internal.KLLSketchEncoding_KLL_SKETCH_ENCODING_PROTO) + // KLLSketchEncodingMsgpack reserves the MessagePack wire format for KLL. + // Currently not implementable end-to-end: sketchlib-go's KLL and + // ASAPQuery-backend's sketch-core KLL do not share a byte-level backend + // serialization (see sketchlib-go PR #50 §out-of-scope and PR #51's + // KLL omission note). Producers emitting KLL should keep using PROTO. + // The enum value is reserved here for parity with the other sketch + // encoding enums and for future use once a shared backend exists. + KLLSketchEncodingMsgpack = KLLSketchEncoding(internal.KLLSketchEncoding_KLL_SKETCH_ENCODING_MSGPACK) + // KLLSketchEncodingMsgpackDelta reserves the delta variant of KLL + // msgpack encoding. Same status as KLLSketchEncodingMsgpack. + KLLSketchEncodingMsgpackDelta = KLLSketchEncoding(internal.KLLSketchEncoding_KLL_SKETCH_ENCODING_MSGPACK_DELTA) ) // String returns the string representation of the KLLSketchEncoding. @@ -22,6 +33,10 @@ func (e KLLSketchEncoding) String() string { return "Unspecified" case KLLSketchEncodingProto: return "Proto" + case KLLSketchEncodingMsgpack: + return "Msgpack" + case KLLSketchEncodingMsgpackDelta: + return "MsgpackDelta" } return "" }