From a03903cc57b7b0ebcc749a4dfc05c430bfc8de9c Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 9 Nov 2023 04:07:23 +0530 Subject: [PATCH] minor refactoring and adds testInstrumentation --- .../api/instrumenter/db/AerospikeMetrics.java | 19 ++++----- .../db/AerospikeMetricsAdvice.java | 5 +++ .../db/AerospikeSemanticAttributes.java | 10 +++-- .../instrumenter/db/DbMessageSizeUtil.java | 6 ++- .../javaagent/build.gradle.kts | 1 + .../AerospikeClientAttributeExtractor.java | 36 +++++++++------- .../AerospikeClientInstrumentationModule.java | 3 +- .../v7_1/AerospikeRequest.java | 3 +- .../v7_1/AerospikeRequestContext.java | 7 +++- .../v7_1/AsyncCommandInstrumentation.java | 21 +++++----- .../v7_1/AsyncHandlerInstrumentation.java | 12 +++--- .../AsyncScanAllCommandInstrumentation.java | 41 +++++++++---------- .../v7_1/NetworkAttributesGetter.java | 11 ++--- .../v7_1/SocketInstrumentation.java | 12 ++++-- .../aerospike_client/v7_1/Status.java | 5 +++ .../v7_1/SyncCommandInstrumentation.java | 10 +++-- .../v7_1/TransferSizeIntrumentation.java | 13 +++--- 17 files changed, 124 insertions(+), 91 deletions(-) diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetrics.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetrics.java index ae427940c88e..a8e0e5c7991f 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetrics.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetrics.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.instrumentation.api.instrumenter.db; import static io.opentelemetry.instrumentation.api.instrumenter.db.DbMessageSizeUtil.getMessageSize; @@ -31,20 +36,17 @@ public final class AerospikeMetrics implements OperationListener { private final LongCounter responseCounter; private final LongUpDownCounter concurrencyUpDownCounter; private final DoubleHistogram clientLatencyHistogram; + @SuppressWarnings("unused") private final DoubleHistogram recordSizeHistogram; private AerospikeMetrics(Meter meter) { LongCounterBuilder requestCounterBuilder = - meter - .counterBuilder("aerospike.requests") - .setDescription("Aerospike Calls"); + meter.counterBuilder("aerospike.requests").setDescription("Aerospike Calls"); AerospikeMetricsAdvice.applyRequestCounterAdvice(requestCounterBuilder); requestCounter = requestCounterBuilder.build(); LongCounterBuilder responseCounterBuilder = - meter - .counterBuilder("aerospike.response") - .setDescription("Aerospike Responses"); + meter.counterBuilder("aerospike.response").setDescription("Aerospike Responses"); AerospikeMetricsAdvice.applyResponseCounterAdvice(responseCounterBuilder); responseCounter = responseCounterBuilder.build(); LongUpDownCounterBuilder concurrencyUpDownCounterBuilder = @@ -73,7 +75,6 @@ public static OperationMetrics get() { return AerospikeMetrics::new; } - @Override public Context onStart(Context context, Attributes startAttributes, long startNanos) { requestCounter.add(1, startAttributes, context); @@ -97,9 +98,7 @@ public void onEnd(Context context, Attributes endAttributes, long endNanos) { Attributes mergedAttributes = state.startAttributes().toBuilder().putAll(endAttributes).build(); responseCounter.add(1, mergedAttributes, context); clientLatencyHistogram.record( - (endNanos - state.startTimeNanos()) / NANOS_PER_MS, - mergedAttributes, - context); + (endNanos - state.startTimeNanos()) / NANOS_PER_MS, mergedAttributes, context); Long requestBodySize = getMessageSize(mergedAttributes); if (requestBodySize != null) { recordSizeHistogram.record(requestBodySize, mergedAttributes, context); diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetricsAdvice.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetricsAdvice.java index b325f2b9ab2c..24f604332c31 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetricsAdvice.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeMetricsAdvice.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.instrumentation.api.instrumenter.db; import io.opentelemetry.api.common.AttributeKey; diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeSemanticAttributes.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeSemanticAttributes.java index 13bea862f51e..66eb05161309 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeSemanticAttributes.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/AerospikeSemanticAttributes.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.instrumentation.api.instrumenter.db; import static io.opentelemetry.api.common.AttributeKey.longKey; @@ -13,13 +18,12 @@ private AerospikeSemanticAttributes() {} public static final AttributeKey AEROSPIKE_NAMESPACE = stringKey("aerospike.namespace"); public static final AttributeKey AEROSPIKE_SET_NAME = stringKey("aerospike.set.name"); public static final AttributeKey AEROSPIKE_USER_KEY = stringKey("aerospike.user.key"); - public static final AttributeKey AEROSPIKE_TRANSFER_SIZE = longKey( - "aerospike.transfer.size"); + public static final AttributeKey AEROSPIKE_TRANSFER_SIZE = + longKey("aerospike.transfer.size"); public static final class DbSystemValues { public static final String AEROSPIKE = "aerospike"; private DbSystemValues() {} } - } diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbMessageSizeUtil.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbMessageSizeUtil.java index 65ad0d861822..cd27a32fda45 100644 --- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbMessageSizeUtil.java +++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbMessageSizeUtil.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.instrumentation.api.instrumenter.db; import io.opentelemetry.api.common.AttributeKey; @@ -24,4 +29,3 @@ private static T getAttribute(AttributeKey key, Attributes... attributesL private DbMessageSizeUtil() {} } - diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts index 4a251a8971a2..5921a95c8d98 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") + testInstrumentation(project(":instrumentation:aerospike-client:aerospike-client-7.1:javaagent")) } tasks { diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientAttributeExtractor.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientAttributeExtractor.java index 1392d17d7453..1af35170fe25 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientAttributeExtractor.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientAttributeExtractor.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.javaagent.instrumentation.aerospike_client.v7_1; import com.aerospike.client.AerospikeException; @@ -8,37 +13,40 @@ import io.opentelemetry.instrumentation.api.instrumenter.db.AerospikeSemanticAttributes; import javax.annotation.Nullable; -public class AerospikeClientAttributeExtractor implements - AttributesExtractor { +public class AerospikeClientAttributeExtractor + implements AttributesExtractor { @Override - public void onStart(AttributesBuilder attributes, Context parentContext, - AerospikeRequest aerospikeRequest) { + public void onStart( + AttributesBuilder attributes, Context parentContext, AerospikeRequest aerospikeRequest) { attributes.put( - AerospikeSemanticAttributes.AEROSPIKE_NAMESPACE, - aerospikeRequest.getNamespace()); + AerospikeSemanticAttributes.AEROSPIKE_NAMESPACE, aerospikeRequest.getNamespace()); attributes.put(AerospikeSemanticAttributes.AEROSPIKE_SET_NAME, aerospikeRequest.getSet()); attributes.put(AerospikeSemanticAttributes.AEROSPIKE_USER_KEY, aerospikeRequest.getUserKey()); } @Override - public void onEnd(AttributesBuilder attributes, Context context, - AerospikeRequest aerospikeRequest, @Nullable Void unused, @Nullable Throwable error) { - attributes.put(AerospikeSemanticAttributes.AEROSPIKE_STATUS, - aerospikeRequest.getStatus().name()); + public void onEnd( + AttributesBuilder attributes, + Context context, + AerospikeRequest aerospikeRequest, + @Nullable Void unused, + @Nullable Throwable error) { + attributes.put( + AerospikeSemanticAttributes.AEROSPIKE_STATUS, aerospikeRequest.getStatus().name()); if (error != null) { if (error instanceof AerospikeException) { AerospikeException aerospikeException = (AerospikeException) error; - attributes.put(AerospikeSemanticAttributes.AEROSPIKE_ERROR_CODE, - aerospikeException.getResultCode()); + attributes.put( + AerospikeSemanticAttributes.AEROSPIKE_ERROR_CODE, aerospikeException.getResultCode()); } else { attributes.put(AerospikeSemanticAttributes.AEROSPIKE_ERROR_CODE, ResultCode.CLIENT_ERROR); } } else { attributes.put(AerospikeSemanticAttributes.AEROSPIKE_ERROR_CODE, ResultCode.OK); if (aerospikeRequest.getSize() != null) { - attributes.put(AerospikeSemanticAttributes.AEROSPIKE_TRANSFER_SIZE, - aerospikeRequest.getSize()); + attributes.put( + AerospikeSemanticAttributes.AEROSPIKE_TRANSFER_SIZE, aerospikeRequest.getSize()); } } } diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientInstrumentationModule.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientInstrumentationModule.java index 4047cca50e27..ccd487eef554 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientInstrumentationModule.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeClientInstrumentationModule.java @@ -34,8 +34,7 @@ public List typeInstrumentations() { new TransferSizeIntrumentation(), new AsyncCommandInstrumentation(), new AsyncHandlerInstrumentation(), - new AsyncScanAllCommandInstrumentation() - ); + new AsyncScanAllCommandInstrumentation()); } @Override diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequest.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequest.java index c336471b1bd7..1436e7f928d7 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequest.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequest.java @@ -17,7 +17,8 @@ public abstract class AerospikeRequest { private Status status; public static AerospikeRequest create(String operation, Key key) { - return new AutoValue_AerospikeRequest(operation, key.namespace, key.setName, key.userKey.toString()); + return new AutoValue_AerospikeRequest( + operation, key.namespace, key.setName, key.userKey.toString()); } public static AerospikeRequest create(String operation, String namespace, String set) { diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequestContext.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequestContext.java index 50636365ef0e..1631855dec2b 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequestContext.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AerospikeRequestContext.java @@ -9,7 +9,8 @@ import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter; public final class AerospikeRequestContext { - private static final ThreadLocal contextThreadLocal = new ThreadLocal<>(); + private static final ThreadLocal contextThreadLocal = + new ThreadLocal<>(); private AerospikeRequest request; private Context context; @@ -34,7 +35,9 @@ public static AerospikeRequestContext current() { } public void endSpan( - Instrumenter instrumenter, Context context, AerospikeRequest request, + Instrumenter instrumenter, + Context context, + AerospikeRequest request, Throwable throwable) { instrumenter.end(context, request, null, throwable); } diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncCommandInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncCommandInstrumentation.java index 408b057f6591..eb6bdb5351cc 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncCommandInstrumentation.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncCommandInstrumentation.java @@ -28,16 +28,15 @@ public class AsyncCommandInstrumentation implements TypeInstrumentation { @Override public ElementMatcher typeMatcher() { - return hasSuperClass(named("com.aerospike.client.async.AsyncCommand").and( - not(named("com.aerospike.client.command.Command")))); + return hasSuperClass( + named("com.aerospike.client.async.AsyncCommand") + .and(not(named("com.aerospike.client.command.Command")))); } @Override public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( - isConstructor() - .and(isPublic()), - this.getClass().getName() + "$ConstructorAdvice"); + isConstructor().and(isPublic()), this.getClass().getName() + "$ConstructorAdvice"); } @SuppressWarnings("unused") @@ -59,21 +58,21 @@ public static void onExit( if (key == null) { return; } - VirtualField virtualField = VirtualField.find(Command.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(Command.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(command); if (requestContext != null) { return; } Context parentContext = currentContext(); - request = AerospikeRequest.create(command.getClass().getSimpleName().toUpperCase(Locale.ROOT), - key); + request = + AerospikeRequest.create(command.getClass().getSimpleName().toUpperCase(Locale.ROOT), key); if (!instrumenter().shouldStart(parentContext, request)) { return; } context = instrumenter().start(parentContext, request); - AerospikeRequestContext aerospikeRequestContext = AerospikeRequestContext.attach(request, - context); + AerospikeRequestContext aerospikeRequestContext = + AerospikeRequestContext.attach(request, context); scope = context.makeCurrent(); virtualField.set(command, aerospikeRequestContext); diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncHandlerInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncHandlerInstrumentation.java index a54260cddd47..e4a3262936be 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncHandlerInstrumentation.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncHandlerInstrumentation.java @@ -34,9 +34,7 @@ public ElementMatcher typeMatcher() { @Override public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( - named("onSuccess") - .and(takesNoArguments()) - .and(isProtected()), + named("onSuccess").and(takesNoArguments()).and(isProtected()), this.getClass().getName() + "$OnSuccessAdvice"); transformer.applyAdviceToMethod( named("onFailure") @@ -50,8 +48,8 @@ public static class OnSuccessAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit(@Advice.Thrown Throwable throwable, @Advice.This Command command) { - VirtualField virtualField = VirtualField.find(Command.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(Command.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(command); virtualField.set(command, null); if (requestContext != null) { @@ -76,8 +74,8 @@ public static class OnFailureAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit(@Advice.Thrown Throwable throwable, @Advice.This Command command) { - VirtualField virtualField = VirtualField.find(Command.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(Command.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(command); virtualField.set(command, null); if (requestContext != null) { diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncScanAllCommandInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncScanAllCommandInstrumentation.java index a1291f9b6d8d..d728c9ed83d2 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncScanAllCommandInstrumentation.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/AsyncScanAllCommandInstrumentation.java @@ -36,13 +36,9 @@ public ElementMatcher typeMatcher() { @Override public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( - isConstructor() - .and(isPublic()), - this.getClass().getName() + "$ConstructorAdvice"); + isConstructor().and(isPublic()), this.getClass().getName() + "$ConstructorAdvice"); transformer.applyAdviceToMethod( - named("onSuccess") - .and(takesNoArguments()) - .and(isProtected()), + named("onSuccess").and(takesNoArguments()).and(isProtected()), this.getClass().getName() + "$OnSuccessAdvice"); transformer.applyAdviceToMethod( named("onFailure") @@ -61,23 +57,24 @@ public static void onExit( @Advice.Local("otelScope") Scope scope, @Advice.Argument(4) String namespace, @Advice.Argument(5) String setName) { - VirtualField virtualField = VirtualField.find( - AsyncScanPartitionExecutor.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(AsyncScanPartitionExecutor.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(asyncScanPartitionExecutor); if (requestContext != null) { return; } Context parentContext = currentContext(); - request = AerospikeRequest.create( - asyncScanPartitionExecutor.getClass().getSimpleName().toUpperCase(Locale.ROOT), - namespace, setName); + request = + AerospikeRequest.create( + asyncScanPartitionExecutor.getClass().getSimpleName().toUpperCase(Locale.ROOT), + namespace, + setName); if (!instrumenter().shouldStart(parentContext, request)) { return; } context = instrumenter().start(parentContext, request); - AerospikeRequestContext aerospikeRequestContext = AerospikeRequestContext.attach(request, - context); + AerospikeRequestContext aerospikeRequestContext = + AerospikeRequestContext.attach(request, context); scope = context.makeCurrent(); virtualField.set(asyncScanPartitionExecutor, aerospikeRequestContext); @@ -91,11 +88,11 @@ public static void onExit( public static class OnSuccessAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void onExit(@Advice.Thrown Throwable throwable, + public static void onExit( + @Advice.Thrown Throwable throwable, @Advice.This AsyncScanPartitionExecutor asyncScanPartitionExecutor) { - VirtualField virtualField = VirtualField.find( - AsyncScanPartitionExecutor.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(AsyncScanPartitionExecutor.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(asyncScanPartitionExecutor); virtualField.set(asyncScanPartitionExecutor, null); if (requestContext != null) { @@ -119,11 +116,11 @@ public static void onExit(@Advice.Thrown Throwable throwable, public static class OnFailureAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void onExit(@Advice.Thrown Throwable throwable, + public static void onExit( + @Advice.Thrown Throwable throwable, @Advice.This AsyncScanPartitionExecutor asyncScanPartitionExecutor) { - VirtualField virtualField = VirtualField.find( - AsyncScanPartitionExecutor.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(AsyncScanPartitionExecutor.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(asyncScanPartitionExecutor); virtualField.set(asyncScanPartitionExecutor, null); if (requestContext != null) { diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/NetworkAttributesGetter.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/NetworkAttributesGetter.java index 645dfcdcdd51..5503e9e23ab1 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/NetworkAttributesGetter.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/NetworkAttributesGetter.java @@ -10,14 +10,15 @@ import java.net.InetSocketAddress; import javax.annotation.Nullable; -final class NetworkAttributesGetter implements - ServerAttributesGetter, - io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter { +final class NetworkAttributesGetter + implements ServerAttributesGetter, + io.opentelemetry.instrumentation.api.instrumenter.network.NetworkAttributesGetter< + AerospikeRequest, Void> { @Override @Nullable - public InetSocketAddress getNetworkPeerInetSocketAddress(AerospikeRequest aerospikeRequest, - @Nullable Void unused) { + public InetSocketAddress getNetworkPeerInetSocketAddress( + AerospikeRequest aerospikeRequest, @Nullable Void unused) { Node node = aerospikeRequest.getNode(); if (node != null) { return node.getAddress(); diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SocketInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SocketInstrumentation.java index 6cb0cfd2848d..c8ce10c5ab52 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SocketInstrumentation.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SocketInstrumentation.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.javaagent.instrumentation.aerospike_client.v7_1; import static io.opentelemetry.javaagent.instrumentation.aerospike_client.v7_1.AersopikeSingletons.instrumenter; @@ -48,8 +53,7 @@ public void transform(TypeTransformer transformer) { public static class NodeSyncCommandAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void stopSpan( - @Advice.Return Node node) { + public static void stopSpan(@Advice.Return Node node) { AerospikeRequestContext context = AerospikeRequestContext.current(); if (context != null) { AerospikeRequest request = context.getRequest(); @@ -66,8 +70,8 @@ public static void stopSpan( @Advice.Thrown Throwable throwable, @Advice.Return Node node, @Advice.This Command command) { - VirtualField virtualField = VirtualField.find(Command.class, - AerospikeRequestContext.class); + VirtualField virtualField = + VirtualField.find(Command.class, AerospikeRequestContext.class); AerospikeRequestContext requestContext = virtualField.get(command); if (requestContext != null) { AerospikeRequest request = requestContext.getRequest(); diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/Status.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/Status.java index 19993fa54062..df1451836a47 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/Status.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/Status.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.javaagent.instrumentation.aerospike_client.v7_1; public enum Status { diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SyncCommandInstrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SyncCommandInstrumentation.java index c219315b6ca3..d075ec76462e 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SyncCommandInstrumentation.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/SyncCommandInstrumentation.java @@ -41,7 +41,8 @@ public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( isMethod() .and(isPublic()) - .and(not(isStatic())).and(isFinal()) + .and(not(isStatic())) + .and(isFinal()) .and(takesArgument(1, named("com.aerospike.client.Key"))) .and(not(takesArgument(0, named("com.aerospike.client.async.EventLoop")))) .and(returns(named("com.aerospike.client.Record"))), @@ -50,7 +51,8 @@ public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( isMethod() .and(isPublic()) - .and(not(isStatic())).and(isFinal()) + .and(not(isStatic())) + .and(isFinal()) .and(takesArgument(1, named("com.aerospike.client.Key"))) .and(not(takesArgument(0, named("com.aerospike.client.async.EventLoop")))) .and(not(returns(named("com.aerospike.client.Record")))), @@ -59,7 +61,9 @@ public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( isMethod() .and(isPublic()) - .and(not(isStatic())).and(isFinal()).and(named("scanAll")) + .and(not(isStatic())) + .and(isFinal()) + .and(named("scanAll")) .and(not(takesArgument(0, named("com.aerospike.client.async.EventLoop")))), this.getClass().getName() + "$SyncScanAllCommandAdvice"); } diff --git a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/TransferSizeIntrumentation.java b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/TransferSizeIntrumentation.java index 53a9eb6c14b4..bd0a4f6fd43c 100644 --- a/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/TransferSizeIntrumentation.java +++ b/instrumentation/aerospike-client/aerospike-client-7.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike_client/v7_1/TransferSizeIntrumentation.java @@ -1,3 +1,8 @@ +/* + * Copyright The OpenTelemetry Authors + * SPDX-License-Identifier: Apache-2.0 + */ + package io.opentelemetry.javaagent.instrumentation.aerospike_client.v7_1; import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass; @@ -21,18 +26,14 @@ public ElementMatcher typeMatcher() { @Override public void transform(TypeTransformer transformer) { transformer.applyAdviceToMethod( - isMethod() - .and(isPublic()) - .and(named("execute")) - .and(takesNoArguments()), + isMethod().and(isPublic()).and(named("execute")).and(takesNoArguments()), this.getClass().getName() + "$SizeAdvice"); } @SuppressWarnings("unused") public static class SizeAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void stopSpan( - @Advice.FieldValue("dataOffset") int dataOffset) { + public static void stopSpan(@Advice.FieldValue("dataOffset") int dataOffset) { AerospikeRequestContext context = AerospikeRequestContext.current(); if (context != null) { AerospikeRequest request = context.getRequest();