Updated temporality and applied java spotless

Signed-off-by: Atharva Sharma <[email protected]>
opensearch-project · May 7, 2024 · 53770cf · 53770cf
1 parent ee5e1c1
commit 53770cf
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 9 deletions.
diff --git a/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java b/modules/transport-netty4/src/main/java/org/opensearch/transport/Netty4ModulePlugin.java
@@ -105,7 +105,8 @@ public Map<String, Supplier<Transport>> getTransports(
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
         Tracer tracer,
-        MetricsRegistry metricsRegistry) {
+        MetricsRegistry metricsRegistry
+    ) {
         return Collections.singletonMap(
             NETTY_TRANSPORT_NAME,
             () -> new Netty4Transport(

diff --git a/...l/src/main/java/org/opensearch/telemetry/metrics/exporter/OTelMetricsExporterFactory.java b/...l/src/main/java/org/opensearch/telemetry/metrics/exporter/OTelMetricsExporterFactory.java
@@ -21,6 +21,10 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
+import io.opentelemetry.exporter.logging.LoggingMetricExporter;
+import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;
+import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
+import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 
 /**
@@ -46,7 +50,16 @@ private OTelMetricsExporterFactory() {
      */
     public static MetricExporter create(Settings settings) {
         Class<MetricExporter> MetricExporterProviderClass = OTelTelemetrySettings.OTEL_METRICS_EXPORTER_CLASS_SETTING.get(settings);
-        MetricExporter metricExporter = instantiateExporter(MetricExporterProviderClass);
+        MetricExporter metricExporter;
+        if (MetricExporterProviderClass.getName().equals(LoggingMetricExporter.class.getName())) {
+            metricExporter = LoggingMetricExporter.create(AggregationTemporality.DELTA);
+        } else if (MetricExporterProviderClass.getName().equals(OtlpGrpcMetricExporter.class.getName())) {
+            metricExporter = OtlpGrpcMetricExporter.builder()
+                .setAggregationTemporalitySelector(AggregationTemporalitySelector.deltaPreferred())
+                .build();
+        } else {
+            metricExporter = instantiateExporter(MetricExporterProviderClass);
+        }
         logger.info("Successfully instantiated the Metrics MetricExporter class {}", MetricExporterProviderClass);
         return metricExporter;
     }

diff --git a/...s/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java b/...s/telemetry-otel/src/main/java/org/opensearch/telemetry/tracing/OTelResourceProvider.java
@@ -8,6 +8,7 @@
 
 package org.opensearch.telemetry.tracing;
 
+import io.opentelemetry.sdk.metrics.internal.view.Base2ExponentialHistogramAggregation;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.telemetry.TelemetrySettings;
 import org.opensearch.telemetry.metrics.exporter.OTelMetricsExporterFactory;
@@ -23,12 +24,12 @@
 import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.metrics.Aggregation;
 import io.opentelemetry.sdk.metrics.InstrumentSelector;
 import io.opentelemetry.sdk.metrics.InstrumentType;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.View;
 import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
-import io.opentelemetry.sdk.metrics.internal.view.Base2ExponentialHistogramAggregation;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
@@ -101,6 +102,10 @@ private static SdkMeterProvider createSdkMetricProvider(Settings settings, Resou
                 InstrumentSelector.builder().setType(InstrumentType.HISTOGRAM).build(),
                 View.builder().setAggregation(Base2ExponentialHistogramAggregation.getDefault()).build()
             )
+            .registerView(
+                InstrumentSelector.builder().setName("otlp.exporter.*").build(),
+                View.builder().setAggregation(Aggregation.drop()).build()
+            )
             .build();
     }
 

diff --git a/plugins/transport-nio/src/main/java/org/opensearch/transport/nio/NioTransportPlugin.java b/plugins/transport-nio/src/main/java/org/opensearch/transport/nio/NioTransportPlugin.java
@@ -94,7 +94,8 @@ public Map<String, Supplier<Transport>> getTransports(
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
         Tracer tracer,
-        MetricsRegistry metricsRegistry) {
+        MetricsRegistry metricsRegistry
+    ) {
         return Collections.singletonMap(
             NIO_TRANSPORT_NAME,
             () -> new NioTransport(

diff --git a/server/src/main/java/org/opensearch/plugins/NetworkPlugin.java b/server/src/main/java/org/opensearch/plugins/NetworkPlugin.java
@@ -86,7 +86,8 @@ default Map<String, Supplier<Transport>> getTransports(
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
         Tracer tracer,
-        MetricsRegistry metricsRegistry) {
+        MetricsRegistry metricsRegistry
+    ) {
         return Collections.emptyMap();
     }
 

diff --git a/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java b/server/src/test/java/org/opensearch/common/network/NetworkModuleTests.java
@@ -179,7 +179,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 NamedWriteableRegistry namedWriteableRegistry,
                 NetworkService networkService,
                 Tracer tracer,
-                MetricsRegistry metricsRegistry) {
+                MetricsRegistry metricsRegistry
+            ) {
                 return Collections.singletonMap("custom", custom);
             }
         };
@@ -288,7 +289,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 NamedWriteableRegistry namedWriteableRegistry,
                 NetworkService networkService,
                 Tracer tracer,
-                MetricsRegistry metricsRegistry) {
+                MetricsRegistry metricsRegistry
+            ) {
                 return Collections.singletonMap("default_custom", customTransport);
             }
 
@@ -333,7 +335,8 @@ public Map<String, Supplier<Transport>> getTransports(
                 NamedWriteableRegistry namedWriteableRegistry,
                 NetworkService networkService,
                 Tracer tracer,
-                MetricsRegistry metricsRegistry) {
+                MetricsRegistry metricsRegistry
+            ) {
                 return Collections.singletonMap("default_custom", customTransport);
             }
 

diff --git a/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java b/test/framework/src/main/java/org/opensearch/transport/nio/MockNioTransportPlugin.java
@@ -61,7 +61,8 @@ public Map<String, Supplier<Transport>> getTransports(
         NamedWriteableRegistry namedWriteableRegistry,
         NetworkService networkService,
         Tracer tracer,
-        MetricsRegistry metricsRegistry) {
+        MetricsRegistry metricsRegistry
+    ) {
         return Collections.singletonMap(
             MOCK_NIO_TRANSPORT_NAME,
             () -> new MockNioTransport(