Skip to content

Commit 54fabff

Browse files
committed
wip: spotless apply.
1 parent f8855c0 commit 54fabff

File tree

8 files changed

+496
-433
lines changed

8 files changed

+496
-433
lines changed

instrumentation/kafka/kafka-connect-2.6/javaagent/build.gradle.kts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@ dependencies {
1919
library("org.apache.kafka:connect-api:2.6.0")
2020

2121
testImplementation("org.apache.kafka:connect-runtime:2.6.0")
22-
2322
}
2423

2524
tasks {
2625
withType<Test>().configureEach {
2726
usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
28-
27+
2928
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
30-
29+
3130
// Enable experimental span attributes and receive telemetry for comprehensive testing
3231
jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true")
3332
jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true")
3433
// Set timeout for integration tests with containers
3534
systemProperty("junit.jupiter.execution.timeout.default", "5m")
3635
}
37-
36+
3837
withType<JavaCompile>().configureEach {
3938
options.compilerArgs.add("-Xlint:-deprecation")
4039
}

instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/KafkaConnectInstrumentationModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
@AutoService(InstrumentationModule.class)
1717
public class KafkaConnectInstrumentationModule extends InstrumentationModule {
1818

19-
private static final Logger logger = Logger.getLogger(KafkaConnectInstrumentationModule.class.getName());
19+
private static final Logger logger =
20+
Logger.getLogger(KafkaConnectInstrumentationModule.class.getName());
2021

2122
public KafkaConnectInstrumentationModule() {
2223
super("kafka-connect", "kafka-connect-2.6");

instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/KafkaConnectSingletons.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414
public final class KafkaConnectSingletons {
1515

1616
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.kafka-connect-2.6";
17-
private static final TextMapPropagator PROPAGATOR =
17+
private static final TextMapPropagator PROPAGATOR =
1818
GlobalOpenTelemetry.get().getPropagators().getTextMapPropagator();
19-
20-
private static final TextMapGetter<SinkRecord> SINK_RECORD_HEADER_GETTER = SinkRecordHeadersGetter.INSTANCE;
21-
19+
20+
private static final TextMapGetter<SinkRecord> SINK_RECORD_HEADER_GETTER =
21+
SinkRecordHeadersGetter.INSTANCE;
22+
2223
private static final Instrumenter<KafkaConnectTask, Void> INSTRUMENTER =
2324
Instrumenter.<KafkaConnectTask, Void>builder(
2425
GlobalOpenTelemetry.get(), INSTRUMENTATION_NAME, KafkaConnectTask::getSpanName)

instrumentation/kafka/kafka-connect-2.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaconnect/v2_6/SinkTaskInstrumentation.java

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
package io.opentelemetry.javaagent.instrumentation.kafkaconnect.v2_6;
77

88
import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
9-
import static net.bytebuddy.matcher.ElementMatchers.named;
109
import static net.bytebuddy.matcher.ElementMatchers.isPublic;
10+
import static net.bytebuddy.matcher.ElementMatchers.named;
1111
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
1212

1313
import io.opentelemetry.context.Context;
@@ -16,11 +16,11 @@
1616
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1717
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
1818
import java.util.Collection;
19+
import java.util.logging.Logger;
1920
import net.bytebuddy.asm.Advice;
2021
import net.bytebuddy.description.type.TypeDescription;
2122
import net.bytebuddy.matcher.ElementMatcher;
2223
import org.apache.kafka.connect.sink.SinkRecord;
23-
import java.util.logging.Logger;
2424

2525
public class SinkTaskInstrumentation implements TypeInstrumentation {
2626

@@ -35,20 +35,19 @@ public ElementMatcher<TypeDescription> typeMatcher() {
3535
@Override
3636
public void transform(TypeTransformer transformer) {
3737
logger.info("KafkaConnect: transform() called - applying put() advice");
38-
38+
3939
// Add advice to constructor to see what classes we're instrumenting
4040
transformer.applyAdviceToMethod(
41-
named("<init>"),
42-
SinkTaskInstrumentation.class.getName() + "$ConstructorAdvice");
43-
41+
named("<init>"), SinkTaskInstrumentation.class.getName() + "$ConstructorAdvice");
42+
4443
transformer.applyAdviceToMethod(
4544
named("put").and(takesArgument(0, Collection.class)).and(isPublic()),
4645
SinkTaskInstrumentation.class.getName() + "$SinkTaskPutAdvice");
4746
}
4847

4948
@SuppressWarnings("unused")
5049
public static class ConstructorAdvice {
51-
50+
5251
public static final Logger logger = Logger.getLogger(ConstructorAdvice.class.getName());
5352

5453
@Advice.OnMethodExit(suppress = Throwable.class)
@@ -69,16 +68,18 @@ public static void onEnter(
6968
@Advice.Local("otelTask") KafkaConnectTask task,
7069
@Advice.Local("otelContext") Context context,
7170
@Advice.Local("otelScope") Scope scope) {
72-
71+
7372
logger.info("KafkaConnect: SinkTask.put() called with " + records.size() + " records");
74-
75-
Context parentContext = Java8BytecodeBridge.currentContext();
73+
74+
Context parentContext = Java8BytecodeBridge.currentContext();
7675

7776
// Extract context from first record if available
7877
if (!records.isEmpty()) {
7978
SinkRecord firstRecord = records.iterator().next();
80-
Context extractedContext = KafkaConnectSingletons.propagator()
81-
.extract(parentContext, firstRecord, KafkaConnectSingletons.sinkRecordHeaderGetter());
79+
Context extractedContext =
80+
KafkaConnectSingletons.propagator()
81+
.extract(
82+
parentContext, firstRecord, KafkaConnectSingletons.sinkRecordHeaderGetter());
8283
parentContext = extractedContext;
8384
}
8485

@@ -87,7 +88,7 @@ public static void onEnter(
8788
logger.info("KafkaConnect: Instrumenter shouldStart returned false");
8889
return;
8990
}
90-
91+
9192
context = KafkaConnectSingletons.instrumenter().start(parentContext, task);
9293
scope = context.makeCurrent();
9394
logger.info("KafkaConnect: Started span");
@@ -99,7 +100,7 @@ public static void onExit(
99100
@Advice.Local("otelTask") KafkaConnectTask task,
100101
@Advice.Local("otelContext") Context context,
101102
@Advice.Local("otelScope") Scope scope) {
102-
103+
103104
if (scope == null) {
104105
logger.info("KafkaConnect: Scope is null, exiting");
105106
return;
@@ -108,7 +109,5 @@ public static void onExit(
108109
KafkaConnectSingletons.instrumenter().end(context, task, null, throwable);
109110
logger.info("KafkaConnect: Span ended");
110111
}
111-
112-
113112
}
114113
}

0 commit comments

Comments
 (0)