Skip to content

Commit 72c35de

Browse files
Abhishekkr3003Abhishekkr3003
committed
fixes muzzle, refactors module, updates classLoadMatcher and added doc
1 parent c34b20d commit 72c35de

18 files changed

+51
-46
lines changed

‎conventions/.kotlin/errors/errors-1732624750398.log‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ These are the supported libraries and frameworks:
1919

2020
| Library/Framework | Auto-instrumented versions | Standalone Library Instrumentation [1] | Semantic Conventions |
2121
|---------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
22+
| [Aerospike Client](https://github.com/aerospike/aerospike-client-java) | 7.1+ | N/A | [Database Pool Metrics] |
2223
| [Akka Actors](https://doc.akka.io/docs/akka/current/typed/index.html) | 2.3+ | N/A | Context propagation |
2324
| [Akka HTTP](https://doc.akka.io/docs/akka-http/current/index.html) | 10.0+ | N/A | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics], Provides `http.route` [2] |
2425
| [Alibaba Druid](https://github.com/alibaba/druid) | 1.0+ | [opentelemetry-alibaba-druid-1.0](../instrumentation/alibaba-druid-1.0/library) | [Database Pool Metrics] |

‎instrumentation/aerospike-client/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
| System property | Type | Default | Description |
44
|---------------------------------------------------------------|---------|---------|----------------------------------------------------------------------|
55
| `otel.instrumentation.aerospike.experimental-span-attributes` | Boolean | `false` | Enable the capture of experimental Aerospike client span attributes. |
6-
| `otel.instrumentation.aerospike.experimental-metrics` | Boolean | `false` | Enable the recording of experimental Aerospike client metrics |
6+
| `otel.instrumentation.aerospike.experimental-metrics` | Boolean | `false` | Enable the recording of experimental Aerospike client metrics. |

‎instrumentation/aerospike-client/javaagent/build.gradle.kts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,32 @@ muzzle {
66
pass {
77
group.set("com.aerospike")
88
module.set("aerospike-client")
9-
versions.set("[4.0.0,)")
9+
versions.set("[7.1.0,)")
1010
assertInverse.set(true)
1111
}
1212
}
1313

14+
val latestDepTest = findProperty("testLatestDeps") as Boolean
15+
1416
dependencies {
15-
library("com.aerospike:aerospike-client:8.0.0")
17+
if (latestDepTest) {
18+
library("com.aerospike:aerospike-client:+")
19+
} else {
20+
library("com.aerospike:aerospike-client:7.1.0")
21+
}
22+
1623
implementation("io.opentelemetry:opentelemetry-api-incubator")
1724

1825
compileOnly("com.google.auto.value:auto-value-annotations")
1926
annotationProcessor("com.google.auto.value:auto-value")
2027
}
2128

29+
if (latestDepTest) {
30+
otelJava {
31+
minJavaVersionSupported.set(JavaVersion.VERSION_21)
32+
}
33+
}
34+
2235
tasks {
2336
test {
2437
jvmArgs("-Djava.net.preferIPv4Stack=true")

‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientAttributeExtractor.java‎ renamed to ‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeClientAttributeExtractor.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike;
77

88
import com.aerospike.client.AerospikeException;
99
import com.aerospike.client.ResultCode;
1010
import io.opentelemetry.api.common.AttributesBuilder;
1111
import io.opentelemetry.context.Context;
1212
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
13-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
14-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes;
13+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
14+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes;
1515
import javax.annotation.Nullable;
1616

1717
final class AerospikeClientAttributeExtractor

‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientInstrumentation.java‎ renamed to ‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeClientInstrumentation.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike;
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
9-
import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.AersopikeSingletons.instrumenter;
10-
import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.CustomElementMatcher.iterableHasAtLeastOne;
9+
import static io.opentelemetry.javaagent.instrumentation.aerospike.AerospikeSingletons.instrumenter;
10+
import static io.opentelemetry.javaagent.instrumentation.aerospike.internal.CustomElementMatcher.iterableHasAtLeastOne;
1111
import static net.bytebuddy.matcher.ElementMatchers.hasSuperType;
1212
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -18,8 +18,8 @@
1818
import io.opentelemetry.context.Context;
1919
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2020
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
21-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
22-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequestContext;
21+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
22+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequestContext;
2323
import java.util.Locale;
2424
import net.bytebuddy.asm.Advice;
2525
import net.bytebuddy.description.type.TypeDescription;

‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeClientInstrumentationModule.java‎ renamed to ‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeClientInstrumentationModule.java‎

Lines changed: 2 additions & 7 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.javaagent.instrumentation.aerospike.v7_0;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;
@@ -23,12 +23,7 @@ public AerospikeClientInstrumentationModule() {
2323

2424
@Override
2525
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
26-
return hasClassesNamed("com.aerospike.client.IAerospikeClient")
27-
.and(hasClassesNamed("com.aerospike.client.command.Command"))
28-
.and(hasClassesNamed("com.aerospike.client.command.SyncCommand"))
29-
.and(hasClassesNamed("com.aerospike.client.async.AsyncCommand"))
30-
.and(hasClassesNamed("com.aerospike.client.async.EventLoop"))
31-
.and(hasClassesNamed("com.aerospike.client.Key"));
26+
return hasClassesNamed("com.aerospike.client.metrics.LatencyType");
3227
}
3328

3429
@Override

‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeDbAttributesGetter.java‎ renamed to ‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeDbAttributesGetter.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
9-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
10-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeSemanticAttributes;
9+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
10+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeSemanticAttributes;
1111
import javax.annotation.Nullable;
1212

1313
final class AerospikeDbAttributesGetter implements DbClientAttributesGetter<AerospikeRequest> {

‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AerospikeNetworkAttributesGetter.java‎ renamed to ‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeNetworkAttributesGetter.java‎

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

6-
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike;
77

88
import com.aerospike.client.cluster.Node;
99
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
10-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
10+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
1111
import java.net.InetSocketAddress;
1212
import javax.annotation.Nullable;
1313

‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/v7_0/AersopikeSingletons.java‎ renamed to ‎instrumentation/aerospike-client/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/aerospike/AerospikeSingletons.java‎

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.javaagent.instrumentation.aerospike.v7_0;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
@@ -15,10 +15,10 @@
1515
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
1616
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
1717
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
18-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.internal.AerospikeRequest;
19-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.metrics.AerospikeMetrics;
18+
import io.opentelemetry.javaagent.instrumentation.aerospike.internal.AerospikeRequest;
19+
import io.opentelemetry.javaagent.instrumentation.aerospike.metrics.AerospikeMetrics;
2020

21-
public final class AersopikeSingletons {
21+
public final class AerospikeSingletons {
2222
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aerospike-client";
2323

2424
private static final Instrumenter<AerospikeRequest, Void> INSTRUMENTER;
@@ -52,5 +52,5 @@ public static Instrumenter<AerospikeRequest, Void> instrumenter() {
5252
return INSTRUMENTER;
5353
}
5454

55-
private AersopikeSingletons() {}
55+
private AerospikeSingletons() {}
5656
}

0 commit comments

Comments
 (0)