Skip to content

Commit 9fb5b3f

Browse files
authored
Bridge incubator metrics apis (#9884)
1 parent 7400025 commit 9fb5b3f

File tree

29 files changed

+1074
-20
lines changed

29 files changed

+1074
-20
lines changed

instrumentation/opentelemetry-api/opentelemetry-api-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/trace/Bridging.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import application.io.opentelemetry.api.trace.StatusCode;
1616
import application.io.opentelemetry.api.trace.TraceState;
1717
import application.io.opentelemetry.api.trace.TraceStateBuilder;
18+
import java.util.ArrayList;
19+
import java.util.List;
1820
import java.util.logging.Logger;
1921

2022
/**
@@ -143,6 +145,16 @@ public static io.opentelemetry.api.common.AttributeKey toAgent(AttributeKey appl
143145
return null;
144146
}
145147

148+
public static List<io.opentelemetry.api.common.AttributeKey<?>> toAgent(
149+
List<AttributeKey<?>> attributeKeys) {
150+
List<io.opentelemetry.api.common.AttributeKey<?>> result =
151+
new ArrayList<>(attributeKeys.size());
152+
for (AttributeKey<?> attributeKey : attributeKeys) {
153+
result.add(toAgent(attributeKey));
154+
}
155+
return result;
156+
}
157+
146158
public static io.opentelemetry.api.trace.StatusCode toAgent(StatusCode applicationStatus) {
147159
io.opentelemetry.api.trace.StatusCode agentCanonicalCode;
148160
try {

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleCounterBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1313
import java.util.function.Consumer;
1414

15-
final class ApplicationDoubleCounterBuilder implements DoubleCounterBuilder {
15+
public class ApplicationDoubleCounterBuilder implements DoubleCounterBuilder {
1616

1717
private final io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder;
1818

19-
ApplicationDoubleCounterBuilder(io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder) {
19+
protected ApplicationDoubleCounterBuilder(
20+
io.opentelemetry.api.metrics.DoubleCounterBuilder agentBuilder) {
2021
this.agentBuilder = agentBuilder;
2122
}
2223

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleGaugeBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1313
import java.util.function.Consumer;
1414

15-
final class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder {
15+
public class ApplicationDoubleGaugeBuilder implements DoubleGaugeBuilder {
1616

1717
private final io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder;
1818

19-
ApplicationDoubleGaugeBuilder(io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) {
19+
protected ApplicationDoubleGaugeBuilder(
20+
io.opentelemetry.api.metrics.DoubleGaugeBuilder agentBuilder) {
2021
this.agentBuilder = agentBuilder;
2122
}
2223

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleHistogramBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import application.io.opentelemetry.api.metrics.LongHistogramBuilder;
1111
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1212

13-
final class ApplicationDoubleHistogramBuilder implements DoubleHistogramBuilder {
13+
public class ApplicationDoubleHistogramBuilder implements DoubleHistogramBuilder {
1414

1515
private final io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder;
1616

17-
ApplicationDoubleHistogramBuilder(
17+
protected ApplicationDoubleHistogramBuilder(
1818
io.opentelemetry.api.metrics.DoubleHistogramBuilder agentBuilder) {
1919
this.agentBuilder = agentBuilder;
2020
}

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationDoubleUpDownCounterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1313
import java.util.function.Consumer;
1414

15-
final class ApplicationDoubleUpDownCounterBuilder implements DoubleUpDownCounterBuilder {
15+
public class ApplicationDoubleUpDownCounterBuilder implements DoubleUpDownCounterBuilder {
1616

1717
private final io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder;
1818

19-
ApplicationDoubleUpDownCounterBuilder(
19+
protected ApplicationDoubleUpDownCounterBuilder(
2020
io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder agentBuilder) {
2121
this.agentBuilder = agentBuilder;
2222
}

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongCounterBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1414
import java.util.function.Consumer;
1515

16-
final class ApplicationLongCounterBuilder implements LongCounterBuilder {
16+
public class ApplicationLongCounterBuilder implements LongCounterBuilder {
1717

1818
private final io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder;
1919

20-
ApplicationLongCounterBuilder(io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) {
20+
protected ApplicationLongCounterBuilder(
21+
io.opentelemetry.api.metrics.LongCounterBuilder agentBuilder) {
2122
this.agentBuilder = agentBuilder;
2223
}
2324

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongGaugeBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,12 @@
1111
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1212
import java.util.function.Consumer;
1313

14-
final class ApplicationLongGaugeBuilder implements LongGaugeBuilder {
14+
public class ApplicationLongGaugeBuilder implements LongGaugeBuilder {
1515

1616
private final io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder;
1717

18-
ApplicationLongGaugeBuilder(io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) {
18+
protected ApplicationLongGaugeBuilder(
19+
io.opentelemetry.api.metrics.LongGaugeBuilder agentBuilder) {
1920
this.agentBuilder = agentBuilder;
2021
}
2122

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongHistogramBuilder.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
import application.io.opentelemetry.api.metrics.LongHistogramBuilder;
1010
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1111

12-
final class ApplicationLongHistogramBuilder implements LongHistogramBuilder {
12+
public class ApplicationLongHistogramBuilder implements LongHistogramBuilder {
1313

1414
private final io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder;
1515

16-
ApplicationLongHistogramBuilder(io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) {
16+
protected ApplicationLongHistogramBuilder(
17+
io.opentelemetry.api.metrics.LongHistogramBuilder agentBuilder) {
1718
this.agentBuilder = agentBuilder;
1819
}
1920

instrumentation/opentelemetry-api/opentelemetry-api-1.10/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_10/metrics/ApplicationLongUpDownCounterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
import com.google.errorprone.annotations.CanIgnoreReturnValue;
1414
import java.util.function.Consumer;
1515

16-
final class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBuilder {
16+
public class ApplicationLongUpDownCounterBuilder implements LongUpDownCounterBuilder {
1717

1818
private final io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder;
1919

20-
ApplicationLongUpDownCounterBuilder(
20+
protected ApplicationLongUpDownCounterBuilder(
2121
io.opentelemetry.api.metrics.LongUpDownCounterBuilder agentBuilder) {
2222
this.agentBuilder = agentBuilder;
2323
}

instrumentation/opentelemetry-api/opentelemetry-api-1.15/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/opentelemetryapi/v1_15/metrics/ApplicationMeter115.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ApplicationMeter;
1111
import io.opentelemetry.javaagent.instrumentation.opentelemetryapi.v1_10.metrics.ObservableMeasurementWrapper;
1212

13-
class ApplicationMeter115 extends ApplicationMeter {
13+
public class ApplicationMeter115 extends ApplicationMeter {
1414

1515
private final io.opentelemetry.api.metrics.Meter agentMeter;
1616

17-
ApplicationMeter115(io.opentelemetry.api.metrics.Meter agentMeter) {
17+
protected ApplicationMeter115(io.opentelemetry.api.metrics.Meter agentMeter) {
1818
super(agentMeter);
1919
this.agentMeter = agentMeter;
2020
}

0 commit comments

Comments
 (0)