From e11121d4d3948e3428ddc900bbdf5cd508e6af98 Mon Sep 17 00:00:00 2001 From: Pietro Pasotti Date: Tue, 2 Jul 2024 14:00:02 +0200 Subject: [PATCH 1/5] removed excess receiver protocols from enum --- lib/charms/tempo_k8s/v2/tracing.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 8b9fb4f3..32df740b 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -107,7 +107,7 @@ def __init__(self, *args): # Increment this PATCH version before using `charmcraft publish-lib` or reset # to 0 if you are raising the major API version -LIBPATCH = 7 +LIBPATCH = 8 PYDEPS = ["pydantic"] @@ -118,10 +118,6 @@ def __init__(self, *args): ReceiverProtocol = Literal[ "zipkin", - "kafka", - "opencensus", - "tempo_http", - "tempo_grpc", "otlp_grpc", "otlp_http", ] From 497b11749bf3f05113a360264fccd381929832c7 Mon Sep 17 00:00:00 2001 From: Pietro Pasotti Date: Tue, 2 Jul 2024 15:22:42 +0200 Subject: [PATCH 2/5] popped stuff from rpttp as well --- lib/charms/tempo_k8s/v2/tracing.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 32df740b..3f7aaf7a 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -137,12 +137,8 @@ class TransportProtocolType(str, enum.Enum): grpc = "grpc" -receiver_protocol_to_transport_protocol = { +receiver_protocol_to_transport_protocol: Dict[ReceiverProtocol, TransportProtocolType] = { "zipkin": TransportProtocolType.http, - "kafka": TransportProtocolType.http, - "opencensus": TransportProtocolType.http, - "tempo_http": TransportProtocolType.http, - "tempo_grpc": TransportProtocolType.grpc, "otlp_grpc": TransportProtocolType.grpc, "otlp_http": TransportProtocolType.http, } From 91511c7344e798642b8e9737df0f879c0ec8bc63 Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 11 Jul 2024 16:15:45 +0300 Subject: [PATCH 3/5] add the supported list --- lib/charms/tempo_k8s/v2/tracing.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 3f7aaf7a..84986e7c 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -116,10 +116,16 @@ def __init__(self, *args): DEFAULT_RELATION_NAME = "tracing" RELATION_INTERFACE_NAME = "tracing" +# Supported list rationale https://github.com/canonical/tempo-coordinator-k8s-operator/issues/8 ReceiverProtocol = Literal[ "zipkin", "otlp_grpc", "otlp_http", + "opencensus", + "jaeger_grpc", + "jaeger_thrift_http", + "jaeger_thrift_compact", + "jaeger_thrift_binary", ] RawReceiver = Tuple[ReceiverProtocol, str] @@ -135,12 +141,18 @@ class TransportProtocolType(str, enum.Enum): http = "http" grpc = "grpc" + udp = "udp" receiver_protocol_to_transport_protocol: Dict[ReceiverProtocol, TransportProtocolType] = { "zipkin": TransportProtocolType.http, "otlp_grpc": TransportProtocolType.grpc, "otlp_http": TransportProtocolType.http, + "opencensus": TransportProtocolType.grpc, + "jaeger_thrift_http": TransportProtocolType.http, + "jaeger_grpc": TransportProtocolType.grpc, + "jaeger_thrift_compact": TransportProtocolType.udp, + "jaeger_thrift_binary": TransportProtocolType.udp, } """A mapping between telemetry protocols and their corresponding transport protocol. """ From 5eca94430170cd9d8eccc5990741fd96536a1cfe Mon Sep 17 00:00:00 2001 From: michael Date: Fri, 26 Jul 2024 11:50:54 +0300 Subject: [PATCH 4/5] fix list --- lib/charms/tempo_k8s/v2/tracing.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index 84986e7c..e047325f 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -124,8 +124,6 @@ def __init__(self, *args): "opencensus", "jaeger_grpc", "jaeger_thrift_http", - "jaeger_thrift_compact", - "jaeger_thrift_binary", ] RawReceiver = Tuple[ReceiverProtocol, str] @@ -141,7 +139,6 @@ class TransportProtocolType(str, enum.Enum): http = "http" grpc = "grpc" - udp = "udp" receiver_protocol_to_transport_protocol: Dict[ReceiverProtocol, TransportProtocolType] = { @@ -151,8 +148,6 @@ class TransportProtocolType(str, enum.Enum): "opencensus": TransportProtocolType.grpc, "jaeger_thrift_http": TransportProtocolType.http, "jaeger_grpc": TransportProtocolType.grpc, - "jaeger_thrift_compact": TransportProtocolType.udp, - "jaeger_thrift_binary": TransportProtocolType.udp, } """A mapping between telemetry protocols and their corresponding transport protocol. """ From d22ae53fa3c06d087c9fb14e5af384499ebc702c Mon Sep 17 00:00:00 2001 From: michael Date: Mon, 29 Jul 2024 11:23:14 +0300 Subject: [PATCH 5/5] remove opencensus --- lib/charms/tempo_k8s/v2/tracing.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/charms/tempo_k8s/v2/tracing.py b/lib/charms/tempo_k8s/v2/tracing.py index e047325f..dfb23365 100644 --- a/lib/charms/tempo_k8s/v2/tracing.py +++ b/lib/charms/tempo_k8s/v2/tracing.py @@ -121,7 +121,6 @@ def __init__(self, *args): "zipkin", "otlp_grpc", "otlp_http", - "opencensus", "jaeger_grpc", "jaeger_thrift_http", ] @@ -145,7 +144,6 @@ class TransportProtocolType(str, enum.Enum): "zipkin": TransportProtocolType.http, "otlp_grpc": TransportProtocolType.grpc, "otlp_http": TransportProtocolType.http, - "opencensus": TransportProtocolType.grpc, "jaeger_thrift_http": TransportProtocolType.http, "jaeger_grpc": TransportProtocolType.grpc, }