Skip to content

Commit d114ae6

Browse files
committed
fix
1 parent f396767 commit d114ae6

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/ArmeriaClientTelemetryBuilder.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public final class ArmeriaClientTelemetryBuilder {
2929
ArmeriaInstrumenterBuilderUtil.setClientBuilderExtractor(builder -> builder.builder);
3030
Experimental.setSetEmitExperimentalClientTelemetry(
3131
(builder, emit) -> builder.builder.setEmitExperimentalHttpClientMetrics(emit));
32+
Experimental.setSetClientPeerService(
33+
(builder, peerService) -> builder.builder.setPeerService(peerService));
3234
}
3335

3436
ArmeriaClientTelemetryBuilder(OpenTelemetry openTelemetry) {
@@ -109,14 +111,6 @@ public ArmeriaClientTelemetryBuilder setSpanNameExtractor(
109111
return this;
110112
}
111113

112-
/**
113-
* Can be used via the unstable method {@link
114-
* Experimental#setClientPeerService(ArmeriaClientTelemetryBuilder, String)}.
115-
*/
116-
void setPeerService(String peerService) {
117-
builder.setPeerService(peerService);
118-
}
119-
120114
/**
121115
* Can be used via the unstable method {@link
122116
* Experimental#setEmitExperimentalTelemetry(ArmeriaClientTelemetryBuilder, boolean)}.

instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/Experimental.java

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* APIs (or a version of them) may be promoted to the public stable API in the future, but no
1616
* guarantees are made.
1717
*/
18-
public class Experimental {
18+
public final class Experimental {
1919

2020
@Nullable
2121
private static volatile BiConsumer<ArmeriaClientTelemetryBuilder, Boolean>
@@ -25,20 +25,30 @@ public class Experimental {
2525
private static volatile BiConsumer<ArmeriaServerTelemetryBuilder, Boolean>
2626
setEmitExperimentalServerTelemetry;
2727

28-
public void setEmitExperimentalTelemetry(
28+
@Nullable
29+
private static volatile BiConsumer<ArmeriaClientTelemetryBuilder, String> setClientPeerService;
30+
31+
public static void setEmitExperimentalTelemetry(
2932
ArmeriaClientTelemetryBuilder builder, boolean emitExperimentalTelemetry) {
3033
if (setEmitExperimentalClientTelemetry != null) {
3134
setEmitExperimentalClientTelemetry.accept(builder, emitExperimentalTelemetry);
3235
}
3336
}
3437

35-
public void setEmitExperimentalTelemetry(
38+
public static void setEmitExperimentalTelemetry(
3639
ArmeriaServerTelemetryBuilder builder, boolean emitExperimentalTelemetry) {
3740
if (setEmitExperimentalServerTelemetry != null) {
3841
setEmitExperimentalServerTelemetry.accept(builder, emitExperimentalTelemetry);
3942
}
4043
}
4144

45+
public static void setClientPeerService(
46+
ArmeriaClientTelemetryBuilder builder, String peerService) {
47+
if (setClientPeerService != null) {
48+
setClientPeerService.accept(builder, peerService);
49+
}
50+
}
51+
4252
public static void setSetEmitExperimentalClientTelemetry(
4353
BiConsumer<ArmeriaClientTelemetryBuilder, Boolean> setEmitExperimentalClientTelemetry) {
4454
Experimental.setEmitExperimentalClientTelemetry = setEmitExperimentalClientTelemetry;
@@ -48,4 +58,11 @@ public static void setSetEmitExperimentalServerTelemetry(
4858
BiConsumer<ArmeriaServerTelemetryBuilder, Boolean> setEmitExperimentalServerTelemetry) {
4959
Experimental.setEmitExperimentalServerTelemetry = setEmitExperimentalServerTelemetry;
5060
}
61+
62+
public static void setSetClientPeerService(
63+
BiConsumer<ArmeriaClientTelemetryBuilder, String> setClientPeerService) {
64+
Experimental.setClientPeerService = setClientPeerService;
65+
}
66+
67+
private Experimental() {}
5168
}

0 commit comments

Comments
 (0)