Skip to content

Commit 3f84ab9

Browse files
committed
Address review comment from copilot-pull-request-reviewer: restrict counter advice
1 parent f67e0eb commit 3f84ab9

3 files changed

Lines changed: 9 additions & 13 deletions

File tree

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,22 @@ final class MessagingMetricsAdvice {
6161
SERVER_ADDRESS);
6262

6363
private static final List<AttributeKey<?>> CLIENT_OPERATION_DURATION_ATTRIBUTES =
64-
buildAttributes(true, true);
64+
buildAttributes(true, true, true);
6565
private static final List<AttributeKey<?>> SENT_MESSAGES_ATTRIBUTES =
66-
buildAttributes(false, false);
66+
buildAttributes(false, false, false);
6767
private static final List<AttributeKey<?>> CONSUMED_MESSAGES_ATTRIBUTES =
68-
buildAttributes(true, false);
68+
buildAttributes(true, false, false);
6969
private static final List<AttributeKey<?>> PROCESS_DURATION_ATTRIBUTES =
70-
buildAttributes(true, false);
70+
buildAttributes(true, false, true);
7171

7272
private static List<AttributeKey<?>> buildAttributes(
73-
boolean includeConsumerAttributes, boolean includeOperationType) {
73+
boolean includeConsumerAttributes, boolean includeOperationType, boolean includeErrorType) {
7474
List<AttributeKey<?>> attributes = new ArrayList<>();
7575
attributes.add(MESSAGING_OPERATION_NAME);
7676
attributes.add(MESSAGING_SYSTEM);
77-
attributes.add(ERROR_TYPE);
77+
if (includeErrorType) {
78+
attributes.add(ERROR_TYPE);
79+
}
7880
if (includeConsumerAttributes) {
7981
attributes.add(MESSAGING_CONSUMER_GROUP_NAME);
8082
}

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingConsumerMetricsTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,7 @@ void collectsMetricsAndCountsBatchOnce() {
165165
equalTo(MESSAGING_DESTINATION_TEMPLATE, "topic-{id}"),
166166
equalTo(
167167
MESSAGING_DESTINATION_SUBSCRIPTION_NAME,
168-
"subscription"),
169-
equalTo(
170-
ERROR_TYPE,
171-
IllegalStateException.class.getName())))));
168+
"subscription")))));
172169
}
173170
}
174171

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,6 @@ void collectsMetrics() {
145145
equalTo(MESSAGING_OPERATION_NAME, "send"),
146146
equalTo(MESSAGING_SYSTEM, "pulsar"),
147147
equalTo(MESSAGING_DESTINATION_TEMPLATE, "topic-{id}"),
148-
equalTo(
149-
ERROR_TYPE,
150-
IllegalStateException.class.getName()),
151148
equalTo(SERVER_ADDRESS, "localhost"),
152149
equalTo(MESSAGING_DESTINATION_PARTITION_ID, "1"),
153150
equalTo(SERVER_PORT, 6650)))));

0 commit comments

Comments
 (0)