Skip to content

Commit 9498d36

Browse files
finish implementing unit test
1 parent b912f8f commit 9498d36

File tree

6 files changed

+342
-47
lines changed

6 files changed

+342
-47
lines changed

instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergMetricsReporter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import io.opentelemetry.api.common.Attributes;
1111
import io.opentelemetry.api.metrics.LongCounter;
1212
import io.opentelemetry.api.metrics.LongGauge;
13+
import java.util.Locale;
1314
import org.apache.iceberg.metrics.CommitMetricsResult;
1415
import org.apache.iceberg.metrics.CommitReport;
1516
import org.apache.iceberg.metrics.CounterResult;
@@ -57,7 +58,9 @@ void reportScanMetrics(ScanReport scanReport) {
5758

5859
if (duration != null) {
5960
LongGauge metric =
60-
ScanMetricsBuilder.totalPlanningDuration(openTelemetry.getMeter(INSTRUMENTATION_NAME));
61+
ScanMetricsBuilder.totalPlanningDuration(
62+
openTelemetry.getMeter(INSTRUMENTATION_NAME),
63+
duration.timeUnit().name().toLowerCase(Locale.getDefault()));
6164
metric.set(duration.totalDuration().toMillis(), scanAttributes);
6265
}
6366

instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@
55

66
package io.opentelemetry.instrumentation.iceberg.v1_8;
77

8+
import io.opentelemetry.api.OpenTelemetry;
89
import org.apache.iceberg.Scan;
910
import org.apache.iceberg.ScanTask;
1011
import org.apache.iceberg.ScanTaskGroup;
1112

12-
import io.opentelemetry.api.OpenTelemetry;
13-
1413
public class IcebergTelemetry {
1514
private final OpenTelemetry openTelemetry;
1615

@@ -22,7 +21,8 @@ public static IcebergTelemetry create(OpenTelemetry openTelemetry) {
2221
this.openTelemetry = openTelemetry;
2322
}
2423

25-
public <ThisT, T extends ScanTask, G extends ScanTaskGroup<T>> ThisT wrapScan(Scan<ThisT, T, G> scan) {
24+
public <ThisT, T extends ScanTask, G extends ScanTaskGroup<T>> ThisT wrapScan(
25+
Scan<ThisT, T, G> scan) {
2626
return scan.metricsReporter(new IcebergMetricsReporter(openTelemetry));
2727
}
2828
}

instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/ScanMetricsBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ final class ScanMetricsBuilder {
1919
private static final String TOTAL_DATA_MANIFESTS = ROOT + ".total.data_manifests.count";
2020
private static final String TOTAL_DELETE_MANIFESTS = ROOT + ".total.delete_manifests.count";
2121
private static final String TOTAL_FILE_SIZE_IN_BYTES = ROOT + ".scanned.data_files.size";
22-
private static final String TOTAL_DELETE_FILE_SIZE_IN_BYTES = ROOT + "scanned.delete_files.size";
22+
private static final String TOTAL_DELETE_FILE_SIZE_IN_BYTES = ROOT + ".scanned.delete_files.size";
2323
private static final String SKIPPED_DATA_MANIFESTS = ROOT + ".skipped.data_manifests.count";
2424
private static final String SKIPPED_DELETE_MANIFESTS = ROOT + ".skipped.delete_manifests.count";
2525
private static final String SKIPPED_DATA_FILES = ROOT + ".skipped.data_files.count";
@@ -34,11 +34,11 @@ private ScanMetricsBuilder() {
3434
// prevents instantiation
3535
}
3636

37-
static LongGauge totalPlanningDuration(Meter meter) {
37+
static LongGauge totalPlanningDuration(Meter meter, String unit) {
3838
return meter
3939
.gaugeBuilder(TOTAL_PLANNING_DURATION)
4040
.setDescription("The total duration needed to plan the scan.")
41-
.setUnit("ms")
41+
.setUnit(unit)
4242
.ofLongs()
4343
.build();
4444
}

instrumentation/iceberg-1.8/library/src/test/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergLibraryTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
package io.opentelemetry.instrumentation.iceberg.v1_8;
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
25

3-
import org.apache.iceberg.TableScan;
4-
import org.junit.jupiter.api.extension.RegisterExtension;
6+
package io.opentelemetry.instrumentation.iceberg.v1_8;
57

68
import io.opentelemetry.api.OpenTelemetry;
79
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
810
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
11+
import org.apache.iceberg.TableScan;
12+
import org.junit.jupiter.api.extension.RegisterExtension;
913

1014
public class IcebergLibraryTest extends AbstractIcebergTest {
1115
@RegisterExtension

instrumentation/iceberg-1.8/testing/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ dependencies {
1111
}
1212
implementation("org.apache.commons:commons-compress:1.26.2")
1313
api(project(":testing-common"))
14-
}
14+
}

0 commit comments

Comments
 (0)