open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate to guava JRE version (#2590)

This commit is contained in:
Anuraag Agrawal 2021-01-27 13:28:57 +09:00 committed by GitHub
parent 684ba70ce5
commit 760b012430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -165,7 +165,7 @@ subprojects {
errorProneJavacVersion = '9+181-r4173-1'
findBugsJsr305Version = '3.0.2'
grpcVersion = '1.34.1'
guavaVersion = '30.1-android'
guavaVersion = '30.1-jre'
jacksonVersion = '2.12.0'
jmhVersion = '1.26'
junitVersion = '5.7.0'

53
opencensus-shim/src/test/java/io/opentelemetry/opencensusshim/InteroperabilityTest.java
View File

@ -62,8 +62,10 @@ import io.opentelemetry.sdk.trace.data.StatusData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@ -412,28 +414,23 @@ class InteroperabilityTest {
statsRecorder.newMeasureMap().put(latency2, 60).record();
}
List<List<MetricData>> exported = metricExporter.waitForNumberOfExports(3);
List<MetricData> metricData = exported.get(2);
List<MetricData> metricData =
exported.get(2).stream()
.sorted(Comparator.comparing(MetricData::getName))
.collect(Collectors.toList());
assertThat(metricData.size()).isEqualTo(4);
MetricData metric = metricData.get(0);
assertThat(metric.getName()).isEqualTo("long_sum");
assertThat(metric.getDescription()).isEqualTo("long sum");
assertThat(metric.getName()).isEqualTo("double_gauge");
assertThat(metric.getDescription()).isEqualTo("double gauge");
assertThat(metric.getUnit()).isEqualTo("ms");
assertThat(metric.getType()).isEqualTo(MetricDataType.LONG_SUM);
assertThat(metric.getLongSumData().getPoints().size()).isEqualTo(1);
PointData pointData = metric.getLongSumData().getPoints().iterator().next();
assertThat(((LongPointData) pointData).getValue()).isEqualTo(50);
assertThat(pointData.getLabels().size()).isEqualTo(1);
assertThat(pointData.getLabels().get(tagKey.getName())).isEqualTo(tagValue.asString());
assertThat(metric.getType()).isEqualTo(MetricDataType.DOUBLE_GAUGE);
assertThat(metric.getDoubleGaugeData().getPoints().size()).isEqualTo(1);
PointData pointData = metric.getDoubleGaugeData().getPoints().iterator().next();
assertThat(((DoublePointData) pointData).getValue()).isEqualTo(60);
assertThat(pointData.getLabels().size()).isEqualTo(0);
metric = metricData.get(1);
assertThat(metric.getName()).isEqualTo("long_gauge");
assertThat(metric.getDescription()).isEqualTo("long gauge");
assertThat(metric.getUnit()).isEqualTo("ms");
assertThat(metric.getType()).isEqualTo(MetricDataType.LONG_GAUGE);
assertThat(metric.getLongGaugeData().getPoints().size()).isEqualTo(1);
metric = metricData.get(2);
assertThat(metric.getName()).isEqualTo("double_sum");
assertThat(metric.getDescription()).isEqualTo("double sum");
assertThat(metric.getUnit()).isEqualTo("ms");
@ -443,15 +440,23 @@ class InteroperabilityTest {
assertThat(((DoublePointData) pointData).getValue()).isEqualTo(60);
assertThat(pointData.getLabels().size()).isEqualTo(0);
metric = metricData.get(3);
assertThat(metric.getName()).isEqualTo("double_gauge");
assertThat(metric.getDescription()).isEqualTo("double gauge");
metric = metricData.get(2);
assertThat(metric.getName()).isEqualTo("long_gauge");
assertThat(metric.getDescription()).isEqualTo("long gauge");
assertThat(metric.getUnit()).isEqualTo("ms");
assertThat(metric.getType()).isEqualTo(MetricDataType.DOUBLE_GAUGE);
assertThat(metric.getDoubleGaugeData().getPoints().size()).isEqualTo(1);
pointData = metric.getDoubleGaugeData().getPoints().iterator().next();
assertThat(((DoublePointData) pointData).getValue()).isEqualTo(60);
assertThat(pointData.getLabels().size()).isEqualTo(0);
assertThat(metric.getType()).isEqualTo(MetricDataType.LONG_GAUGE);
assertThat(metric.getLongGaugeData().getPoints().size()).isEqualTo(1);
metric = metricData.get(3);
assertThat(metric.getName()).isEqualTo("long_sum");
assertThat(metric.getDescription()).isEqualTo("long sum");
assertThat(metric.getUnit()).isEqualTo("ms");
assertThat(metric.getType()).isEqualTo(MetricDataType.LONG_SUM);
assertThat(metric.getLongSumData().getPoints().size()).isEqualTo(1);
pointData = metric.getLongSumData().getPoints().iterator().next();
assertThat(((LongPointData) pointData).getValue()).isEqualTo(50);
assertThat(pointData.getLabels().size()).isEqualTo(1);
assertThat(pointData.getLabels().get(tagKey.getName())).isEqualTo(tagValue.asString());
}
@Test

3
sdk/common/src/test/java/io/opentelemetry/sdk/common/CompletableResultCodeTest.java
View File

@ -9,6 +9,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import com.google.common.util.concurrent.Uninterruptibles;
import java.time.Duration;
import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@ -149,7 +150,7 @@ class CompletableResultCodeTest {
CompletableResultCode result = new CompletableResultCode();
new Thread(
() -> {
Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS);
Uninterruptibles.sleepUninterruptibly(Duration.ofMillis(50));
result.succeed();
})
.start();

7
sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/StressTestRunner.java
View File

@ -8,10 +8,10 @@ package io.opentelemetry.sdk.metrics;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Uninterruptibles;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.annotation.concurrent.Immutable;
@AutoValue
@ -32,8 +32,7 @@ abstract class StressTestRunner {
() -> {
// While workers still work, do collections.
while (countDownLatch.getCount() != 0) {
Uninterruptibles.sleepUninterruptibly(
getCollectionIntervalMs(), TimeUnit.MILLISECONDS);
Uninterruptibles.sleepUninterruptibly(Duration.ofMillis(getCollectionIntervalMs()));
}
});
List<Thread> operationThreads = new ArrayList<>(numThreads);
@ -44,7 +43,7 @@ abstract class StressTestRunner {
for (int i = 0; i < operation.getNumOperations(); i++) {
operation.getUpdater().update();
Uninterruptibles.sleepUninterruptibly(
operation.getOperationDelayMs(), TimeUnit.MILLISECONDS);
Duration.ofMillis(operation.getOperationDelayMs()));
}
countDownLatch.countDown();
}));

3
sdk/trace/src/test/java/io/opentelemetry/sdk/trace/StressTestRunner.java
View File

@ -8,6 +8,7 @@ package io.opentelemetry.sdk.trace;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Uninterruptibles;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@ -35,7 +36,7 @@ abstract class StressTestRunner {
for (int i = 0; i < operation.getNumOperations(); i++) {
operation.getUpdater().update();
Uninterruptibles.sleepUninterruptibly(
operation.getOperationDelayMs(), TimeUnit.MILLISECONDS);
Duration.ofMillis(operation.getOperationDelayMs()));
}
countDownLatch.countDown();
}));