Update to OTel 1.6 (#80)

* Update to OTel 1.6

* Sort

Author: Anuraag Agrawal

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProvider.java

@@ -5,9 +5,9 @@
 package io.opentelemetry.contrib.awsxray;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.sdk.autoconfigure.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.OpenTelemetryResourceAutoConfiguration;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.util.Map;
 
@@ -20,7 +20,7 @@ public Sampler createSampler(ConfigProperties config) {
         AwsXrayRemoteSampler.newBuilder(
             OpenTelemetryResourceAutoConfiguration.configureResource(config));
 
-    Map<String, String> params = config.getCommaSeparatedMap("otel.traces.sampler.arg");
+    Map<String, String> params = config.getMap("otel.traces.sampler.arg");
 
     String endpoint = params.get("endpoint");
     if (endpoint != null) {

aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProviderTest.java

@@ -8,8 +8,8 @@
 import static org.assertj.core.api.InstanceOfAssertFactories.type;
 import static org.mockito.Mockito.when;
 
-import io.opentelemetry.sdk.autoconfigure.ConfigProperties;
-import io.opentelemetry.sdk.autoconfigure.spi.ConfigurableSamplerProvider;
+import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
+import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSamplerProvider;
 import java.util.Collections;
 import java.util.ServiceLoader;
 import org.junit.jupiter.api.Test;
@@ -49,9 +49,8 @@ void emptyConfig() {
 
   @Test
   void setEndpoint() {
-    when(config.getCommaSeparatedMap("otel.resource.attributes"))
-        .thenReturn(Collections.emptyMap());
-    when(config.getCommaSeparatedMap("otel.traces.sampler.arg"))
+    when(config.getMap("otel.resource.attributes")).thenReturn(Collections.emptyMap());
+    when(config.getMap("otel.traces.sampler.arg"))
         .thenReturn(Collections.singletonMap("endpoint", "http://localhost:3000"));
     try (AwsXrayRemoteSampler sampler =
         (AwsXrayRemoteSampler) new AwsXrayRemoteSamplerProvider().createSampler(config)) {

dependencyManagement/build.gradle.kts

@@ -17,8 +17,8 @@ val DEPENDENCY_BOMS = listOf(
     "org.junit:junit-bom:5.7.2",
     "com.linecorp.armeria:armeria-bom:1.9.1",
     "io.grpc:grpc-bom:1.39.0",
-    "io.opentelemetry:opentelemetry-bom:1.5.0",
-    "io.opentelemetry:opentelemetry-bom-alpha:1.5.0-alpha",
+    "io.opentelemetry:opentelemetry-bom:1.6.0",
+    "io.opentelemetry:opentelemetry-bom-alpha:1.6.0-alpha",
     "org.testcontainers:testcontainers-bom:1.16.0"
 )
 

jmx-metrics/src/test/groovy/io/opentelemetry/contrib/jmxmetrics/InstrumentHelperTest.groovy

@@ -7,9 +7,9 @@ package io.opentelemetry.contrib.jmxmetrics
 import static io.opentelemetry.api.common.AttributeKey.stringKey
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.DOUBLE_GAUGE
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.DOUBLE_SUM
+import static io.opentelemetry.sdk.metrics.data.MetricDataType.HISTOGRAM
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.LONG_GAUGE
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.LONG_SUM
-import static io.opentelemetry.sdk.metrics.data.MetricDataType.SUMMARY
 import static java.lang.management.ManagementFactory.getPlatformMBeanServer
 
 import io.opentelemetry.api.common.Attributes
@@ -93,8 +93,8 @@ class InstrumentHelperTest extends Specification {
             def s1 = p1.startEpochNanos
             def s2 = p2.startEpochNanos
             if (s1 == s2) {
-                if (md1.type == SUMMARY) {
-                    return p1.percentileValues[0].value <=> p2.percentileValues[0].value
+                if (md1.type == HISTOGRAM) {
+                    return p1.counts[0] <=> p2.counts[0]
                 }
                 return p1.value <=> p2.value
             }
@@ -140,13 +140,10 @@ class InstrumentHelperTest extends Specification {
             metric.data.points.eachWithIndex { point, i ->
                 assert point.attributes == Attributes.of(stringKey("labelOne"), "labelOneValue", stringKey("labelTwo"), "${i}".toString())
 
-                if (metricType == SUMMARY) {
+                if (metricType == HISTOGRAM) {
                     assert point.count == 1
                     assert point.sum == value
-                    assert point.percentileValues[0].percentile == 0
-                    assert point.percentileValues[0].value == value
-                    assert point.percentileValues[1].percentile == 100
-                    assert point.percentileValues[1].value == value
+                    assert point.counts[6].value == 1
                 } else {
                     assert point.value == value
                 }
@@ -163,10 +160,10 @@ class InstrumentHelperTest extends Specification {
         false    | "multiple" | "Long"    | "longCounter"                 | LONG_SUM     | 234
         true     | "single"   | "Long"    | "longUpDownCounter"           | LONG_SUM     | 234
         false    | "multiple" | "Long"    | "longUpDownCounter"           | LONG_SUM     | 234
-        true     | "single"   | "Double"  | "doubleHistogram"             | SUMMARY      | 123.456
-        false    | "multiple" | "Double"  | "doubleHistogram"             | SUMMARY      | 123.456
-        true     | "single"   | "Long"    | "longHistogram"               | SUMMARY      | 234
-        false    | "multiple" | "Long"    | "longHistogram"               | SUMMARY      | 234
+        true     | "single"   | "Double"  | "doubleHistogram"             | HISTOGRAM      | 123.456
+        false    | "multiple" | "Double"  | "doubleHistogram"             | HISTOGRAM      | 123.456
+        true     | "single"   | "Long"    | "longHistogram"               | HISTOGRAM      | 234
+        false    | "multiple" | "Long"    | "longHistogram"               | HISTOGRAM      | 234
         true     | "single"   | "Double"  | "doubleCounterCallback"       | DOUBLE_SUM   | 123.456
         false    | "multiple" | "Double"  | "doubleCounterCallback"       | DOUBLE_SUM   | 123.456
         true     | "single"   | "Double"  | "doubleUpDownCounterCallback" | DOUBLE_SUM   | 123.456

jmx-metrics/src/test/groovy/io/opentelemetry/contrib/jmxmetrics/OtelHelperSynchronousMetricTest.groovy

@@ -7,7 +7,7 @@ package io.opentelemetry.contrib.jmxmetrics
 import static io.opentelemetry.api.common.AttributeKey.stringKey
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.DOUBLE_SUM
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.LONG_SUM
-import static io.opentelemetry.sdk.metrics.data.MetricDataType.SUMMARY
+import static io.opentelemetry.sdk.metrics.data.MetricDataType.HISTOGRAM
 
 import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.metrics.GlobalMeterProvider
@@ -46,8 +46,8 @@ class OtelHelperSynchronousMetricTest extends Specification{
             def s1 = p1.startEpochNanos
             def s2 = p2.startEpochNanos
             if (s1 == s2) {
-                if (md1.type == SUMMARY) {
-                    return p1.percentileValues[0].value <=> p2.percentileValues[0].value
+                if (md1.type == HISTOGRAM) {
+                    return p1.counts[0] <=> p2.counts[0]
                 }
                 return p1.value <=> p2.value
             }
@@ -404,57 +404,45 @@ class OtelHelperSynchronousMetricTest extends Specification{
         def third = metrics[2]
         def fourth = metrics[3]
 
-        assert first.name == 'double-value-recorder'
-        assert first.description == 'a double value-recorder'
-        assert first.unit == 'ms'
-        assert first.type == SUMMARY
+        assert first.name == 'yet-another-double-value-recorder'
+        assert first.description == ''
+        assert first.unit == '1'
+        assert first.type == HISTOGRAM
         assert first.data.points.size() == 1
         assert first.data.points[0].count == 1
-        assert first.data.points[0].sum == -234.567
-        assert first.data.points[0].percentileValues[0].percentile == 0
-        assert first.data.points[0].percentileValues[0].value ==  -234.567
-        assert first.data.points[0].percentileValues[1].percentile == 100
-        assert first.data.points[0].percentileValues[1].value == -234.567
-        assert first.data.points[0].attributes == Attributes.of(stringKey('key'), 'value')
-
-        assert second.name == 'my-double-value-recorder'
-        assert second.description == 'another double value-recorder'
-        assert second.unit == 'µs'
-        assert second.type == SUMMARY
+        assert first.data.points[0].sum == 456.789
+        assert first.data.points[0].counts[7] == 1
+        assert first.data.points[0].attributes == Attributes.of(stringKey('yetAnotherKey'), 'yetAnotherValue')
+
+        assert second.name == 'another-double-value-recorder'
+        assert second.description == 'double value-recorder'
+        assert second.unit == '1'
+        assert second.type == HISTOGRAM
         assert second.data.points.size() == 1
         assert second.data.points[0].count == 1
-        assert second.data.points[0].sum == -123.456
-        assert second.data.points[0].percentileValues[0].percentile == 0
-        assert second.data.points[0].percentileValues[0].value == -123.456
-        assert second.data.points[0].percentileValues[1].percentile == 100
-        assert second.data.points[0].percentileValues[1].value == -123.456
-        assert second.data.points[0].attributes == Attributes.of(stringKey('myKey'), 'myValue')
-
-        assert third.name == 'another-double-value-recorder'
-        assert third.description == 'double value-recorder'
-        assert third.unit == '1'
-        assert third.type == SUMMARY
+        assert second.data.points[0].sum == 345.678
+        assert second.data.points[0].counts[7] == 1
+        assert second.data.points[0].attributes == Attributes.of(stringKey('anotherKey'), 'anotherValue')
+
+        assert third.name == 'double-value-recorder'
+        assert third.description == 'a double value-recorder'
+        assert third.unit == 'ms'
+        assert third.type == HISTOGRAM
         assert third.data.points.size() == 1
         assert third.data.points[0].count == 1
-        assert third.data.points[0].sum == 345.678
-        assert third.data.points[0].percentileValues[0].percentile == 0
-        assert third.data.points[0].percentileValues[0].value == 345.678
-        assert third.data.points[0].percentileValues[1].percentile == 100
-        assert third.data.points[0].percentileValues[1].value == 345.678
-        assert third.data.points[0].attributes == Attributes.of(stringKey('anotherKey'), 'anotherValue')
-
-        assert fourth.name == 'yet-another-double-value-recorder'
-        assert fourth.description == ''
-        assert fourth.unit == '1'
-        assert fourth.type == SUMMARY
+        assert third.data.points[0].sum == -234.567
+        assert third.data.points[0].counts[0] ==  1
+        assert third.data.points[0].attributes == Attributes.of(stringKey('key'), 'value')
+
+        assert fourth.name == 'my-double-value-recorder'
+        assert fourth.description == 'another double value-recorder'
+        assert fourth.unit == 'µs'
+        assert fourth.type == HISTOGRAM
         assert fourth.data.points.size() == 1
         assert fourth.data.points[0].count == 1
-        assert fourth.data.points[0].sum == 456.789
-        assert fourth.data.points[0].percentileValues[0].percentile == 0
-        assert fourth.data.points[0].percentileValues[0].value == 456.789
-        assert fourth.data.points[0].percentileValues[1].percentile == 100
-        assert fourth.data.points[0].percentileValues[1].value == 456.789
-        assert fourth.data.points[0].attributes == Attributes.of(stringKey('yetAnotherKey'), 'yetAnotherValue')
+        assert fourth.data.points[0].sum == -123.456
+        assert fourth.data.points[0].counts[0] == 1
+        assert fourth.data.points[0].attributes == Attributes.of(stringKey('myKey'), 'myValue')
     }
 
     def "double value recorder memoization"() {
@@ -474,14 +462,12 @@ class OtelHelperSynchronousMetricTest extends Specification{
         assert metric.name == 'dvr'
         assert metric.description == 'double value'
         assert metric.unit == '1'
-        assert metric.type == SUMMARY
+        assert metric.type == HISTOGRAM
         assert metric.data.points.size() == 1
         assert metric.data.points[0].count == 2
         assert metric.data.points[0].sum == 0
-        assert metric.data.points[0].percentileValues[0].percentile == 0
-        assert metric.data.points[0].percentileValues[0].value == -10.1
-        assert metric.data.points[0].percentileValues[1].percentile == 100
-        assert metric.data.points[0].percentileValues[1].value == 10.1
+        assert metric.data.points[0].counts[0] == 1
+        assert metric.data.points[0].counts[1] == 0
         assert metric.data.points[0].attributes == Attributes.of(stringKey('key'), 'value')
     }
 
@@ -510,57 +496,45 @@ class OtelHelperSynchronousMetricTest extends Specification{
         def third = metrics[2]
         def fourth = metrics[3]
 
-        assert first.name == 'long-value-recorder'
-        assert first.description == 'a long value-recorder'
-        assert first.unit == 'ms'
-        assert first.type == SUMMARY
+        assert first.name == 'yet-another-long-value-recorder'
+        assert first.description == ''
+        assert first.unit == '1'
+        assert first.type == HISTOGRAM
         assert first.data.points.size() == 1
         assert first.data.points[0].count == 1
-        assert first.data.points[0].sum == -234
-        assert first.data.points[0].percentileValues[0].percentile == 0
-        assert first.data.points[0].percentileValues[0].value == -234
-        assert first.data.points[0].percentileValues[1].percentile == 100
-        assert first.data.points[0].percentileValues[1].value == -234
-        assert first.data.points[0].attributes == Attributes.of(stringKey('key'), 'value')
-
-        assert second.name == 'my-long-value-recorder'
-        assert second.description == 'another long value-recorder'
-        assert second.unit == 'µs'
-        assert second.type == SUMMARY
+        assert first.data.points[0].sum == 456
+        assert first.data.points[0].counts[7] == 1
+        assert first.data.points[0].attributes == Attributes.of(stringKey('yetAnotherKey'), 'yetAnotherValue')
+
+        assert second.name == 'another-long-value-recorder'
+        assert second.description == 'long value-recorder'
+        assert second.unit == '1'
+        assert second.type == HISTOGRAM
         assert second.data.points.size() == 1
         assert second.data.points[0].count == 1
-        assert second.data.points[0].sum == -123
-        assert second.data.points[0].percentileValues[0].percentile == 0
-        assert second.data.points[0].percentileValues[0].value == -123
-        assert second.data.points[0].percentileValues[1].percentile == 100
-        assert second.data.points[0].percentileValues[1].value == -123
-        assert second.data.points[0].attributes == Attributes.of(stringKey('myKey'), 'myValue')
-
-        assert third.name == 'another-long-value-recorder'
-        assert third.description == 'long value-recorder'
-        assert third.unit == '1'
-        assert third.type == SUMMARY
+        assert second.data.points[0].sum == 345
+        assert second.data.points[0].counts[7] == 1
+        assert second.data.points[0].attributes == Attributes.of(stringKey('anotherKey'), 'anotherValue')
+
+        assert third.name == 'long-value-recorder'
+        assert third.description == 'a long value-recorder'
+        assert third.unit == 'ms'
+        assert third.type == HISTOGRAM
         assert third.data.points.size() == 1
         assert third.data.points[0].count == 1
-        assert third.data.points[0].sum == 345
-        assert third.data.points[0].percentileValues[0].percentile == 0
-        assert third.data.points[0].percentileValues[0].value == 345
-        assert third.data.points[0].percentileValues[1].percentile == 100
-        assert third.data.points[0].percentileValues[1].value == 345
-        assert third.data.points[0].attributes == Attributes.of(stringKey('anotherKey'), 'anotherValue')
-
-        assert fourth.name == 'yet-another-long-value-recorder'
-        assert fourth.description == ''
-        assert fourth.unit == '1'
-        assert fourth.type == SUMMARY
+        assert third.data.points[0].sum == -234
+        assert third.data.points[0].counts[0] == 1
+        assert third.data.points[0].attributes == Attributes.of(stringKey('key'), 'value')
+
+        assert fourth.name == 'my-long-value-recorder'
+        assert fourth.description == 'another long value-recorder'
+        assert fourth.unit == 'µs'
+        assert fourth.type == HISTOGRAM
         assert fourth.data.points.size() == 1
         assert fourth.data.points[0].count == 1
-        assert fourth.data.points[0].sum == 456
-        assert fourth.data.points[0].percentileValues[0].percentile == 0
-        assert fourth.data.points[0].percentileValues[0].value == 456
-        assert fourth.data.points[0].percentileValues[1].percentile == 100
-        assert fourth.data.points[0].percentileValues[1].value == 456
-        assert fourth.data.points[0].attributes == Attributes.of(stringKey('yetAnotherKey'), 'yetAnotherValue')
+        assert fourth.data.points[0].sum == -123
+        assert fourth.data.points[0].counts[0] == 1
+        assert fourth.data.points[0].attributes == Attributes.of(stringKey('myKey'), 'myValue')
     }
 
     def "long value recorder memoization"() {
@@ -580,14 +554,12 @@ class OtelHelperSynchronousMetricTest extends Specification{
         assert metric.name == 'lvr'
         assert metric.description == 'long value'
         assert metric.unit == '1'
-        assert metric.type == SUMMARY
+        assert metric.type == HISTOGRAM
         assert metric.data.points.size() == 1
         assert metric.data.points[0].count == 2
         assert metric.data.points[0].sum == 0
-        assert metric.data.points[0].percentileValues[0].percentile == 0
-        assert metric.data.points[0].percentileValues[0].value == -10
-        assert metric.data.points[0].percentileValues[1].percentile == 100
-        assert metric.data.points[0].percentileValues[1].value == 10
+        assert metric.data.points[0].counts[0] == 1
+        assert metric.data.points[0].counts[1] == 1
         assert metric.data.points[0].attributes == Attributes.of(stringKey('key'), 'value')
     }