Skip to content

Commit 00f5d40

Browse files
Update
1 parent 8b73c72 commit 00f5d40

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

instrumentation/spring/spring-pulsar-1.2/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ muzzle {
77
group.set("org.springframework.pulsar")
88
module.set("spring-pulsar")
99
versions.set("[1.2.0,)")
10+
assertInverse.set(true)
1011
}
1112
}
1213

@@ -15,7 +16,6 @@ dependencies {
1516
implementation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
1617

1718
testInstrumentation(project(":instrumentation:pulsar:pulsar-2.8:javaagent"))
18-
1919
testImplementation(project(":instrumentation:spring:spring-pulsar-1.2:testing"))
2020

2121
testLibrary("org.springframework.pulsar:spring-pulsar:1.2.0")

instrumentation/spring/spring-pulsar-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSingletons.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.apache.pulsar.client.api.Message;
1919

2020
public final class SpringPulsarSingletons {
21-
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.spring-pulsar-1.2";
2221
private static final Instrumenter<Message<?>, Void> INSTRUMENTER;
2322

2423
static {
@@ -31,7 +30,7 @@ public final class SpringPulsarSingletons {
3130
InstrumenterBuilder<Message<?>, Void> builder =
3231
Instrumenter.<Message<?>, Void>builder(
3332
openTelemetry,
34-
INSTRUMENTATION_NAME,
33+
"io.opentelemetry.spring-pulsar-1.2",
3534
MessagingSpanNameExtractor.create(getter, operation))
3635
.addAttributesExtractor(
3736
MessagingAttributesExtractor.builder(getter, operation)

instrumentation/spring/spring-pulsar-1.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import static io.opentelemetry.api.trace.SpanKind.PRODUCER;
1111
import static io.opentelemetry.instrumentation.testing.util.TelemetryDataUtil.orderByRootSpanKind;
1212

13-
import io.opentelemetry.instrumentation.spring.pulsar.v1_0.AbstractSpringPulsarTest;
13+
import io.opentelemetry.instrumentation.spring.pulsar.v1_2.AbstractSpringPulsarTest;
1414
import io.opentelemetry.sdk.trace.data.LinkData;
1515
import io.opentelemetry.sdk.trace.data.SpanData;
1616
import java.util.concurrent.atomic.AtomicReference;

instrumentation/spring/spring-pulsar-1.2/javaagent/src/testReceiveSpansDisabled/java/io/opentelemetry/javaagent/instrumentation/spring/pulsar/v1_2/SpringPulsarSuppressReceiveSpansTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import static io.opentelemetry.api.trace.SpanKind.CONSUMER;
99
import static io.opentelemetry.api.trace.SpanKind.PRODUCER;
1010

11-
import io.opentelemetry.instrumentation.spring.pulsar.v1_0.AbstractSpringPulsarTest;
11+
import io.opentelemetry.instrumentation.spring.pulsar.v1_2.AbstractSpringPulsarTest;
1212

1313
class SpringPulsarSuppressReceiveSpansTest extends AbstractSpringPulsarTest {
1414

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.spring.pulsar.v1_0;
6+
package io.opentelemetry.instrumentation.spring.pulsar.v1_2;
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
99
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
@@ -15,14 +15,14 @@
1515
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_MESSAGE_ID;
1616
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
1717
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
18+
import static java.util.Arrays.asList;
1819

1920
import io.opentelemetry.api.common.AttributeKey;
2021
import io.opentelemetry.instrumentation.testing.GlobalTraceUtil;
2122
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
2223
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
2324
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
2425
import java.time.Duration;
25-
import java.util.Arrays;
2626
import java.util.HashMap;
2727
import java.util.List;
2828
import java.util.Map;
@@ -113,7 +113,7 @@ static void teardown() {
113113
AttributeKey.stringKey("messaging.pulsar.message.type");
114114

115115
protected List<AttributeAssertion> publishAttributes() {
116-
return Arrays.asList(
116+
return asList(
117117
equalTo(MESSAGING_SYSTEM, "pulsar"),
118118
equalTo(MESSAGING_OPERATION, "publish"),
119119
equalTo(MESSAGING_DESTINATION_NAME, OTEL_TOPIC),
@@ -125,7 +125,7 @@ protected List<AttributeAssertion> publishAttributes() {
125125
}
126126

127127
protected List<AttributeAssertion> processAttributes() {
128-
return Arrays.asList(
128+
return asList(
129129
equalTo(MESSAGING_SYSTEM, "pulsar"),
130130
equalTo(MESSAGING_OPERATION, "process"),
131131
satisfies(MESSAGING_MESSAGE_BODY_SIZE, AbstractLongAssert::isNotNegative),
@@ -134,7 +134,7 @@ protected List<AttributeAssertion> processAttributes() {
134134
}
135135

136136
protected List<AttributeAssertion> receiveAttributes() {
137-
return Arrays.asList(
137+
return asList(
138138
equalTo(MESSAGING_SYSTEM, "pulsar"),
139139
equalTo(MESSAGING_OPERATION, "receive"),
140140
equalTo(MESSAGING_DESTINATION_NAME, OTEL_TOPIC),

0 commit comments

Comments
 (0)