Merge pull request #348 from solarwinds/cc/NH-119592

NH-119592: conform to otlp metric export spec

Author: cleverchuk

custom/lambda/src/main/java/com/solarwinds/opentelemetry/extensions/PropertiesSupplier.java

@@ -35,6 +35,10 @@ public PropertiesSupplier() {
         "otel.java.experimental.span-stacktrace.filter", SPAN_STACKTRACE_FILTER_CLASS);
     defaultProperties.put("otel.exporter.otlp.protocol", "grpc");
     defaultProperties.put("otel.semconv-stability.opt-in", "database/dup");
+    defaultProperties.put("otel.exporter.otlp.metrics.temporality.preference", "delta");
+    defaultProperties.put(
+        "otel.exporter.otlp.metrics.default.histogram.aggregation",
+        "base2_exponential_bucket_histogram");
   }
 
   @Override

custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporter.java

@@ -19,9 +19,12 @@
 import com.solarwinds.joboe.config.ConfigManager;
 import com.solarwinds.joboe.config.ConfigProperty;
 import io.opentelemetry.sdk.common.CompletableResultCode;
+import io.opentelemetry.sdk.common.export.MemoryMode;
+import io.opentelemetry.sdk.metrics.Aggregation;
 import io.opentelemetry.sdk.metrics.InstrumentType;
 import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.metrics.export.DefaultAggregationSelector;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -65,9 +68,26 @@ public CompletableResultCode shutdown() {
 
   @Override
   public AggregationTemporality getAggregationTemporality(@NonNull InstrumentType instrumentType) {
-    if (instrumentType == InstrumentType.HISTOGRAM) {
-      return AggregationTemporality.DELTA;
-    }
     return delegate.getAggregationTemporality(instrumentType);
   }
+
+  @Override
+  public Aggregation getDefaultAggregation(InstrumentType instrumentType) {
+    return delegate.getDefaultAggregation(instrumentType);
+  }
+
+  @Override
+  public MemoryMode getMemoryMode() {
+    return delegate.getMemoryMode();
+  }
+
+  @Override
+  public void close() {
+    delegate.close();
+  }
+
+  @Override
+  public DefaultAggregationSelector with(InstrumentType instrumentType, Aggregation aggregation) {
+    return delegate.with(instrumentType, aggregation);
+  }
 }

custom/shared/src/main/java/com/solarwinds/opentelemetry/extensions/config/provider/MetricExporterComponentProvider.java

@@ -24,12 +24,9 @@
 import io.opentelemetry.exporter.otlp.internal.OtlpDeclarativeConfigUtil;
 import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter;
 import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporterBuilder;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import io.opentelemetry.sdk.metrics.export.AggregationTemporalitySelector;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
-import java.util.Locale;
-import java.util.function.Consumer;
 
 @SuppressWarnings("rawtypes")
 @AutoService(ComponentProvider.class)
@@ -65,32 +62,7 @@ public MetricExporter create(DeclarativeConfigProperties config) {
         builder::setMemoryMode,
         false);
 
-    configureOtlpAggregationTemporality(config, builder::setAggregationTemporalitySelector);
-
+    builder.setAggregationTemporalitySelector(AggregationTemporalitySelector.deltaPreferred());
     return new DelegatingMetricExporter(builder.build());
   }
-
-  public static void configureOtlpAggregationTemporality(
-      DeclarativeConfigProperties config,
-      Consumer<AggregationTemporalitySelector> aggregationTemporalitySelectorConsumer) {
-    String temporalityStr = config.getString("temporality_preference");
-    if (temporalityStr == null) {
-      return;
-    }
-    AggregationTemporalitySelector temporalitySelector;
-    switch (temporalityStr.toLowerCase(Locale.ROOT)) {
-      case "cumulative":
-        temporalitySelector = AggregationTemporalitySelector.alwaysCumulative();
-        break;
-      case "delta":
-        temporalitySelector = AggregationTemporalitySelector.deltaPreferred();
-        break;
-      case "lowmemory":
-        temporalitySelector = AggregationTemporalitySelector.lowMemory();
-        break;
-      default:
-        throw new ConfigurationException("Unrecognized temporality_preference: " + temporalityStr);
-    }
-    aggregationTemporalitySelectorConsumer.accept(temporalitySelector);
-  }
 }

custom/shared/src/test/java/com/solarwinds/opentelemetry/extensions/DelegatingMetricExporterTest.java

@@ -26,8 +26,9 @@
 import com.solarwinds.joboe.config.InvalidConfigException;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.common.export.MemoryMode;
+import io.opentelemetry.sdk.metrics.Aggregation;
 import io.opentelemetry.sdk.metrics.InstrumentType;
-import io.opentelemetry.sdk.metrics.data.AggregationTemporality;
 import io.opentelemetry.sdk.metrics.data.MetricData;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import java.util.Arrays;
@@ -56,6 +57,38 @@ class DelegatingMetricExporterTest {
 
   @Captor private ArgumentCaptor<List<MetricData>> metricData;
 
+  @Mock private Aggregation aggregationMock;
+
+  @Test
+  void verifyGetDefaultAggregationIsDelegated() {
+    when(metricExporterMock.getDefaultAggregation(any())).thenReturn(aggregationMock);
+
+    assertEquals(aggregationMock, tested.getDefaultAggregation(InstrumentType.COUNTER));
+    verify(metricExporterMock).getDefaultAggregation(InstrumentType.COUNTER);
+  }
+
+  @Test
+  void verifyGetMemoryModeIsDelegated() {
+    when(metricExporterMock.getMemoryMode()).thenReturn(MemoryMode.REUSABLE_DATA);
+
+    assertEquals(MemoryMode.REUSABLE_DATA, tested.getMemoryMode());
+    verify(metricExporterMock).getMemoryMode();
+  }
+
+  @Test
+  void verifyCloseIsDelegated() {
+    tested.close();
+    verify(metricExporterMock).close();
+  }
+
+  @Test
+  void verifyWithIsDelegated() {
+    when(metricExporterMock.with(any(), any())).thenReturn(metricExporterMock);
+
+    assertEquals(metricExporterMock, tested.with(InstrumentType.COUNTER, aggregationMock));
+    verify(metricExporterMock).with(InstrumentType.COUNTER, aggregationMock);
+  }
+
   @Test
   void verifyThatAllMetricDataAreExported() {
     when(metricExporterMock.export(any())).thenReturn(CompletableResultCode.ofSuccess());
@@ -96,13 +129,7 @@ void verifyShutdownIsDelegated() {
   }
 
   @Test
-  void verifyThatDeltaAggregationTemporalityIsReturnedForHistogram() {
-    AggregationTemporality actual = tested.getAggregationTemporality(InstrumentType.HISTOGRAM);
-    assertEquals(AggregationTemporality.DELTA, actual);
-  }
-
-  @Test
-  void verifyGetAggregationTemporalityForNonHistogramIsDelegated() {
+  void verifyGetAggregationTemporalityIsDelegated() {
     tested.getAggregationTemporality(InstrumentType.COUNTER);
     verify(metricExporterMock).getAggregationTemporality(InstrumentType.COUNTER);
   }

custom/src/main/java/com/solarwinds/opentelemetry/extensions/SolarwindsPropertiesSupplier.java

@@ -37,6 +37,10 @@ public class SolarwindsPropertiesSupplier implements Supplier<Map<String, String
       PROPERTIES.put("otel.java.experimental.span-stacktrace.filter", SPAN_STACKTRACE_FILTER_CLASS);
       PROPERTIES.put("otel.propagators", String.format("tracecontext,baggage,%s", COMPONENT_NAME));
       PROPERTIES.put("otel.semconv-stability.opt-in", "database/dup");
+      PROPERTIES.put("otel.exporter.otlp.metrics.temporality.preference", "delta");
+      PROPERTIES.put(
+          "otel.exporter.otlp.metrics.default.histogram.aggregation",
+          "base2_exponential_bucket_histogram");
     } else {
       PROPERTIES.put("otel.sdk.disabled", "true");
     }