Skip to content

Commit 54dbb34

Browse files
otelbot[bot]trask
otelbot[bot]
and
trask
authored
Module cleanup (run 25322486657) (open-telemetry#18562)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent e5bbb7e commit 54dbb34

10 files changed

Lines changed: 31 additions & 30 deletions

File tree

‎instrumentation/jedis/jedis-1.4/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jedis/v1_4/JedisSingletons.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1414
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;
1515

16-
public class JedisSingletons {
16+
class JedisSingletons {
1717
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.jedis-1.4";
1818

1919
private static final Instrumenter<JedisRequest, Void> instrumenter;
@@ -34,7 +34,7 @@ public class JedisSingletons {
3434
.buildInstrumenter(SpanKindExtractor.alwaysClient());
3535
}
3636

37-
public static Instrumenter<JedisRequest, Void> instrumenter() {
37+
static Instrumenter<JedisRequest, Void> instrumenter() {
3838
return instrumenter;
3939
}
4040

‎instrumentation/jetty-httpclient/jetty-httpclient-9.2/testing/src/main/java/io/opentelemetry/instrumentation/jetty/httpclient/v9_2/AbstractJettyClient9Test.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public abstract class AbstractJettyClient9Test extends AbstractHttpClientTest<Re
3131
private HttpClient client;
3232
private HttpClient httpsClient;
3333

34+
protected abstract HttpClient createStandardClient();
35+
36+
protected abstract HttpClient createHttpsClient(SslContextFactory sslContextFactory);
37+
3438
@BeforeEach
3539
void before() throws Exception {
3640
// Start the main Jetty HttpClient and a https client
@@ -107,8 +111,4 @@ public void onFailure(Response responseF, Throwable failure) {
107111
this.failure = failure;
108112
}
109113
}
110-
111-
protected abstract HttpClient createStandardClient();
112-
113-
protected abstract HttpClient createHttpsClient(SslContextFactory sslContextFactory);
114114
}

‎instrumentation/jetty/jetty-8.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jetty/v8_0/QueuedThreadPoolTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import static org.junit.jupiter.api.Assumptions.abort;
99

1010
import io.opentelemetry.api.trace.SpanKind;
11+
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
1112
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1213
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1314
import java.lang.reflect.Method;
@@ -20,6 +21,8 @@ class QueuedThreadPoolTest {
2021
@RegisterExtension
2122
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
2223

24+
@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
25+
2326
@Test
2427
void dispatchPropagates() throws Exception {
2528
QueuedThreadPool pool = new QueuedThreadPool();
@@ -33,6 +36,7 @@ void dispatchPropagates() throws Exception {
3336
return;
3437
}
3538
pool.start();
39+
cleanup.deferCleanup(pool::stop);
3640

3741
testing.runWithSpan(
3842
"parent",
@@ -55,8 +59,6 @@ void dispatchPropagates() throws Exception {
5559
span.hasName("asyncChild")
5660
.hasKind(SpanKind.INTERNAL)
5761
.hasParent(trace.getSpan(0))));
58-
59-
pool.stop();
6062
}
6163

6264
@Test
@@ -72,6 +74,7 @@ void dispatchPropagatesLambda() throws Exception {
7274
return;
7375
}
7476
pool.start();
77+
cleanup.deferCleanup(pool::stop);
7578

7679
JavaAsyncChild child = new JavaAsyncChild(true, true);
7780
testing.runWithSpan(
@@ -92,7 +95,5 @@ void dispatchPropagatesLambda() throws Exception {
9295
span.hasName("asyncChild")
9396
.hasKind(SpanKind.INTERNAL)
9497
.hasParent(trace.getSpan(0))));
95-
96-
pool.stop();
9798
}
9899
}

‎instrumentation/jfinal-3.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jfinal/v3_2/JFinalSingletons.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ public class JFinalSingletons {
2828
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/11465#issuecomment-2137294837
2929
excludeOtAttrs();
3030

31-
CodeAttributesGetter<ClassAndMethod> codedAttributesGetter =
31+
CodeAttributesGetter<ClassAndMethod> codeAttributesGetter =
3232
ClassAndMethod.codeAttributesGetter();
3333
instrumenter =
3434
Instrumenter.<ClassAndMethod, Void>builder(
3535
GlobalOpenTelemetry.get(),
3636
"io.opentelemetry.jfinal-3.2",
37-
CodeSpanNameExtractor.create(codedAttributesGetter))
37+
CodeSpanNameExtractor.create(codeAttributesGetter))
3838
.setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
39-
.addAttributesExtractor(CodeAttributesExtractor.create(codedAttributesGetter))
39+
.addAttributesExtractor(CodeAttributesExtractor.create(codeAttributesGetter))
4040
.buildInstrumenter();
4141
}
4242

‎instrumentation/jms/jms-1.1/javaagent/src/jms2Test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/Jms2InstrumentationTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ class Jms2InstrumentationTest {
6969

7070
@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
7171

72-
static HornetQServer server;
73-
static HornetQConnectionFactory connectionFactory;
74-
static Session session;
75-
static Connection connection;
72+
private static Session session;
7673

7774
@BeforeAll
7875
static void setUp() throws Exception {
@@ -92,7 +89,7 @@ static void setUp() throws Exception {
9289
new HashSet<>(
9390
singletonList(new TransportConfiguration(InVMAcceptorFactory.class.getName()))));
9491

95-
server = HornetQServers.newHornetQServer(config);
92+
HornetQServer server = HornetQServers.newHornetQServer(config);
9693
server.start();
9794
cleanup.deferAfterAll(server::stop);
9895

@@ -107,10 +104,10 @@ static void setUp() throws Exception {
107104
sf.close();
108105
serverLocator.close();
109106

110-
connectionFactory =
107+
HornetQConnectionFactory connectionFactory =
111108
HornetQJMSClient.createConnectionFactoryWithoutHA(
112109
JMSFactoryType.CF, new TransportConfiguration(InVMConnectorFactory.class.getName()));
113-
connection = connectionFactory.createConnection();
110+
Connection connection = connectionFactory.createConnection();
114111
connection.start();
115112
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
116113
session.run();

‎instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsMessageConsumerInstrumentation.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
2020
import io.opentelemetry.javaagent.instrumentation.jms.common.v1_1.MessageWithDestination;
21+
import javax.annotation.Nullable;
2122
import javax.jms.Message;
2223
import net.bytebuddy.asm.Advice;
2324
import net.bytebuddy.description.type.TypeDescription;
@@ -60,7 +61,8 @@ public static Timer onEnter() {
6061
}
6162

6263
@Advice.OnMethodExit(suppress = Throwable.class, inline = false)
63-
public static void stopSpan(@Advice.Enter Timer timer, @Advice.Return Message message) {
64+
public static void stopSpan(
65+
@Advice.Enter Timer timer, @Advice.Return @Nullable Message message) {
6466
if (message == null) {
6567
// Do not create span when no message is received
6668
return;

‎instrumentation/jms/jms-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/JmsMessageProducerInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public static AdviceScope onEnter(
110110
Destination destination;
111111
try {
112112
destination = producer.getDestination();
113-
} catch (JMSException e) {
113+
} catch (JMSException ignored) {
114114
destination = null;
115115
}
116116
CallDepth callDepth = CallDepth.forClass(MessageProducer.class);

‎instrumentation/jms/jms-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v1_1/AbstractJms1Test.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,31 +49,28 @@
4949

5050
@SuppressWarnings("deprecation") // using deprecated semconv
5151
abstract class AbstractJms1Test {
52-
static final Logger logger = LoggerFactory.getLogger(AbstractJms1Test.class);
52+
private static final Logger logger = LoggerFactory.getLogger(AbstractJms1Test.class);
5353

5454
@RegisterExtension
5555
static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
5656

5757
@RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
5858

59-
static GenericContainer<?> broker;
60-
static ActiveMQConnectionFactory connectionFactory;
61-
static Connection connection;
6259
static Session session;
6360

6461
@BeforeAll
6562
static void setUp() throws JMSException {
66-
broker =
63+
GenericContainer<?> broker =
6764
new GenericContainer<>("apache/activemq-classic:5.19.2")
6865
.withExposedPorts(61616, 8161)
6966
.withLogConsumer(new Slf4jLogConsumer(logger));
7067
broker.start();
7168
cleanup.deferAfterAll(broker);
7269

73-
connectionFactory =
70+
ActiveMQConnectionFactory connectionFactory =
7471
new ActiveMQConnectionFactory(
7572
"tcp://" + broker.getHost() + ":" + broker.getMappedPort(61616));
76-
connection = connectionFactory.createConnection();
73+
Connection connection = connectionFactory.createConnection();
7774
connection.start();
7875
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
7976
cleanup.deferAfterAll(connection::close);

‎instrumentation/jms/jms-3.0/javaagent/build.gradle.kts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ tasks {
5656
excludeTestsMatching("Jms3SuppressReceiveSpansTest")
5757
}
5858
jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
59+
systemProperty(
60+
"metadataConfig",
61+
"otel.instrumentation.messaging.experimental.receive-telemetry.enabled=true",
62+
)
5963
}
6064

6165
check {

‎instrumentation/jms/jms-common-1.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jms/common/v1_1/JmsMessageAttributesGetter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public Long getMessageEnvelopeSize(MessageWithDestination messageWithDestination
6969

7070
@Nullable
7171
@Override
72-
public String getMessageId(MessageWithDestination messageWithDestination, Void unused) {
72+
public String getMessageId(MessageWithDestination messageWithDestination, @Nullable Void unused) {
7373
try {
7474
return messageWithDestination.message().getJmsMessageId();
7575
} catch (Exception e) {

0 commit comments

Comments
 (0)