Skip to content

Commit 5d94635

Browse files
ghareeb-falazighareeb-falazi
committed
Convert DoubleGauge to LongGauge
1 parent c5ca17e commit 5d94635

File tree

3 files changed

+57
-42
lines changed

3 files changed

+57
-42
lines changed

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

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

8+
import io.opentelemetry.api.OpenTelemetry;
9+
import io.opentelemetry.api.metrics.LongGauge;
810
import org.apache.iceberg.metrics.CommitReport;
911
import org.apache.iceberg.metrics.CounterResult;
1012
import org.apache.iceberg.metrics.MetricsReport;
@@ -13,11 +15,8 @@
1315
import org.apache.iceberg.metrics.ScanReport;
1416
import org.apache.iceberg.metrics.TimerResult;
1517

16-
import io.opentelemetry.api.OpenTelemetry;
17-
import io.opentelemetry.api.metrics.DoubleGauge;
18-
1918
public class IcebergMetricsReporter implements MetricsReporter {
20-
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.iceberg_1.6";
19+
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.iceberg_1.8";
2120

2221
private final OpenTelemetry openTelemetry;
2322

@@ -35,35 +34,35 @@ public void report(MetricsReport report) {
3534
}
3635

3736
void reportScanMetrics(ScanReport scanReport) {
38-
final ScanMetricsResult metrics = scanReport.scanMetrics();
37+
ScanMetricsResult metrics = scanReport.scanMetrics();
3938
TimerResult duration = metrics.totalPlanningDuration();
4039

4140
if (duration != null) {
42-
DoubleGauge metric =
41+
LongGauge metric =
4342
ScanMetricsBuilder.totalPlanningDuration(openTelemetry.getMeter(INSTRUMENTATION_NAME));
4443
metric.set(duration.totalDuration().toMillis());
4544
}
4645

4746
CounterResult current = metrics.resultDataFiles();
4847

4948
if (current != null) {
50-
DoubleGauge metric =
49+
LongGauge metric =
5150
ScanMetricsBuilder.scannedDataFilesCount(openTelemetry.getMeter(INSTRUMENTATION_NAME));
5251
metric.set(current.value());
5352
}
5453

5554
current = metrics.resultDeleteFiles();
5655

5756
if (current != null) {
58-
DoubleGauge metric =
57+
LongGauge metric =
5958
ScanMetricsBuilder.scannedDeleteFilesCount(openTelemetry.getMeter(INSTRUMENTATION_NAME));
6059
metric.set(current.value());
6160
}
6261

6362
current = metrics.scannedDataManifests();
6463

6564
if (current != null) {
66-
DoubleGauge metric =
65+
LongGauge metric =
6766
ScanMetricsBuilder.scannedDataManifestsCount(
6867
openTelemetry.getMeter(INSTRUMENTATION_NAME));
6968
metric.set(current.value());
@@ -72,7 +71,7 @@ void reportScanMetrics(ScanReport scanReport) {
7271
current = metrics.scannedDeleteManifests();
7372

7473
if (current != null) {
75-
DoubleGauge metric =
74+
LongGauge metric =
7675
ScanMetricsBuilder.scannedDeleteManifestsCount(
7776
openTelemetry.getMeter(INSTRUMENTATION_NAME));
7877
metric.set(current.value());
@@ -81,15 +80,15 @@ void reportScanMetrics(ScanReport scanReport) {
8180
current = metrics.totalDataManifests();
8281

8382
if (current != null) {
84-
DoubleGauge metric =
83+
LongGauge metric =
8584
ScanMetricsBuilder.totalDataManifestsCount(openTelemetry.getMeter(INSTRUMENTATION_NAME));
8685
metric.set(current.value());
8786
}
8887

8988
current = metrics.totalDeleteManifests();
9089

9190
if (current != null) {
92-
DoubleGauge metric =
91+
LongGauge metric =
9392
ScanMetricsBuilder.totalDeleteManifestsCount(
9493
openTelemetry.getMeter(INSTRUMENTATION_NAME));
9594
metric.set(current.value());
@@ -98,79 +97,79 @@ void reportScanMetrics(ScanReport scanReport) {
9897
current = metrics.totalFileSizeInBytes();
9998

10099
if (current != null) {
101-
DoubleGauge metric =
100+
LongGauge metric =
102101
ScanMetricsBuilder.scannedDataFilesSize(openTelemetry.getMeter(INSTRUMENTATION_NAME));
103102
metric.set(current.value());
104103
}
105104

106105
current = metrics.totalDeleteFileSizeInBytes();
107106

108107
if (current != null) {
109-
DoubleGauge metric =
108+
LongGauge metric =
110109
ScanMetricsBuilder.scannedDeleteFilesSize(openTelemetry.getMeter(INSTRUMENTATION_NAME));
111110
metric.set(current.value());
112111
}
113112

114113
current = metrics.skippedDataManifests();
115114

116115
if (current != null) {
117-
DoubleGauge metric =
116+
LongGauge metric =
118117
ScanMetricsBuilder.skippedDataManifests(openTelemetry.getMeter(INSTRUMENTATION_NAME));
119118
metric.set(current.value());
120119
}
121120

122121
current = metrics.skippedDeleteManifests();
123122

124123
if (current != null) {
125-
DoubleGauge metric =
124+
LongGauge metric =
126125
ScanMetricsBuilder.skippedDeleteManifests(openTelemetry.getMeter(INSTRUMENTATION_NAME));
127126
metric.set(current.value());
128127
}
129128

130129
current = metrics.skippedDataFiles();
131130

132131
if (current != null) {
133-
DoubleGauge metric =
132+
LongGauge metric =
134133
ScanMetricsBuilder.skippedDataFiles(openTelemetry.getMeter(INSTRUMENTATION_NAME));
135134
metric.set(current.value());
136135
}
137136

138137
current = metrics.skippedDeleteFiles();
139138

140139
if (current != null) {
141-
DoubleGauge metric =
140+
LongGauge metric =
142141
ScanMetricsBuilder.skippedDeleteFiles(openTelemetry.getMeter(INSTRUMENTATION_NAME));
143142
metric.set(current.value());
144143
}
145144

146145
current = metrics.indexedDeleteFiles();
147146

148147
if (current != null) {
149-
DoubleGauge metric =
148+
LongGauge metric =
150149
ScanMetricsBuilder.indexedDeleteFiles(openTelemetry.getMeter(INSTRUMENTATION_NAME));
151150
metric.set(current.value());
152151
}
153152

154153
current = metrics.equalityDeleteFiles();
155154

156155
if (current != null) {
157-
DoubleGauge metric =
156+
LongGauge metric =
158157
ScanMetricsBuilder.equalityDeleteFiles(openTelemetry.getMeter(INSTRUMENTATION_NAME));
159158
metric.set(current.value());
160159
}
161160

162161
current = metrics.positionalDeleteFiles();
163162

164163
if (current != null) {
165-
DoubleGauge metric =
164+
LongGauge metric =
166165
ScanMetricsBuilder.positionDeleteFiles(openTelemetry.getMeter(INSTRUMENTATION_NAME));
167166
metric.set(current.value());
168167
}
169168

170169
current = metrics.dvs();
171170

172171
if (current != null) {
173-
DoubleGauge metric =
172+
LongGauge metric =
174173
ScanMetricsBuilder.deletionVectorFiles(openTelemetry.getMeter(INSTRUMENTATION_NAME));
175174
metric.set(current.value());
176175
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

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

8-
import org.apache.iceberg.TableScan;
9-
108
import io.opentelemetry.api.OpenTelemetry;
9+
import org.apache.iceberg.TableScan;
1110

1211
public class IcebergTelemetry {
1312
private final OpenTelemetry openTelemetry;

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

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

8-
import io.opentelemetry.api.metrics.DoubleGauge;
8+
import io.opentelemetry.api.metrics.LongGauge;
99
import io.opentelemetry.api.metrics.Meter;
1010

1111
final class ScanMetricsBuilder {
@@ -33,140 +33,157 @@ private ScanMetricsBuilder() {
3333
// prevents instantiation
3434
}
3535

36-
static DoubleGauge totalPlanningDuration(Meter meter) {
36+
static LongGauge totalPlanningDuration(Meter meter) {
3737
return meter
3838
.gaugeBuilder(TOTAL_PLANNING_DURATION)
3939
.setDescription("The total duration needed to plan the scan.")
4040
.setUnit("ms")
41+
.ofLongs()
4142
.build();
4243
}
4344

44-
static DoubleGauge scannedDataFilesCount(Meter meter) {
45+
static LongGauge scannedDataFilesCount(Meter meter) {
4546
return meter
4647
.gaugeBuilder(RESULT_DATA_FILES)
4748
.setDescription("The number of scanned data files.")
4849
.setUnit("{file}")
50+
.ofLongs()
4951
.build();
5052
}
5153

52-
static DoubleGauge scannedDeleteFilesCount(Meter meter) {
54+
static LongGauge scannedDeleteFilesCount(Meter meter) {
5355
return meter
5456
.gaugeBuilder(RESULT_DELETE_FILES)
5557
.setDescription("The number of scanned delete files.")
5658
.setUnit("{file}")
59+
.ofLongs()
5760
.build();
5861
}
5962

60-
static DoubleGauge scannedDataManifestsCount(Meter meter) {
63+
static LongGauge scannedDataManifestsCount(Meter meter) {
6164
return meter
6265
.gaugeBuilder(SCANNED_DATA_MANIFESTS)
6366
.setDescription("The number of scanned data manifests.")
6467
.setUnit("{file}")
68+
.ofLongs()
6569
.build();
6670
}
6771

68-
static DoubleGauge scannedDeleteManifestsCount(Meter meter) {
72+
static LongGauge scannedDeleteManifestsCount(Meter meter) {
6973
return meter
7074
.gaugeBuilder(SCANNED_DELETE_MANIFESTS)
7175
.setDescription("The number of scanned delete manifests.")
7276
.setUnit("{file}")
77+
.ofLongs()
7378
.build();
7479
}
7580

76-
static DoubleGauge totalDataManifestsCount(Meter meter) {
81+
static LongGauge totalDataManifestsCount(Meter meter) {
7782
return meter
7883
.gaugeBuilder(TOTAL_DATA_MANIFESTS)
7984
.setDescription("The number of all data manifests.")
8085
.setUnit("{file}")
86+
.ofLongs()
8187
.build();
8288
}
8389

84-
static DoubleGauge totalDeleteManifestsCount(Meter meter) {
90+
static LongGauge totalDeleteManifestsCount(Meter meter) {
8591
return meter
8692
.gaugeBuilder(TOTAL_DELETE_MANIFESTS)
8793
.setDescription("The number of all delete manifests.")
8894
.setUnit("{file}")
95+
.ofLongs()
8996
.build();
9097
}
9198

92-
static DoubleGauge scannedDataFilesSize(Meter meter) {
99+
static LongGauge scannedDataFilesSize(Meter meter) {
93100
return meter
94101
.gaugeBuilder(TOTAL_FILE_SIZE_IN_BYTES)
95102
.setDescription("The total size of all scanned data files.")
96103
.setUnit("byte")
104+
.ofLongs()
97105
.build();
98106
}
99107

100-
static DoubleGauge scannedDeleteFilesSize(Meter meter) {
108+
static LongGauge scannedDeleteFilesSize(Meter meter) {
101109
return meter
102110
.gaugeBuilder(TOTAL_DELETE_FILE_SIZE_IN_BYTES)
103111
.setDescription("The total size of all scanned delete files.")
104112
.setUnit("byte")
113+
.ofLongs()
105114
.build();
106115
}
107116

108-
static DoubleGauge skippedDataManifests(Meter meter) {
117+
static LongGauge skippedDataManifests(Meter meter) {
109118
return meter
110119
.gaugeBuilder(SKIPPED_DATA_MANIFESTS)
111120
.setDescription("The number of data manifests that were skipped during the scan.")
112121
.setUnit("{file}")
122+
.ofLongs()
113123
.build();
114124
}
115125

116-
static DoubleGauge skippedDeleteManifests(Meter meter) {
126+
static LongGauge skippedDeleteManifests(Meter meter) {
117127
return meter
118128
.gaugeBuilder(SKIPPED_DELETE_MANIFESTS)
119129
.setDescription("The number of delete manifests that were skipped during the scan.")
120130
.setUnit("{file}")
131+
.ofLongs()
121132
.build();
122133
}
123134

124-
static DoubleGauge skippedDataFiles(Meter meter) {
135+
static LongGauge skippedDataFiles(Meter meter) {
125136
return meter
126137
.gaugeBuilder(SKIPPED_DATA_FILES)
127138
.setDescription("The number of data files that were skipped during the scan.")
128139
.setUnit("{file}")
140+
.ofLongs()
129141
.build();
130142
}
131143

132-
static DoubleGauge skippedDeleteFiles(Meter meter) {
144+
static LongGauge skippedDeleteFiles(Meter meter) {
133145
return meter
134146
.gaugeBuilder(SKIPPED_DELETE_FILES)
135147
.setDescription("The number of delete files that were skipped during the scan.")
136148
.setUnit("{file}")
149+
.ofLongs()
137150
.build();
138151
}
139152

140-
static DoubleGauge indexedDeleteFiles(Meter meter) {
153+
static LongGauge indexedDeleteFiles(Meter meter) {
141154
return meter
142155
.gaugeBuilder(INDEXED_DELETE_FILES)
143156
.setDescription(
144157
"The number of delete files constituting the delete file index for this scan.")
145158
.setUnit("{file}")
159+
.ofLongs()
146160
.build();
147161
}
148162

149-
static DoubleGauge equalityDeleteFiles(Meter meter) {
163+
static LongGauge equalityDeleteFiles(Meter meter) {
150164
return meter
151165
.gaugeBuilder(EQUALITY_DELETE_FILES)
152166
.setDescription("The number of equality delete files relevant for the current scan.")
153167
.setUnit("{file}")
168+
.ofLongs()
154169
.build();
155170
}
156171

157-
static DoubleGauge positionDeleteFiles(Meter meter) {
172+
static LongGauge positionDeleteFiles(Meter meter) {
158173
return meter
159174
.gaugeBuilder(POSITIONAL_DELETE_FILES)
160175
.setDescription("The number of position delete files relevant for the current scan.")
161176
.setUnit("{file}")
177+
.ofLongs()
162178
.build();
163179
}
164180

165-
static DoubleGauge deletionVectorFiles(Meter meter) {
181+
static LongGauge deletionVectorFiles(Meter meter) {
166182
return meter
167183
.gaugeBuilder(DVS)
168184
.setDescription("The number of deletion vector (DV) files relevant for the current scan.")
169185
.setUnit("{file}")
186+
.ofLongs()
170187
.build();
171188
}
172189
}

0 commit comments

Comments
 (0)