Skip to content

Commit 8027dff

Browse files
committed
use charm-tracing-config
1 parent f8cfe7e commit 8027dff

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

src/charm.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
from charms.prometheus_k8s.v0.prometheus_scrape import MetricsEndpointProvider
5050
from charms.rolling_ops.v0.rollingops import RollingOpsManager
5151
from charms.tempo_coordinator_k8s.v0.charm_tracing import trace_charm
52-
from charms.tempo_coordinator_k8s.v0.tracing import TracingEndpointRequirer
52+
from charms.tempo_coordinator_k8s.v0.tracing import TracingEndpointRequirer, charm_tracing_config
5353
from ops import EventBase, RelationBrokenEvent, RelationCreatedEvent
5454
from ops.charm import RelationChangedEvent, UpdateStatusEvent
5555
from ops.model import (
@@ -89,6 +89,7 @@
8989
SERVER_CONFIG_USERNAME,
9090
TRACING_PROTOCOL,
9191
TRACING_RELATION_NAME,
92+
CHARM_CA_CERT_PATH,
9293
)
9394
from k8s_helpers import KubernetesHelpers
9495
from log_rotate_manager import LogRotateManager
@@ -104,7 +105,8 @@
104105

105106

106107
@trace_charm(
107-
tracing_endpoint="tracing_endpoint",
108+
tracing_endpoint="charm_tracing_endpoint",
109+
server_cert="charm_tracing_server_cert",
108110
extra_types=(
109111
GrafanaDashboardProvider,
110112
KubernetesHelpers,
@@ -197,11 +199,13 @@ def __init__(self, *args):
197199
self, protocols=[TRACING_PROTOCOL], relation_name=TRACING_RELATION_NAME
198200
)
199201

200-
@property
201-
def tracing_endpoint(self) -> Optional[str]:
202-
"""Otlp http endpoint for charm instrumentation."""
203-
if self.tracing.is_ready():
204-
return self.tracing.get_endpoint(TRACING_PROTOCOL)
202+
self.charm_tracing_endpoint, self.charm_tracing_server_cert = charm_tracing_config(
203+
self.tracing,
204+
# Fixme: this None here means that if Tempo is related to a tls certificate provider,
205+
# and mysql is getting an https endpoint from tempo, you will get a big fat warning
206+
# and tracing will be disabled as tempo will reject non-https connections.
207+
# https://github.com/canonical/mysql-k8s-operator/issues/586
208+
None)
205209

206210
@property
207211
def _mysql(self) -> MySQL:

0 commit comments

Comments
 (0)