Skip to content

Commit 0ef5f40

Browse files
restructure the modules to v7.0.0
1 parent afda86d commit 0ef5f40

20 files changed

+35
-32
lines changed

instrumentation/aerospike-client/aerospike-client-7.1/javaagent/build.gradle.kts renamed to instrumentation/aerospike-client/aerospike-client-7.0/javaagent/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ muzzle {
1212
}
1313

1414
dependencies {
15-
library("com.aerospike:aerospike-client:7.1.0")
15+
library("com.aerospike:aerospike-client:7.0.0")
1616
implementation("io.opentelemetry:opentelemetry-extension-incubator")
1717

1818
compileOnly("com.google.auto.value:auto-value-annotations")
Lines changed: 1 addition & 1 deletion
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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import com.aerospike.client.AerospikeException;
99
import com.aerospike.client.ResultCode;
Lines changed: 4 additions & 3 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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Arrays.asList;
@@ -18,12 +18,13 @@
1818
public class AerospikeClientInstrumentationModule extends InstrumentationModule {
1919

2020
public AerospikeClientInstrumentationModule() {
21-
super("aerospike-client", "aerospike-client-7.1.0");
21+
super("aerospike-client", "aerospike-client-7.0.0");
2222
}
2323

2424
@Override
2525
public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
26-
return hasClassesNamed("com.aerospike.client.AerospikeClient").and(hasClassesNamed("com.aerospike.client.metrics.MetricsPolicy"));
26+
return hasClassesNamed("com.aerospike.client.AerospikeClient")
27+
.and(hasClassesNamed("com.aerospike.client.metrics.MetricsPolicy"));
2728
}
2829

2930
@Override
Lines changed: 1 addition & 1 deletion
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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesGetter;
99
import javax.annotation.Nullable;
Lines changed: 1 addition & 1 deletion
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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import com.aerospike.client.cluster.Node;
99
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
Lines changed: 1 addition & 1 deletion
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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import com.aerospike.client.Key;
99
import com.aerospike.client.cluster.Node;
Lines changed: 1 addition & 1 deletion
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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
Lines changed: 1 addition & 1 deletion
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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import static io.opentelemetry.api.common.AttributeKey.longKey;
99
import static io.opentelemetry.api.common.AttributeKey.stringKey;
Lines changed: 7 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_1;
6+
package io.opentelemetry.javaagent.instrumentation.aerospike.v7_0;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
@@ -14,10 +14,10 @@
1414
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesExtractor;
1515
import io.opentelemetry.instrumentation.api.semconv.network.NetworkAttributesGetter;
1616
import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
17-
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_1.metrics.AerospikeMetrics;
17+
import io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.metrics.AerospikeMetrics;
1818

1919
public final class AersopikeSingletons {
20-
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aerospike-client-7.1";
20+
private static final String INSTRUMENTATION_NAME = "io.opentelemetry.aerospike-client-7.0";
2121

2222
private static final Instrumenter<AerospikeRequest, Void> INSTRUMENTER;
2323

@@ -34,10 +34,12 @@ public final class AersopikeSingletons {
3434
.addAttributesExtractor(DbClientAttributesExtractor.create(aerospikeDbAttributesGetter))
3535
.addAttributesExtractor(NetworkAttributesExtractor.create(netAttributesGetter));
3636
InstrumentationConfig instrumentationConfig = InstrumentationConfig.get();
37-
if (instrumentationConfig.getBoolean("otel.instrumentation.aerospike.experimental-span-attributes", false)) {
37+
if (instrumentationConfig.getBoolean(
38+
"otel.instrumentation.aerospike.experimental-span-attributes", false)) {
3839
builder.addAttributesExtractor(new AerospikeClientAttributeExtractor());
3940
}
40-
if (instrumentationConfig.getBoolean("otel.instrumentation.aerospike.experimental-metrics", false)) {
41+
if (instrumentationConfig.getBoolean(
42+
"otel.instrumentation.aerospike.experimental-metrics", false)) {
4143
builder.addOperationMetrics(AerospikeMetrics.get());
4244
}
4345

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

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
10-
import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_1.AersopikeSingletons.instrumenter;
10+
import static io.opentelemetry.javaagent.instrumentation.aerospike.v7_0.AersopikeSingletons.instrumenter;
1111
import static net.bytebuddy.matcher.ElementMatchers.hasSuperClass;
1212
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
1313
import static net.bytebuddy.matcher.ElementMatchers.isPublic;

0 commit comments

Comments
 (0)