Skip to content

Commit

Permalink
fix last bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
hughsimpson committed Aug 4, 2023
1 parent dcd8938 commit 8b25bdb
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ kamon.modules {
otel-trace-reporter {
enabled = true
name = "OpenTelemetry Trace Reporter"
description = "Sends trace data to a OpenTelemetry server via gRPC/REST+json"
description = "Sends trace data to a OpenTelemetry server via gRPC/HTTP+protobuf"
factory = "kamon.otel.OpenTelemetryTraceReporter$Factory"
}
otel-metrics-reporter {
enabled = true
name = "OpenTelemetry Metrics Reporter"
description = "Sends metrics data to a OpenTelemetry server via gRPC/REST+json"
description = "Sends metrics data to a OpenTelemetry server via gRPC/HTTP+protobuf"
factory = "kamon.otel.OpenTelemetryMetricsReporter$Factory"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import io.opentelemetry.sdk.metrics.`export`.MetricExporter
import io.opentelemetry.sdk.metrics.data.MetricData
import io.opentelemetry.sdk.trace.`export`.SpanExporter
import io.opentelemetry.sdk.trace.data.SpanData
import kamon.otel.OpenTelemetryConfiguration.Component.Trace
import kamon.otel.OpenTelemetryConfiguration.Component.{ Metrics, Trace }
import org.slf4j.LoggerFactory

import java.io.Closeable
Expand Down Expand Up @@ -106,18 +106,18 @@ private[otel] object OtlpMetricsService {
* @param config
* @return
*/
def apply(config: Config): MetricsService = new OtlpMetricsService(OpenTelemetryConfiguration(config, Trace))
def apply(config: Config): MetricsService = new OtlpMetricsService(OpenTelemetryConfiguration(config, Metrics))
}

private[otel] class OtlpMetricsService(c: OpenTelemetryConfiguration) extends MetricsService {
private val compressionMethod = if (c.compressionEnabled) "gzip" else "none"
private val delegate: MetricExporter = c.protocol match {
case "grpc" =>
val builder = OtlpHttpMetricExporter.builder().setEndpoint(c.endpoint).setCompression(compressionMethod).setTimeout(c.timeout)
val builder = OtlpGrpcMetricExporter.builder().setEndpoint(c.endpoint).setCompression(compressionMethod).setTimeout(c.timeout)
c.headers.foreach { case (k, v) => builder.addHeader(k, v) }
builder.build()
case "http/protobuf" =>
val builder = OtlpGrpcMetricExporter.builder().setEndpoint(c.endpoint).setCompression(compressionMethod).setTimeout(c.timeout)
val builder = OtlpHttpMetricExporter.builder().setEndpoint(c.endpoint).setCompression(compressionMethod).setTimeout(c.timeout)
c.headers.foreach { case (k, v) => builder.addHeader(k, v) }
builder.build()
}
Expand Down

0 comments on commit 8b25bdb

Please sign in to comment.