Update to OTel 1.4.1 (#55)

Author: Anuraag Agrawal

aws-xray/build.gradle.kts

@@ -19,6 +19,7 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind")
 
     testImplementation("com.linecorp.armeria:armeria-junit5")
+    testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
     testImplementation("com.google.guava:guava")
     testImplementation("org.slf4j:slf4j-simple")
     testImplementation("org.skyscreamer:jsonassert")

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

@@ -8,7 +8,6 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.Clock;
-import io.opentelemetry.sdk.internal.SystemClock;
 import io.opentelemetry.sdk.trace.data.LinkData;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
@@ -21,9 +20,7 @@ final class RateLimitingSampler implements Sampler {
   private final int numPerSecond;
 
   RateLimitingSampler(int numPerSecond) {
-    // TODO(anuraaga): Don't use internal class
-    // https://github.com/open-telemetry/opentelemetry-java/issues/3359
-    this(numPerSecond, SystemClock.getInstance());
+    this(numPerSecond, Clock.getDefault());
   }
 
   // Visible for testing

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

@@ -6,7 +6,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.internal.TestClock;
+import io.opentelemetry.sdk.testing.time.TestClock;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -32,18 +33,18 @@ void testRateLimiterWholeNumber() {
     assertThat(limiter.trySpend(1.0)).isTrue();
     assertThat(limiter.trySpend(1.0)).isFalse();
     // move time 250ms forward, not enough credits to pay for 1.0 item
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(250));
+    clock.advance(Duration.ofMillis(250));
     assertThat(limiter.trySpend(1.0)).isFalse();
 
     // move time 500ms forward, now enough credits to pay for 1.0 item
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(500));
+    clock.advance(Duration.ofMillis(500));
 
     assertThat(limiter.trySpend(1.0)).isTrue();
     assertThat(limiter.trySpend(1.0)).isFalse();
 
     // move time 5s forward, enough to accumulate credits for 10 messages, but it should still be
     // capped at 2
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(5000));
+    clock.advance(Duration.ofMillis(5000));
 
     assertThat(limiter.trySpend(1.0)).isTrue();
     assertThat(limiter.trySpend(1.0)).isTrue();
@@ -58,7 +59,7 @@ void testRateLimiterSteadyRate() {
     RateLimiter limiter = new RateLimiter(5.0 / 60.0, 5.0, clock);
     for (int i = 0; i < 100; i++) {
       assertThat(limiter.trySpend(1.0)).isTrue();
-      clock.advanceNanos(TimeUnit.SECONDS.toNanos(20));
+      clock.advance(Duration.ofSeconds(20));
     }
   }
 
@@ -78,18 +79,18 @@ void testRateLimiterLessThanOne() {
     assertThat(limiter.trySpend(0.25)).isTrue();
     assertThat(limiter.trySpend(0.25)).isFalse();
     // move time 250ms forward, not enough credits to pay for 1.0 item
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(250));
+    clock.advance(Duration.ofMillis(250));
     assertThat(limiter.trySpend(0.25)).isFalse();
 
     // move time 500ms forward, now enough credits to pay for 1.0 item
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(500));
+    clock.advance(Duration.ofMillis(500));
 
     assertThat(limiter.trySpend(0.25)).isTrue();
     assertThat(limiter.trySpend(0.25)).isFalse();
 
     // move time 5s forward, enough to accumulate credits for 10 messages, but it should still be
     // capped at 2
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(5000));
+    clock.advance(Duration.ofMillis(5000));
 
     assertThat(limiter.trySpend(0.25)).isTrue();
     assertThat(limiter.trySpend(0.25)).isTrue();
@@ -103,13 +104,13 @@ void testRateLimiterMaxBalance() {
     TestClock clock = TestClock.create();
     RateLimiter limiter = new RateLimiter(0.1, 1.0, clock);
 
-    clock.advanceNanos(TimeUnit.MICROSECONDS.toNanos(100));
+    clock.advance(Duration.ofNanos(TimeUnit.MICROSECONDS.toNanos(100)));
     assertThat(limiter.trySpend(1.0)).isTrue();
     assertThat(limiter.trySpend(1.0)).isFalse();
 
     // move time 20s forward, enough to accumulate credits for 2 messages, but it should still be
     // capped at 1
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(20000));
+    clock.advance(Duration.ofMillis(20000));
 
     assertThat(limiter.trySpend(1.0)).isTrue();
     assertThat(limiter.trySpend(1.0)).isFalse();
@@ -127,19 +128,17 @@ void testRateLimiterInitial() {
     assertThat(limiter.trySpend(100)).isTrue(); // consume initial (max) balance
     assertThat(limiter.trySpend(1)).isFalse();
 
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(49)); // add 49 credits
+    clock.advance(Duration.ofMillis(49)); // add 49 credits
     assertThat(limiter.trySpend(50)).isFalse();
 
-    clock.advanceNanos(TimeUnit.MILLISECONDS.toNanos(1)); // add one credit
+    clock.advance(Duration.ofMillis(1)); // add one credit
     assertThat(limiter.trySpend(50)).isTrue(); // consume accrued balance
     assertThat(limiter.trySpend(1)).isFalse();
 
-    clock.advanceNanos(
-        TimeUnit.MILLISECONDS.toNanos(1_000_000)); // add a lot of credits (max out balance)
+    clock.advance(Duration.ofMillis(1_000_000)); // add a lot of credits (max out balance)
     assertThat(limiter.trySpend(1)).isTrue(); // take one credit
 
-    clock.advanceNanos(
-        TimeUnit.MILLISECONDS.toNanos(1_000_000)); // add a lot of credits (max out balance)
+    clock.advance(Duration.ofMillis(1_000_000)); // add a lot of credits (max out balance)
     assertThat(limiter.trySpend(101)).isFalse(); // can't consume more than max balance
     assertThat(limiter.trySpend(100)).isTrue(); // consume max balance
     assertThat(limiter.trySpend(1)).isFalse();

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

@@ -10,8 +10,9 @@
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.sdk.internal.TestClock;
+import io.opentelemetry.sdk.testing.time.TestClock;
 import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
+import java.time.Duration;
 import java.util.Collections;
 import org.junit.jupiter.api.Test;
 
@@ -48,7 +49,7 @@ void limitsRate() {
                 .getDecision())
         .isEqualTo(SamplingDecision.DROP);
 
-    clock.advanceMillis(100);
+    clock.advance(Duration.ofMillis(100));
     // Balance restored after a second, not yet
     assertThat(
             sampler
@@ -61,7 +62,7 @@ void limitsRate() {
                     Collections.emptyList())
                 .getDecision())
         .isEqualTo(SamplingDecision.DROP);
-    clock.advanceMillis(900);
+    clock.advance(Duration.ofMillis(900));
     // Balance restored
     assertThat(
             sampler

dependencyManagement/build.gradle.kts

@@ -16,8 +16,8 @@ val DEPENDENCY_BOMS = listOf(
     "com.google.guava:guava-bom:30.1.1-jre",
     "org.junit:junit-bom:5.7.2",
     "com.linecorp.armeria:armeria-bom:1.9.1",
-    "io.opentelemetry:opentelemetry-bom:1.3.0",
-    "io.opentelemetry:opentelemetry-bom-alpha:1.3.0-alpha"
+    "io.opentelemetry:opentelemetry-bom:1.4.1",
+    "io.opentelemetry:opentelemetry-bom-alpha:1.4.1-alpha"
 )
 
 val DEPENDENCY_SETS = listOf<DependencySet>(

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

@@ -4,15 +4,15 @@
  */
 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.LONG_GAUGE
 import static io.opentelemetry.sdk.metrics.data.MetricDataType.DOUBLE_SUM
+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.metrics.common.Labels
+import io.opentelemetry.api.common.Attributes
 import io.opentelemetry.api.metrics.GlobalMeterProvider
 import javax.management.MBeanServer
 import javax.management.ObjectName
@@ -134,7 +134,7 @@ class InstrumentHelperTest extends Specification {
             assert metric.type == metricType
             assert metric.data.points.size() == isSingle ? 1 : 4
             metric.data.points.eachWithIndex { point, i ->
-                assert point.labels == Labels.of("labelOne", "labelOneValue", "labelTwo", "${i}")
+                assert point.attributes == Attributes.of(stringKey("labelOne"), "labelOneValue", stringKey("labelTwo"), "${i}".toString())
 
                 if (metricType == SUMMARY) {
                     assert point.count == 1