From e1860ddd21125b2ace23abb4a886d8c168e4c831 Mon Sep 17 00:00:00 2001 From: Emmanuel T Odeke Date: Sat, 12 Jan 2019 01:21:52 +0300 Subject: [PATCH] all: retrofit under io.orijtech.integrations.ocjdbc Retrofit this package under "io.orijtech.integrations.ocjdbc" instead of "io.opencensus.integration.jdbc" because publishing changes under the official OpenCensus artifact group is a source of contention due to the OpenCensus Java team not wanting to have to maintain integrations for life but also the process of publishing is highly bureaucratic. Also we've waited for more than 3 months for a single release which has stalled usage, promotion, feedback and marketing of this integration as per: * https://github.com/census-ecosystem/opencensus-java-jdbc/issues/32 * https://github.com/census-ecosystem/opencensus-java-jdbc/issues/56 * https://github.com/census-instrumentation/opencensus-website/issues/527 This package to be published is maintained under good faith for the entire OpenCensus community and the licenses all stand; just that the artifact is now being published under "io.orijtech.integrations.ocjdbc" which guts out on the previously mentioned bureaucracy, indefinite stalls in publishing and puts this integration into the hands of users. --- build.gradle | 2 +- settings.gradle | 2 +- .../java/io/opencensus/integration/jdbc/Observability.java | 2 +- .../integration/jdbc/OcWrapCallableStatement.java | 6 +++--- .../io/opencensus/integration/jdbc/OcWrapConnection.java | 6 +++--- .../java/io/opencensus/integration/jdbc/OcWrapDriver.java | 6 +++--- .../integration/jdbc/OcWrapPreparedStatement.java | 6 +++--- .../io/opencensus/integration/jdbc/OcWrapResultSet.java | 4 ++-- .../io/opencensus/integration/jdbc/OcWrapStatement.java | 6 +++--- .../io/opencensus/integration/jdbc/ObservabilityTest.java | 4 ++-- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 077cdf0..ccc0ee2 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'maven' apply plugin: "net.ltgt.errorprone" apply plugin: "signing" -group = "io.opencensus.integration" +group = "io.orijtech.integrations" version = "0.0.2" // CURRENT_OCJDBC_VERSION sourceCompatibility = 1.8 diff --git a/settings.gradle b/settings.gradle index d3d02be..a763f7e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = "opencensus-jdbc" +rootProject.name = "ocjdbc" diff --git a/src/main/java/io/opencensus/integration/jdbc/Observability.java b/src/main/java/io/opencensus/integration/jdbc/Observability.java index 6ee4489..d589058 100644 --- a/src/main/java/io/opencensus/integration/jdbc/Observability.java +++ b/src/main/java/io/opencensus/integration/jdbc/Observability.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; import io.opencensus.stats.Aggregation; diff --git a/src/main/java/io/opencensus/integration/jdbc/OcWrapCallableStatement.java b/src/main/java/io/opencensus/integration/jdbc/OcWrapCallableStatement.java index 056e958..feba68e 100644 --- a/src/main/java/io/opencensus/integration/jdbc/OcWrapCallableStatement.java +++ b/src/main/java/io/opencensus/integration/jdbc/OcWrapCallableStatement.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; -import io.opencensus.integration.jdbc.Observability.TraceOption; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; +import io.orijtech.integrations.ocjdbc.Observability.TraceOption; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.sql.CallableStatement; import java.sql.SQLException; import java.util.EnumSet; diff --git a/src/main/java/io/opencensus/integration/jdbc/OcWrapConnection.java b/src/main/java/io/opencensus/integration/jdbc/OcWrapConnection.java index b51fe3c..93db5af 100644 --- a/src/main/java/io/opencensus/integration/jdbc/OcWrapConnection.java +++ b/src/main/java/io/opencensus/integration/jdbc/OcWrapConnection.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; -import io.opencensus.integration.jdbc.Observability.TraceOption; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; +import io.orijtech.integrations.ocjdbc.Observability.TraceOption; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.sql.Connection; import java.sql.SQLException; import java.util.EnumSet; diff --git a/src/main/java/io/opencensus/integration/jdbc/OcWrapDriver.java b/src/main/java/io/opencensus/integration/jdbc/OcWrapDriver.java index a723426..804b1bc 100644 --- a/src/main/java/io/opencensus/integration/jdbc/OcWrapDriver.java +++ b/src/main/java/io/opencensus/integration/jdbc/OcWrapDriver.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; -import io.opencensus.integration.jdbc.Observability.TraceOption; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; +import io.orijtech.integrations.ocjdbc.Observability.TraceOption; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.sql.Driver; import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; diff --git a/src/main/java/io/opencensus/integration/jdbc/OcWrapPreparedStatement.java b/src/main/java/io/opencensus/integration/jdbc/OcWrapPreparedStatement.java index d76a43c..0f19d9e 100644 --- a/src/main/java/io/opencensus/integration/jdbc/OcWrapPreparedStatement.java +++ b/src/main/java/io/opencensus/integration/jdbc/OcWrapPreparedStatement.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; -import io.opencensus.integration.jdbc.Observability.TraceOption; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; +import io.orijtech.integrations.ocjdbc.Observability.TraceOption; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.sql.PreparedStatement; import java.sql.SQLException; import java.util.EnumSet; diff --git a/src/main/java/io/opencensus/integration/jdbc/OcWrapResultSet.java b/src/main/java/io/opencensus/integration/jdbc/OcWrapResultSet.java index 47e4287..93bc507 100644 --- a/src/main/java/io/opencensus/integration/jdbc/OcWrapResultSet.java +++ b/src/main/java/io/opencensus/integration/jdbc/OcWrapResultSet.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/src/main/java/io/opencensus/integration/jdbc/OcWrapStatement.java b/src/main/java/io/opencensus/integration/jdbc/OcWrapStatement.java index 255da76..139669a 100644 --- a/src/main/java/io/opencensus/integration/jdbc/OcWrapStatement.java +++ b/src/main/java/io/opencensus/integration/jdbc/OcWrapStatement.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import io.opencensus.common.Scope; -import io.opencensus.integration.jdbc.Observability.TraceOption; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; +import io.orijtech.integrations.ocjdbc.Observability.TraceOption; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.sql.SQLException; import java.sql.Statement; import java.util.EnumSet; diff --git a/src/test/java/io/opencensus/integration/jdbc/ObservabilityTest.java b/src/test/java/io/opencensus/integration/jdbc/ObservabilityTest.java index 22ea7de..495e885 100644 --- a/src/test/java/io/opencensus/integration/jdbc/ObservabilityTest.java +++ b/src/test/java/io/opencensus/integration/jdbc/ObservabilityTest.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package io.opencensus.integration.jdbc; +package io.orijtech.integrations.ocjdbc; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; @@ -21,7 +21,6 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; -import io.opencensus.integration.jdbc.Observability.TrackingOperation; import io.opencensus.stats.Aggregation.Distribution; import io.opencensus.stats.BucketBoundaries; import io.opencensus.stats.Measure.MeasureDouble; @@ -39,6 +38,7 @@ import io.opencensus.trace.SpanBuilder; import io.opencensus.trace.Status; import io.opencensus.trace.Tracer; +import io.orijtech.integrations.ocjdbc.Observability.TrackingOperation; import java.util.Arrays; import org.junit.Before; import org.junit.Test;