diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java index e9967fda0..02dcbb5f3 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java @@ -28,6 +28,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.logs.SdkLoggerProvider; import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor; import io.opentelemetry.sdk.resources.Resource; +import io.opentelemetry.sdk.resources.ResourceBuilder; import io.opentelemetry.semconv.ServiceAttributes; import java.time.Duration; @@ -122,15 +123,14 @@ public class MetricsUtil { .map(u -> u.endsWith("/v1/logs") ? u : u + "/v1/logs") .orElse("http://localhost:4318/v1/logs"); + final ResourceBuilder resource = Resource.builder(); + config.getOpenTelemetryConfiguration().resourceAttributes().forEach((k, v) -> resource.put(k, v)); + final OpenTelemetrySdk openTelemetry = OpenTelemetrySdk.builder() .setLoggerProvider( SdkLoggerProvider.builder() - .setResource( - Resource.builder() - .put(ServiceAttributes.SERVICE_NAME, "chat") - .put(ServiceAttributes.SERVICE_VERSION, WhisperServerVersion.getServerVersion()) - .build()) + .setResource(resource.build()) .addLogRecordProcessor( BatchLogRecordProcessor.builder( OtlpHttpLogRecordExporter.builder() diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java index 201a4923b..95c1efb9a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/OpenTelemetryAppenderFactory.java @@ -15,7 +15,6 @@ import io.dropwizard.logging.common.async.AsyncAppenderFactory; import io.dropwizard.logging.common.filter.LevelFilterFactory; import io.dropwizard.logging.common.layout.LayoutFactory; import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender; -import jakarta.validation.constraints.NotEmpty; @JsonTypeName("otlp") public class OpenTelemetryAppenderFactory extends AbstractAppenderFactory {