renamed packages

elastic · Aug 29, 2020 · 59ef6ba · 59ef6ba
1 parent bd73afb
commit 59ef6ba
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 34 deletions.
diff --git a/...sticsearchClientAsyncInstrumentation.java → ...sticsearchClientAsyncInstrumentation.java b/...sticsearchClientAsyncInstrumentation.java → ...sticsearchClientAsyncInstrumentation.java
@@ -22,10 +22,10 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v5_6;
+package co.elastic.apm.agent.esrestclient5_6;
 
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentation;
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentation;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper;
 import co.elastic.apm.agent.impl.transaction.AbstractSpan;
 import co.elastic.apm.agent.impl.transaction.Span;
 import co.elastic.apm.agent.sdk.advice.AssignTo;

diff --git a/...asticsearchClientSyncInstrumentation.java → ...asticsearchClientSyncInstrumentation.java b/...asticsearchClientSyncInstrumentation.java → ...asticsearchClientSyncInstrumentation.java
@@ -22,10 +22,10 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v5_6;
+package co.elastic.apm.agent.esrestclient5_6;
 
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentation;
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentation;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper;
 import co.elastic.apm.agent.impl.transaction.Span;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;

diff --git a/...gent/es/restclient/v6_4/package-info.java → ...m/agent/esrestclient5_6/package-info.java b/...gent/es/restclient/v6_4/package-info.java → ...m/agent/esrestclient5_6/package-info.java
@@ -23,6 +23,6 @@
  * #L%
  */
 @NonnullApi
-package co.elastic.apm.agent.es.restclient.v6_4;
+package co.elastic.apm.agent.esrestclient5_6;
 
 import co.elastic.apm.agent.sdk.NonnullApi;
diff --git a/...6/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation b/...6/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation
@@ -1,2 +1,2 @@
-co.elastic.apm.agent.es.restclient.v5_6.ElasticsearchClientSyncInstrumentation
-co.elastic.apm.agent.es.restclient.v5_6.ElasticsearchClientAsyncInstrumentation
+co.elastic.apm.agent.esrestclient5_6.ElasticsearchClientSyncInstrumentation
+co.elastic.apm.agent.esrestclient5_6.ElasticsearchClientAsyncInstrumentation
diff --git a/...ticsearchRestClientInstrumentationIT.java → ...ticsearchRestClientInstrumentationIT.java b/...ticsearchRestClientInstrumentationIT.java → ...ticsearchRestClientInstrumentationIT.java
@@ -22,9 +22,9 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v5_6;
+package co.elastic.apm.agent.esrestclient5_6;
 
-import co.elastic.apm.agent.es.restclient.AbstractEsClientInstrumentationTest;
+import co.elastic.apm.agent.esrestclient.AbstractEsClientInstrumentationTest;
 import co.elastic.apm.agent.impl.transaction.Span;
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;

diff --git a/...sticsearchClientAsyncInstrumentation.java → ...sticsearchClientAsyncInstrumentation.java b/...sticsearchClientAsyncInstrumentation.java → ...sticsearchClientAsyncInstrumentation.java
@@ -22,10 +22,10 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v6_4;
+package co.elastic.apm.agent.esrestclient6_4;
 
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentation;
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentation;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper;
 import co.elastic.apm.agent.impl.transaction.Span;
 import co.elastic.apm.agent.sdk.advice.AssignTo;
 import co.elastic.apm.agent.sdk.state.GlobalThreadLocal;

diff --git a/...asticsearchClientSyncInstrumentation.java → ...asticsearchClientSyncInstrumentation.java b/...asticsearchClientSyncInstrumentation.java → ...asticsearchClientSyncInstrumentation.java
@@ -22,10 +22,10 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v6_4;
+package co.elastic.apm.agent.esrestclient6_4;
 
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentation;
-import co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentation;
+import co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper;
 import co.elastic.apm.agent.impl.transaction.Span;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;

diff --git a/...gent/es/restclient/v5_6/package-info.java → ...m/agent/esrestclient6_4/package-info.java b/...gent/es/restclient/v5_6/package-info.java → ...m/agent/esrestclient6_4/package-info.java
@@ -23,6 +23,6 @@
  * #L%
  */
 @NonnullApi
-package co.elastic.apm.agent.es.restclient.v5_6;
+package co.elastic.apm.agent.esrestclient6_4;
 
 import co.elastic.apm.agent.sdk.NonnullApi;
diff --git a/...4/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation b/...4/src/main/resources/META-INF/services/co.elastic.apm.agent.sdk.ElasticApmInstrumentation
@@ -1,2 +1,2 @@
-co.elastic.apm.agent.es.restclient.v6_4.ElasticsearchClientSyncInstrumentation
-co.elastic.apm.agent.es.restclient.v6_4.ElasticsearchClientAsyncInstrumentation
+co.elastic.apm.agent.esrestclient6_4.ElasticsearchClientSyncInstrumentation
+co.elastic.apm.agent.esrestclient6_4.ElasticsearchClientAsyncInstrumentation
diff --git a/...stractEs6_4ClientInstrumentationTest.java → ...stractEs6_4ClientInstrumentationTest.java b/...stractEs6_4ClientInstrumentationTest.java → ...stractEs6_4ClientInstrumentationTest.java
@@ -22,9 +22,9 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v6_4;
+package co.elastic.apm.agent.esrestclient6_4;
 
-import co.elastic.apm.agent.es.restclient.AbstractEsClientInstrumentationTest;
+import co.elastic.apm.agent.esrestclient.AbstractEsClientInstrumentationTest;
 import co.elastic.apm.agent.impl.transaction.Span;
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.action.ActionListener;

diff --git a/...ticsearchRestClientInstrumentationIT.java → ...ticsearchRestClientInstrumentationIT.java b/...ticsearchRestClientInstrumentationIT.java → ...ticsearchRestClientInstrumentationIT.java
@@ -22,7 +22,7 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v6_4;
+package co.elastic.apm.agent.esrestclient6_4;
 
 import co.elastic.apm.agent.impl.transaction.Span;
 import org.apache.http.HttpHost;

diff --git a/...ClientInstrumentationIT_RealReporter.java → ...ClientInstrumentationIT_RealReporter.java b/...ClientInstrumentationIT_RealReporter.java → ...ClientInstrumentationIT_RealReporter.java
@@ -22,7 +22,7 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v6_4;
+package co.elastic.apm.agent.esrestclient6_4;
 
 import co.elastic.apm.agent.bci.ElasticApmAgent;
 import co.elastic.apm.agent.configuration.SpyConfiguration;

diff --git a/...ticsearchRestClientInstrumentationIT.java → ...ticsearchRestClientInstrumentationIT.java b/...ticsearchRestClientInstrumentationIT.java → ...ticsearchRestClientInstrumentationIT.java
@@ -22,9 +22,9 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient.v7_1;
+package co.elastic.apm.agent.esrestclient7_1;
 
-import co.elastic.apm.agent.es.restclient.v6_4.AbstractEs6_4ClientInstrumentationTest;
+import co.elastic.apm.agent.esrestclient6_4.AbstractEs6_4ClientInstrumentationTest;
 import co.elastic.apm.agent.impl.transaction.Span;
 import org.apache.http.HttpHost;
 import org.apache.http.impl.client.BasicCredentialsProvider;

diff --git a/...asticsearchRestClientInstrumentation.java → ...asticsearchRestClientInstrumentation.java b/...asticsearchRestClientInstrumentation.java → ...asticsearchRestClientInstrumentation.java
@@ -22,7 +22,7 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient;
+package co.elastic.apm.agent.esrestclient;
 
 import co.elastic.apm.agent.bci.TracerAwareInstrumentation;
 

diff --git a/...earchRestClientInstrumentationHelper.java → ...earchRestClientInstrumentationHelper.java b/...earchRestClientInstrumentationHelper.java → ...earchRestClientInstrumentationHelper.java
@@ -22,7 +22,7 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient;
+package co.elastic.apm.agent.esrestclient;
 
 import co.elastic.apm.agent.impl.transaction.AbstractSpan;
 import co.elastic.apm.agent.impl.transaction.Span;

diff --git a/...s/restclient/ResponseListenerWrapper.java → ...esrestclient/ResponseListenerWrapper.java b/...s/restclient/ResponseListenerWrapper.java → ...esrestclient/ResponseListenerWrapper.java
@@ -22,7 +22,7 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient;
+package co.elastic.apm.agent.esrestclient;
 
 import co.elastic.apm.agent.impl.transaction.Span;
 import co.elastic.apm.agent.objectpool.Recyclable;

diff --git a/...apm/agent/es/restclient/package-info.java → .../apm/agent/esrestclient/package-info.java b/...apm/agent/es/restclient/package-info.java → .../apm/agent/esrestclient/package-info.java
@@ -23,6 +23,6 @@
  * #L%
  */
 @NonnullApi
-package co.elastic.apm.agent.es.restclient;
+package co.elastic.apm.agent.esrestclient;
 
 import co.elastic.apm.agent.sdk.NonnullApi;
diff --git a/.../AbstractEsClientInstrumentationTest.java → .../AbstractEsClientInstrumentationTest.java b/.../AbstractEsClientInstrumentationTest.java → .../AbstractEsClientInstrumentationTest.java
@@ -22,7 +22,7 @@
  * under the License.
  * #L%
  */
-package co.elastic.apm.agent.es.restclient;
+package co.elastic.apm.agent.esrestclient;
 
 import co.elastic.apm.agent.AbstractInstrumentationTest;
 import co.elastic.apm.agent.impl.context.Db;
@@ -40,9 +40,9 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper.ELASTICSEARCH;
-import static co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper.SPAN_ACTION;
-import static co.elastic.apm.agent.es.restclient.ElasticsearchRestClientInstrumentationHelper.SPAN_TYPE;
+import static co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper.ELASTICSEARCH;
+import static co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper.SPAN_ACTION;
+import static co.elastic.apm.agent.esrestclient.ElasticsearchRestClientInstrumentationHelper.SPAN_TYPE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public abstract class AbstractEsClientInstrumentationTest extends AbstractInstrumentationTest {