SolarManager unter Versionsverwaltung
Erster Stand der Hintergrundprozesse, die auf der Synology unter /volume1/homes/wagner/SolarManager laufen: der Manager selbst, die Sammler je Geraet, die MQTT-Bruecke, der Wecker und - neu hinzugezogen - der AutoAction-Runner, der als Hintergrundprozess hierher gehoert und nicht ins Web-Verzeichnis. Zugangsdaten stehen nicht mehr im Quelltext, sondern in config.ini, die nicht mit eingecheckt wird. Vorlage ist config.ini.example, gelesen wird sie von konfig.py. Betroffen waren solarManager.py (Datenbank und Wattpilot), zeit.py, gatherWaterData.py, wecker.py und skoda_testdaten.py, das sich das Passwort bisher aus dem Quelltext eines anderen Moduls herausgesucht hat. Die Kia-Anbindung ist mit dem Fahrzeug entfallen: kiaTest.py, gatherCarData.py und hyundai_kia_connect_api sind nicht mehr dabei, ebenso gatherInverterData.py, auf das nur noch eine auskommentierte Zeile zeigte. Die mitgelieferten Bibliotheken bleiben im Repository - die NAS hat kein pip, sie muessen neben den Skripten liegen. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
@@ -0,0 +1,49 @@
|
||||
# Copyright The OpenTelemetry Authors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
from typing import Optional
|
||||
|
||||
from mysql.opentelemetry.context import create_key, get_value, set_value
|
||||
from mysql.opentelemetry.context.context import Context
|
||||
from mysql.opentelemetry.trace.span import INVALID_SPAN, Span
|
||||
|
||||
SPAN_KEY = "current-span"
|
||||
_SPAN_KEY = create_key("current-span")
|
||||
|
||||
|
||||
def set_span_in_context(span: Span, context: Optional[Context] = None) -> Context:
|
||||
"""Set the span in the given context.
|
||||
|
||||
Args:
|
||||
span: The Span to set.
|
||||
context: a Context object. if one is not passed, the
|
||||
default current context is used instead.
|
||||
"""
|
||||
ctx = set_value(_SPAN_KEY, span, context=context)
|
||||
return ctx
|
||||
|
||||
|
||||
def get_current_span(context: Optional[Context] = None) -> Span:
|
||||
"""Retrieve the current span.
|
||||
|
||||
Args:
|
||||
context: A Context object. If one is not passed, the
|
||||
default current context is used instead.
|
||||
|
||||
Returns:
|
||||
The Span set in the context if it exists. INVALID_SPAN otherwise.
|
||||
"""
|
||||
span = get_value(_SPAN_KEY, context=context)
|
||||
if span is None or not isinstance(span, Span):
|
||||
return INVALID_SPAN
|
||||
return span
|
||||
@@ -0,0 +1,114 @@
|
||||
# Copyright The OpenTelemetry Authors
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
import re
|
||||
import typing
|
||||
|
||||
from mysql.opentelemetry import trace
|
||||
from mysql.opentelemetry.context.context import Context
|
||||
from mysql.opentelemetry.propagators import textmap
|
||||
from mysql.opentelemetry.trace import format_span_id, format_trace_id
|
||||
from mysql.opentelemetry.trace.span import TraceState
|
||||
|
||||
|
||||
class TraceContextTextMapPropagator(textmap.TextMapPropagator):
|
||||
"""Extracts and injects using w3c TraceContext's headers."""
|
||||
|
||||
_TRACEPARENT_HEADER_NAME = "traceparent"
|
||||
_TRACESTATE_HEADER_NAME = "tracestate"
|
||||
_TRACEPARENT_HEADER_FORMAT = (
|
||||
"^[ \t]*([0-9a-f]{2})-([0-9a-f]{32})-([0-9a-f]{16})-([0-9a-f]{2})"
|
||||
+ "(-.*)?[ \t]*$"
|
||||
)
|
||||
_TRACEPARENT_HEADER_FORMAT_RE = re.compile(_TRACEPARENT_HEADER_FORMAT)
|
||||
|
||||
def extract(
|
||||
self,
|
||||
carrier: textmap.CarrierT,
|
||||
context: typing.Optional[Context] = None,
|
||||
getter: textmap.Getter[textmap.CarrierT] = textmap.default_getter,
|
||||
) -> Context:
|
||||
"""Extracts SpanContext from the carrier.
|
||||
|
||||
See `mysql.opentelemetry.propagators.textmap.TextMapPropagator.extract`
|
||||
"""
|
||||
if context is None:
|
||||
context = Context()
|
||||
|
||||
header = getter.get(carrier, self._TRACEPARENT_HEADER_NAME)
|
||||
|
||||
if not header:
|
||||
return context
|
||||
|
||||
match = re.search(self._TRACEPARENT_HEADER_FORMAT_RE, header[0])
|
||||
if not match:
|
||||
return context
|
||||
|
||||
version: str = match.group(1)
|
||||
trace_id: str = match.group(2)
|
||||
span_id: str = match.group(3)
|
||||
trace_flags: str = match.group(4)
|
||||
|
||||
if trace_id == "0" * 32 or span_id == "0" * 16:
|
||||
return context
|
||||
|
||||
if version == "00":
|
||||
if match.group(5): # type: ignore
|
||||
return context
|
||||
if version == "ff":
|
||||
return context
|
||||
|
||||
tracestate_headers = getter.get(carrier, self._TRACESTATE_HEADER_NAME)
|
||||
if tracestate_headers is None:
|
||||
tracestate = None
|
||||
else:
|
||||
tracestate = TraceState.from_header(tracestate_headers)
|
||||
|
||||
span_context = trace.SpanContext(
|
||||
trace_id=int(trace_id, 16),
|
||||
span_id=int(span_id, 16),
|
||||
is_remote=True,
|
||||
trace_flags=trace.TraceFlags(int(trace_flags, 16)),
|
||||
trace_state=tracestate,
|
||||
)
|
||||
return trace.set_span_in_context(trace.NonRecordingSpan(span_context), context)
|
||||
|
||||
def inject(
|
||||
self,
|
||||
carrier: textmap.CarrierT,
|
||||
context: typing.Optional[Context] = None,
|
||||
setter: textmap.Setter[textmap.CarrierT] = textmap.default_setter,
|
||||
) -> None:
|
||||
"""Injects SpanContext into the carrier.
|
||||
|
||||
See `mysql.opentelemetry.propagators.textmap.TextMapPropagator.inject`
|
||||
"""
|
||||
span = trace.get_current_span(context)
|
||||
span_context = span.get_span_context()
|
||||
if span_context == trace.INVALID_SPAN_CONTEXT:
|
||||
return
|
||||
traceparent_string = f"00-{format_trace_id(span_context.trace_id)}-{format_span_id(span_context.span_id)}-{span_context.trace_flags:02x}"
|
||||
setter.set(carrier, self._TRACEPARENT_HEADER_NAME, traceparent_string)
|
||||
if span_context.trace_state:
|
||||
tracestate_string = span_context.trace_state.to_header()
|
||||
setter.set(carrier, self._TRACESTATE_HEADER_NAME, tracestate_string)
|
||||
|
||||
@property
|
||||
def fields(self) -> typing.Set[str]:
|
||||
"""Returns a set with the fields set in `inject`.
|
||||
|
||||
See
|
||||
`mysql.opentelemetry.propagators.textmap.TextMapPropagator.fields`
|
||||
"""
|
||||
return {self._TRACEPARENT_HEADER_NAME, self._TRACESTATE_HEADER_NAME}
|
||||
Reference in New Issue
Block a user