From 32263fa221cc1612e69f2b0fa3a8eaaa8f717108 Mon Sep 17 00:00:00 2001 From: jack-berg Date: Tue, 19 Apr 2022 17:49:38 -0500 Subject: [PATCH] Update to java sdk 1.13.0 --- build.gradle | 4 ++-- .../example/logging/ExampleConfiguration.java | 10 +++++----- .../example/otlp/ExampleConfiguration.java | 10 ++++------ prometheus/README.md | 2 +- .../example/prometheus/ExampleConfiguration.java | 7 +++---- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index ce707b0a95..2eb6e357dc 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ plugins { } ext { - openTelemetryVersion = "1.12.0" - openTelemetryAlphaVersion = "1.12.0-alpha" + openTelemetryVersion = "1.13.0" + openTelemetryAlphaVersion = "1.13.0-alpha" grpcVersion = '1.34.1' protobufVersion = '3.11.4' diff --git a/logging/src/main/java/io/opentelemetry/example/logging/ExampleConfiguration.java b/logging/src/main/java/io/opentelemetry/example/logging/ExampleConfiguration.java index c3cbf607d2..c774f0a90a 100644 --- a/logging/src/main/java/io/opentelemetry/example/logging/ExampleConfiguration.java +++ b/logging/src/main/java/io/opentelemetry/example/logging/ExampleConfiguration.java @@ -5,7 +5,7 @@ import io.opentelemetry.exporter.logging.LoggingSpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.opentelemetry.sdk.metrics.export.MetricReaderFactory; +import io.opentelemetry.sdk.metrics.export.MetricReader; import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; @@ -26,16 +26,16 @@ public final class ExampleConfiguration { * @return A ready-to-use {@link OpenTelemetry} instance. */ public static OpenTelemetry initOpenTelemetry() { - // Create an instance of PeriodicMetricReaderFactory and configure it + // Create an instance of PeriodicMetricReader and configure it // to export via the logging exporter - MetricReaderFactory periodicReaderFactory = + MetricReader periodicReader = PeriodicMetricReader.builder(LoggingMetricExporter.create()) .setInterval(Duration.ofMillis(METRIC_EXPORT_INTERVAL_MS)) - .newMetricReaderFactory(); + .build(); // This will be used to create instruments SdkMeterProvider meterProvider = - SdkMeterProvider.builder().registerMetricReader(periodicReaderFactory).build(); + SdkMeterProvider.builder().registerMetricReader(periodicReader).build(); // Tracer provider configured to export spans with SimpleSpanProcessor using // the logging exporter. diff --git a/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java b/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java index bf64a069cb..fdb7742219 100644 --- a/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java +++ b/otlp/src/main/java/io/opentelemetry/example/otlp/ExampleConfiguration.java @@ -12,7 +12,7 @@ import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk; import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.opentelemetry.sdk.metrics.export.MetricReaderFactory; +import io.opentelemetry.sdk.metrics.export.MetricReader; import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader; import io.opentelemetry.sdk.trace.SdkTracerProvider; import io.opentelemetry.sdk.trace.export.BatchSpanProcessor; @@ -64,13 +64,11 @@ static MeterProvider initOpenTelemetryMetrics() { // set up the metric exporter and wire it into the SDK and a timed periodic reader. OtlpGrpcMetricExporter metricExporter = OtlpGrpcMetricExporter.getDefault(); - MetricReaderFactory periodicReaderFactory = - PeriodicMetricReader.builder(metricExporter) - .setInterval(Duration.ofMillis(1000)) - .newMetricReaderFactory(); + MetricReader periodicReader = + PeriodicMetricReader.builder(metricExporter).setInterval(Duration.ofMillis(1000)).build(); SdkMeterProvider sdkMeterProvider = - SdkMeterProvider.builder().registerMetricReader(periodicReaderFactory).build(); + SdkMeterProvider.builder().registerMetricReader(periodicReader).build(); Runtime.getRuntime().addShutdownHook(new Thread(sdkMeterProvider::shutdown)); return sdkMeterProvider; diff --git a/prometheus/README.md b/prometheus/README.md index 47009da6ac..b62c76cd5d 100644 --- a/prometheus/README.md +++ b/prometheus/README.md @@ -17,7 +17,7 @@ These are collected by a Prometheus instance which is configured to pull these m ``` ## 2 - Run Prometheus -Start Prometheus instance with a configuration that sets up a HTTP collection job for ```127.0.0.1:19090``` +Start Prometheus instance with a configuration that sets up an HTTP collection job for ```127.0.0.1:19090``` See [prometheus.yml](prometheus.yml) diff --git a/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java b/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java index cc298cc68c..917f7a13ee 100644 --- a/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java +++ b/prometheus/src/main/java/io/opentelemetry/example/prometheus/ExampleConfiguration.java @@ -8,7 +8,7 @@ import io.opentelemetry.api.metrics.MeterProvider; import io.opentelemetry.exporter.prometheus.PrometheusHttpServer; import io.opentelemetry.sdk.metrics.SdkMeterProvider; -import io.opentelemetry.sdk.metrics.export.MetricReaderFactory; +import io.opentelemetry.sdk.metrics.export.MetricReader; import java.io.IOException; public final class ExampleConfiguration { @@ -20,9 +20,8 @@ public final class ExampleConfiguration { * @return A MeterProvider for use in instrumentation. */ static MeterProvider initializeOpenTelemetry(int prometheusPort) throws IOException { - MetricReaderFactory prometheusReaderFactory = - PrometheusHttpServer.builder().setPort(prometheusPort).newMetricReaderFactory(); + MetricReader prometheusReader = PrometheusHttpServer.builder().setPort(prometheusPort).build(); - return SdkMeterProvider.builder().registerMetricReader(prometheusReaderFactory).build(); + return SdkMeterProvider.builder().registerMetricReader(prometheusReader).build(); } }