diff --git a/common/src/buttercup/common/telemetry.py b/common/src/buttercup/common/telemetry.py index 38e6432e..505e8131 100644 --- a/common/src/buttercup/common/telemetry.py +++ b/common/src/buttercup/common/telemetry.py @@ -35,6 +35,9 @@ def init_telemetry(application_name: str): if not os.getenv("OTEL_EXPORTER_OTLP_PROTOCOL"): logger.warning("OTEL_EXPORTER_OTLP_PROTOCOL not set") + logger.info("Sending telemetry to %s", os.getenv("OTEL_EXPORTER_OTLP_ENDPOINT")) + logger.info("Sending telemetry using %s", os.getenv("OTEL_EXPORTER_OTLP_PROTOCOL")) + openlit.init(application_name=application_name) diff --git a/competition-server/compose.yaml b/competition-server/compose.yaml index a551727f..d64fe230 100644 --- a/competition-server/compose.yaml +++ b/competition-server/compose.yaml @@ -7,8 +7,9 @@ x-default-logging: &logging max-file: "2" tag: "{{.Name}}|{{.ImageName}}|{{.ID}}" -include: - - ./signoz/compose.yaml +# Uncomment to use self-deployed signoz +#include: +# - ./signoz/compose.yaml services: # dind: diff --git a/env.dev.compose b/env.dev.compose index 57a84be8..96ef4a06 100644 --- a/env.dev.compose +++ b/env.dev.compose @@ -64,7 +64,12 @@ INDEX_OUTPUT_TASK_TIMEOUT_MS=120000 TRACED_VULNERABILITIES_TASK_TIMEOUT_MS=120000 # OTel -OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317 +# Settings for locally hosted endpoint, currently disabled. +#OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317 # token is b64 encoded "username:password" -OTEL_EXPORTER_OTLP_HEADERS="Authorization=Basic dXNlcm5hbWU6cGFzc3dvcmQ=" -OTEL_EXPORTER_OTLP_PROTOCOL="grpc" +#OTEL_EXPORTER_OTLP_HEADERS="Authorization=Basic dXNlcm5hbWU6cGFzc3dvcmQ=" +#OTEL_EXPORTER_OTLP_PROTOCOL="grpc" + +# Settings for externally hosted endpoint, make sure to set endpoint to url (kept secret) +OTEL_EXPORTER_OTLP_ENDPOINT="" +OTEL_EXPORTER_OTLP_PROTOCOL="http" \ No newline at end of file