Skip to content

Commit 066d459

Browse files
mccullsmcculls
committed
Reuse OtelInstrumentBuilder/Descriptor/Type
1 parent 4fe90d3 commit 066d459

16 files changed

Lines changed: 44 additions & 35 deletions

File tree

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelInstrumentBuilder.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentBuilder.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package datadog.opentelemetry.shim.metrics;
1+
package datadog.trace.bootstrap.otel.metrics;
22

33
import javax.annotation.Nullable;
44

5-
final class OtelInstrumentBuilder {
5+
public final class OtelInstrumentBuilder {
66
private final String instrumentName;
77
private final OtelInstrumentType instrumentType;
88
private final boolean longValues;
@@ -17,7 +17,8 @@ final class OtelInstrumentBuilder {
1717
* @param instrumentType the type of the instrument
1818
* @return new instrument builder
1919
*/
20-
static OtelInstrumentBuilder ofLongs(String instrumentName, OtelInstrumentType instrumentType) {
20+
public static OtelInstrumentBuilder ofLongs(
21+
String instrumentName, OtelInstrumentType instrumentType) {
2122
return new OtelInstrumentBuilder(instrumentName, instrumentType, true);
2223
}
2324

@@ -28,7 +29,7 @@ static OtelInstrumentBuilder ofLongs(String instrumentName, OtelInstrumentType i
2829
* @param instrumentType the type of the instrument
2930
* @return new instrument builder
3031
*/
31-
static OtelInstrumentBuilder ofLongs(
32+
public static OtelInstrumentBuilder ofLongs(
3233
OtelInstrumentBuilder builder, OtelInstrumentType instrumentType) {
3334
return new OtelInstrumentBuilder(builder.instrumentName, instrumentType, true);
3435
}
@@ -40,7 +41,8 @@ static OtelInstrumentBuilder ofLongs(
4041
* @param instrumentType the type of the instrument
4142
* @return new instrument builder
4243
*/
43-
static OtelInstrumentBuilder ofDoubles(String instrumentName, OtelInstrumentType instrumentType) {
44+
public static OtelInstrumentBuilder ofDoubles(
45+
String instrumentName, OtelInstrumentType instrumentType) {
4446
return new OtelInstrumentBuilder(instrumentName, instrumentType, false);
4547
}
4648

@@ -51,7 +53,7 @@ static OtelInstrumentBuilder ofDoubles(String instrumentName, OtelInstrumentType
5153
* @param instrumentType the type of the instrument
5254
* @return new instrument builder
5355
*/
54-
static OtelInstrumentBuilder ofDoubles(
56+
public static OtelInstrumentBuilder ofDoubles(
5557
OtelInstrumentBuilder builder, OtelInstrumentType instrumentType) {
5658
return new OtelInstrumentBuilder(builder.instrumentName, instrumentType, false);
5759
}
@@ -63,20 +65,20 @@ private OtelInstrumentBuilder(
6365
this.longValues = longValues;
6466
}
6567

66-
void setDescription(String description) {
68+
public void setDescription(String description) {
6769
this.description = description;
6870
}
6971

70-
void setUnit(String unit) {
72+
public void setUnit(String unit) {
7173
this.unit = unit;
7274
}
7375

74-
OtelInstrumentDescriptor descriptor() {
76+
public OtelInstrumentDescriptor descriptor() {
7577
return new OtelInstrumentDescriptor(
7678
instrumentName, instrumentType, longValues, description, unit);
7779
}
7880

79-
OtelInstrumentDescriptor observableDescriptor() {
81+
public OtelInstrumentDescriptor observableDescriptor() {
8082
return new OtelInstrumentDescriptor(
8183
instrumentName, observableType(instrumentType), longValues, description, unit);
8284
}

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelInstrumentDescriptor.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics;
1+
package datadog.trace.bootstrap.otel.metrics;
22

33
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
44
import java.util.Locale;

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelInstrumentType.java renamed to dd-java-agent/agent-otel/otel-bootstrap/src/main/java/datadog/trace/bootstrap/otel/metrics/OtelInstrumentType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.opentelemetry.shim.metrics;
1+
package datadog.trace.bootstrap.otel.metrics;
22

33
public enum OtelInstrumentType {
44
// same order as io.opentelemetry.sdk.metrics.InstrumentType

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleCounter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package datadog.opentelemetry.shim.metrics;
22

3-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofDoubles;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.COUNTER;
3+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofDoubles;
4+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.COUNTER;
55

66
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
7+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
78
import datadog.trace.relocate.api.RatelimitedLogger;
89
import io.opentelemetry.api.common.Attributes;
910
import io.opentelemetry.api.metrics.DoubleCounter;

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleGauge.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package datadog.opentelemetry.shim.metrics;
22

3-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofDoubles;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.GAUGE;
3+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofDoubles;
4+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.GAUGE;
55

66
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
7+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
78
import io.opentelemetry.api.common.Attributes;
89
import io.opentelemetry.api.metrics.DoubleGauge;
910
import io.opentelemetry.api.metrics.DoubleGaugeBuilder;

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleHistogram.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package datadog.opentelemetry.shim.metrics;
22

3-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofDoubles;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.HISTOGRAM;
53
import static datadog.opentelemetry.shim.metrics.data.OtelMetricStorage.newHistogramStorage;
4+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofDoubles;
5+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.HISTOGRAM;
66
import static java.util.Arrays.asList;
77
import static java.util.Collections.emptyList;
88

99
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
10+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
1011
import datadog.trace.relocate.api.RatelimitedLogger;
1112
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1213
import io.opentelemetry.api.common.Attributes;

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelDoubleUpDownCounter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package datadog.opentelemetry.shim.metrics;
22

3-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofDoubles;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.UP_DOWN_COUNTER;
3+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofDoubles;
4+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.UP_DOWN_COUNTER;
55

66
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
7+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
78
import io.opentelemetry.api.common.Attributes;
89
import io.opentelemetry.api.metrics.DoubleUpDownCounter;
910
import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongCounter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package datadog.opentelemetry.shim.metrics;
22

3-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofLongs;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.COUNTER;
3+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofLongs;
4+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.COUNTER;
55

66
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
7+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
78
import datadog.trace.relocate.api.RatelimitedLogger;
89
import io.opentelemetry.api.common.Attributes;
910
import io.opentelemetry.api.metrics.DoubleCounterBuilder;

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongGauge.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package datadog.opentelemetry.shim.metrics;
22

3-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofLongs;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.GAUGE;
3+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofLongs;
4+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.GAUGE;
55

66
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
7+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
78
import io.opentelemetry.api.common.Attributes;
89
import io.opentelemetry.api.metrics.LongGauge;
910
import io.opentelemetry.api.metrics.LongGaugeBuilder;

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/metrics/OtelLongHistogram.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package datadog.opentelemetry.shim.metrics;
22

33
import static datadog.opentelemetry.shim.metrics.OtelDoubleHistogram.Builder.validateBoundaries;
4-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentBuilder.ofLongs;
5-
import static datadog.opentelemetry.shim.metrics.OtelInstrumentType.HISTOGRAM;
64
import static datadog.opentelemetry.shim.metrics.data.OtelMetricStorage.newHistogramStorage;
5+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder.ofLongs;
6+
import static datadog.trace.bootstrap.otel.metrics.OtelInstrumentType.HISTOGRAM;
77
import static java.util.stream.Collectors.toList;
88

99
import datadog.opentelemetry.shim.metrics.data.OtelMetricStorage;
10+
import datadog.trace.bootstrap.otel.metrics.OtelInstrumentBuilder;
1011
import datadog.trace.relocate.api.RatelimitedLogger;
1112
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1213
import io.opentelemetry.api.common.Attributes;

0 commit comments

Comments
 (0)