Skip to content

Commit af1dd70

Browse files
apply suggestions from code review
1 parent 061f58f commit af1dd70

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ static LongCounter scannedDataFilesSize(Meter meter) {
9595
return meter
9696
.counterBuilder(TOTAL_FILE_SIZE_IN_BYTES)
9797
.setDescription("The total size of all scanned data files.")
98-
.setUnit("byte")
98+
.setUnit("By")
9999
.build();
100100
}
101101

102102
static LongCounter scannedDeleteFilesSize(Meter meter) {
103103
return meter
104104
.counterBuilder(TOTAL_DELETE_FILE_SIZE_IN_BYTES)
105105
.setDescription("The total size of all scanned delete files.")
106-
.setUnit("byte")
106+
.setUnit("By")
107107
.build();
108108
}
109109

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55

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

8+
import org.apache.iceberg.TableScan;
9+
import org.junit.jupiter.api.extension.RegisterExtension;
10+
811
import io.opentelemetry.api.OpenTelemetry;
912
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1013
import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
11-
import org.apache.iceberg.TableScan;
12-
import org.junit.jupiter.api.extension.RegisterExtension;
1314

14-
public class IcebergLibraryTest extends AbstractIcebergTest {
15+
class IcebergTest extends AbstractIcebergTest {
1516
@RegisterExtension
1617
final InstrumentationExtension testing = LibraryInstrumentationExtension.create();
1718

instrumentation/iceberg-1.8/testing/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/AbstractIcebergTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
import static org.junit.jupiter.api.Assertions.assertNotNull;
1010
import static org.junit.jupiter.api.Assertions.assertTrue;
1111

12-
import io.opentelemetry.api.common.Attributes;
13-
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1412
import java.io.File;
1513
import java.io.IOException;
1614
import java.util.Arrays;
1715
import java.util.Locale;
16+
1817
import org.apache.iceberg.DataFile;
1918
import org.apache.iceberg.DataFiles;
2019
import org.apache.iceberg.FileScanTask;
@@ -38,6 +37,9 @@
3837
import org.junit.jupiter.api.Test;
3938
import org.junit.jupiter.api.io.TempDir;
4039

40+
import io.opentelemetry.api.common.Attributes;
41+
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
42+
4143
public abstract class AbstractIcebergTest {
4244
protected static final int FORMAT_VERSION = 2;
4345
protected static final Schema SCHEMA =
@@ -172,7 +174,7 @@ void testCreateTelemetry() throws IOException {
172174

173175
if (currentExpectedMetric != null) {
174176
assertIcebergCounterMetric(
175-
"iceberg.scan.scanned.data_files.size", "byte", expected, currentExpectedMetric.value());
177+
"iceberg.scan.scanned.data_files.size", "By", expected, currentExpectedMetric.value());
176178
} else {
177179
assertIcebergMetricNotReported("iceberg.scan.scanned.data_files.size");
178180
}
@@ -182,7 +184,7 @@ void testCreateTelemetry() throws IOException {
182184
if (currentExpectedMetric != null) {
183185
assertIcebergCounterMetric(
184186
"iceberg.scan.scanned.delete_files.size",
185-
"byte",
187+
"By",
186188
expected,
187189
currentExpectedMetric.value());
188190
} else {
@@ -310,7 +312,7 @@ private void assertIcebergGaugeMetric(
310312
String otelMetricName, String expectedUnit, ScanReport expectedReport, long expectedValue) {
311313
testing()
312314
.waitAndAssertMetrics(
313-
"io.opentelemetry.iceberg_1.8",
315+
"io.opentelemetry.iceberg-1.8",
314316
metricAssert ->
315317
metricAssert
316318
.hasName(otelMetricName)
@@ -342,7 +344,7 @@ private void assertIcebergCounterMetric(
342344
String otelMetricName, String expectedUnit, ScanReport expectedReport, long expectedValue) {
343345
testing()
344346
.waitAndAssertMetrics(
345-
"io.opentelemetry.iceberg_1.8",
347+
"io.opentelemetry.iceberg-1.8",
346348
metricAssert ->
347349
metricAssert
348350
.hasName(otelMetricName)

0 commit comments

Comments
 (0)