Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 08:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

use standard OTLP endpoint environment variable for logging

Browse Source
This commit is contained in:
Jonathan Klabunde Tomer
2025-09-22 12:50:55 -07:00
committed by GitHub
parent 2cf2391f38
commit 08cc7bc462
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
View File

@@ -31,6 +31,8 @@ import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.semconv.ServiceAttributes;
import java.time.Duration;
import java.util.Map;
import java.util.Optional;
import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
import org.whispersystems.textsecuregcm.WhisperServerVersion;
import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
@@ -112,6 +114,14 @@ public class MetricsUtil {
if (!config.getOpenTelemetryConfiguration().enabled()) {
return;
}
final Map<String, String> env = System.getenv();
final String endpoint =
Optional.ofNullable(env.get("OTEL_EXPORTER_OTLP_LOGS_ENDPOINT"))
.or(() -> Optional.ofNullable(env.get("OTEL_EXPORTER_OTLP_ENDPOINT")))
.map(u -> u.endsWith("/v1/logs") ? u : u + "/v1/logs")
.orElse("http://localhost:4318/v1/logs");
final OpenTelemetrySdk openTelemetry =
OpenTelemetrySdk.builder()
.setLoggerProvider(
@@ -122,7 +132,10 @@ public class MetricsUtil {
.put(ServiceAttributes.SERVICE_VERSION, WhisperServerVersion.getServerVersion())
.build())
.addLogRecordProcessor(
BatchLogRecordProcessor.builder(OtlpHttpLogRecordExporter.getDefault()).build())
BatchLogRecordProcessor.builder(
OtlpHttpLogRecordExporter.builder()
.setEndpoint(endpoint)
.build()).build())
.build())
.build();