Correct vibur artifact name
MODIFY
instrumentation/vibur-dbcp-11.0/library/README.md
instrumentation/vibur-dbcp-11.0/library/README.md
@@ -16,7 +16,7 @@ For Maven, add to your `pom.xml` dependencies:
<dependencies>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
- <artifactId>opentelemetry-viburdbcp-11.0</artifactId>
+ <artifactId>opentelemetry-vibur-dbcp-11.0</artifactId>
<version>OPENTELEMETRY_VERSION</version>
</dependency>
</dependencies>
@@ -25,7 +25,7 @@ For Maven, add to your `pom.xml` dependencies:
For Gradle, add to your dependencies:
```groovy
-implementation("io.opentelemetry.instrumentation:opentelemetry-viburdbcp-11.0:OPENTELEMETRY_VERSION")
+implementation("io.opentelemetry.instrumentation:opentelemetry-vibur-dbcp-11.0:OPENTELEMETRY_VERSION")
```
### Usage

MODIFY
instrumentation/vibur-dbcp-11.0/library/src/main/java/io/opentelemetry/instrumentation/viburdbcp/ConnectionPoolMetrics.java
instrumentation/vibur-dbcp-11.0/library/src/main/java/io/opentelemetry/instrumentation/viburdbcp/ConnectionPoolMetrics.java
@@ -15,7 +15,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.vibur.dbcp.ViburDBCPDataSource;
final class ConnectionPoolMetrics {
- private static final String INSTRUMENTATION_NAME = "io.opentelemetry.viburdbcp-11.0";
+ private static final String INSTRUMENTATION_NAME = "io.opentelemetry.vibur-dbcp-11.0";
// a weak map does not make sense here because each Meter holds a reference to the dataSource
// ViburDBCPDataSource does not implement equals()/hashCode(), so it's safe to keep them in a

MODIFY
instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java
instrumentation/vibur-dbcp-11.0/testing/src/main/java/io/opentelemetry/instrumentation/viburdbcp/AbstractViburInstrumentationTest.java
@@ -7,7 +7,6 @@ package io.opentelemetry.instrumentation.viburdbcp;
import static org.mockito.Mockito.when;
-import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.db.DbConnectionPoolMetricsAssertions;
import java.sql.Connection;
@@ -17,15 +16,13 @@ import javax.sql.DataSource;
import org.assertj.core.api.AbstractIterableAssert;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.RegisterExtension;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.vibur.dbcp.ViburDBCPDataSource;
@ExtendWith(MockitoExtension.class)
public abstract class AbstractViburInstrumentationTest {
-
- @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+ private static final String INSTRUMENTATION_NAME = "io.opentelemetry.vibur-dbcp-11.0";
@Mock DataSource dataSourceMock;
@Mock Connection connectionMock;
@@ -53,8 +50,7 @@ public abstract class AbstractViburInstrumentationTest {
viburConnection.close();
// then
- DbConnectionPoolMetricsAssertions.create(
- testing(), "io.opentelemetry.viburdbcp-11.0", "testPool")
+ DbConnectionPoolMetricsAssertions.create(testing(), INSTRUMENTATION_NAME, "testPool")
.disableMinIdleConnections()
.disableMaxIdleConnections()
.disablePendingRequests()
@@ -78,13 +74,9 @@ public abstract class AbstractViburInstrumentationTest {
// then
testing()
.waitAndAssertMetrics(
- "io.opentelemetry.viburdbcp-11.0",
- "db.client.connections.usage",
- AbstractIterableAssert::isEmpty);
+ INSTRUMENTATION_NAME, "db.client.connections.usage", AbstractIterableAssert::isEmpty);
testing()
.waitAndAssertMetrics(
- "io.opentelemetry.viburdbcp-11.0",
- "db.client.connections.max",
- AbstractIterableAssert::isEmpty);
+ INSTRUMENTATION_NAME, "db.client.connections.max", AbstractIterableAssert::isEmpty);
}
}

Correct vibur artifact name (#6098)