From 94c0f6460e69f9bce6d7050ab3da9174291289a9 Mon Sep 17 00:00:00 2001 From: Seva Safris Date: Fri, 29 Mar 2019 14:06:02 +0100 Subject: [PATCH] Upgrade version for release: 1.0.1 --- agentrule-maven-plugin/pom.xml | 2 +- opentracing-specialagent-api/pom.xml | 2 +- opentracing-specialagent/pom.xml | 2 +- pom.xml | 2 +- .../opentracing-specialagent-asynchttpclient/pom.xml | 2 +- rules/opentracing-specialagent-aws-sdk/pom.xml | 2 +- rules/opentracing-specialagent-camel/pom.xml | 2 +- .../agent/InstallOpenTracingTracerRuleTest.java | 5 +---- .../pom.xml | 2 +- rules/opentracing-specialagent-concurrent/pom.xml | 2 +- .../pom.xml | 2 +- rules/opentracing-specialagent-jdbc/pom.xml | 2 +- rules/opentracing-specialagent-jms-1/pom.xml | 2 +- rules/opentracing-specialagent-jms-2/pom.xml | 2 +- .../contrib/specialagent/jms/Jms2Test.java | 12 +++++++----- rules/opentracing-specialagent-kafka-client/pom.xml | 2 +- rules/opentracing-specialagent-mongo-driver/pom.xml | 2 +- rules/opentracing-specialagent-okhttp/pom.xml | 2 +- rules/opentracing-specialagent-rxjava-2/pom.xml | 2 +- .../pom.xml | 2 +- rules/pom.xml | 2 +- 21 files changed, 27 insertions(+), 28 deletions(-) diff --git a/agentrule-maven-plugin/pom.xml b/agentrule-maven-plugin/pom.xml index b6348ad52..5f7d099b1 100644 --- a/agentrule-maven-plugin/pom.xml +++ b/agentrule-maven-plugin/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent specialagent - 1.0.1-SNAPSHOT + 1.0.1 io.opentracing.contrib.specialagent agentrule-maven-plugin diff --git a/opentracing-specialagent-api/pom.xml b/opentracing-specialagent-api/pom.xml index 1369f11d3..06ffc90c3 100644 --- a/opentracing-specialagent-api/pom.xml +++ b/opentracing-specialagent-api/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent specialagent - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-api OpenTracing SpecialAgent API diff --git a/opentracing-specialagent/pom.xml b/opentracing-specialagent/pom.xml index 8181a639e..43403b967 100644 --- a/opentracing-specialagent/pom.xml +++ b/opentracing-specialagent/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent specialagent - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent OpenTracing SpecialAgent diff --git a/pom.xml b/pom.xml index c036bfe58..0433f2016 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 4.0.0 io.opentracing.contrib.specialagent specialagent - 1.0.1-SNAPSHOT + 1.0.1 pom Java SpecialAgent Java Agent for OpenTracing, with automatic instrumentation diff --git a/rules/opentracing-specialagent-asynchttpclient/pom.xml b/rules/opentracing-specialagent-asynchttpclient/pom.xml index 0ea08f908..9916ab77e 100644 --- a/rules/opentracing-specialagent-asynchttpclient/pom.xml +++ b/rules/opentracing-specialagent-asynchttpclient/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-asynchttpclient SpecialAgent Rule for AsyncHttpClient diff --git a/rules/opentracing-specialagent-aws-sdk/pom.xml b/rules/opentracing-specialagent-aws-sdk/pom.xml index e74130598..9e96dc874 100644 --- a/rules/opentracing-specialagent-aws-sdk/pom.xml +++ b/rules/opentracing-specialagent-aws-sdk/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-aws-sdk SpecialAgent Rule for AWS SDK diff --git a/rules/opentracing-specialagent-camel/pom.xml b/rules/opentracing-specialagent-camel/pom.xml index 8657a4892..dd4e5be75 100644 --- a/rules/opentracing-specialagent-camel/pom.xml +++ b/rules/opentracing-specialagent-camel/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-camel SpecialAgent Rule for Apache Camel diff --git a/rules/opentracing-specialagent-camel/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java b/rules/opentracing-specialagent-camel/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java index 5a25f772d..6b0912074 100644 --- a/rules/opentracing-specialagent-camel/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java +++ b/rules/opentracing-specialagent-camel/src/test/java/org/apache/camel/opentracing/agent/InstallOpenTracingTracerRuleTest.java @@ -32,7 +32,6 @@ import org.junit.runner.RunWith; import io.opentracing.contrib.specialagent.AgentRunner; -import io.opentracing.contrib.specialagent.AgentRunner.Config.Log; import io.opentracing.mock.MockSpan; import io.opentracing.mock.MockTracer; import io.opentracing.mock.MockTracer.Propagator; @@ -40,7 +39,7 @@ import io.opentracing.util.GlobalTracer; @RunWith(AgentRunner.class) -@AgentRunner.Config(isolateClassLoader=false, log=Log.FINE) +@AgentRunner.Config(isolateClassLoader=false) public class InstallOpenTracingTracerRuleTest extends CamelTestSupport { private static MockTracer tracer; @@ -79,9 +78,7 @@ public void testSendMatchingMessage() throws InterruptedException { final String expectedBody = ""; resultEndpoint.expectedBodiesReceived(expectedBody); - template.sendBodyAndHeader(expectedBody, "foo", "bar"); - resultEndpoint.assertIsSatisfied(); final List spans = tracer.finishedSpans(); diff --git a/rules/opentracing-specialagent-cassandra-driver/pom.xml b/rules/opentracing-specialagent-cassandra-driver/pom.xml index 60d9150ae..1febd058b 100644 --- a/rules/opentracing-specialagent-cassandra-driver/pom.xml +++ b/rules/opentracing-specialagent-cassandra-driver/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-cassandra-driver SpecialAgent Rule for Cassandra Driver diff --git a/rules/opentracing-specialagent-concurrent/pom.xml b/rules/opentracing-specialagent-concurrent/pom.xml index 12e3f3bbf..fc5d387dd 100644 --- a/rules/opentracing-specialagent-concurrent/pom.xml +++ b/rules/opentracing-specialagent-concurrent/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-concurrent SpecialAgent Rule for Java Concurrent diff --git a/rules/opentracing-specialagent-elasticsearch-client-6/pom.xml b/rules/opentracing-specialagent-elasticsearch-client-6/pom.xml index 7949f504c..84cc49f46 100644 --- a/rules/opentracing-specialagent-elasticsearch-client-6/pom.xml +++ b/rules/opentracing-specialagent-elasticsearch-client-6/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-elasticsearch-client-6 SpecialAgent Rule for Elasticsearch 6 Client diff --git a/rules/opentracing-specialagent-jdbc/pom.xml b/rules/opentracing-specialagent-jdbc/pom.xml index 41304071f..b1de2e712 100644 --- a/rules/opentracing-specialagent-jdbc/pom.xml +++ b/rules/opentracing-specialagent-jdbc/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-jdbc SpecialAgent Rule for JDBC diff --git a/rules/opentracing-specialagent-jms-1/pom.xml b/rules/opentracing-specialagent-jms-1/pom.xml index 8e6171791..c688c06fd 100644 --- a/rules/opentracing-specialagent-jms-1/pom.xml +++ b/rules/opentracing-specialagent-jms-1/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-jms-1 SpecialAgent Rule for JMS 1 diff --git a/rules/opentracing-specialagent-jms-2/pom.xml b/rules/opentracing-specialagent-jms-2/pom.xml index 8c0aff8af..7191390f3 100644 --- a/rules/opentracing-specialagent-jms-2/pom.xml +++ b/rules/opentracing-specialagent-jms-2/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-jms-2 SpecialAgent Rule for JMS 2 diff --git a/rules/opentracing-specialagent-jms-2/src/test/java/io/opentracing/contrib/specialagent/jms/Jms2Test.java b/rules/opentracing-specialagent-jms-2/src/test/java/io/opentracing/contrib/specialagent/jms/Jms2Test.java index bf11196ce..dd038b4d5 100644 --- a/rules/opentracing-specialagent-jms-2/src/test/java/io/opentracing/contrib/specialagent/jms/Jms2Test.java +++ b/rules/opentracing-specialagent-jms-2/src/test/java/io/opentracing/contrib/specialagent/jms/Jms2Test.java @@ -15,20 +15,19 @@ package io.opentracing.contrib.specialagent.jms; -import static org.junit.Assert.assertEquals; +import static org.junit.Assert.*; -import io.opentracing.contrib.specialagent.AgentRunner; -import io.opentracing.mock.MockSpan; -import io.opentracing.mock.MockTracer; import java.io.File; import java.util.HashSet; import java.util.List; + import javax.jms.Destination; import javax.jms.JMSContext; import javax.jms.JMSProducer; import javax.jms.MessageConsumer; import javax.jms.Session; import javax.jms.TextMessage; + import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl; @@ -41,8 +40,11 @@ import org.junit.Test; import org.junit.runner.RunWith; +import io.opentracing.contrib.specialagent.AgentRunner; +import io.opentracing.mock.MockSpan; +import io.opentracing.mock.MockTracer; + @RunWith(AgentRunner.class) -@AgentRunner.Config public class Jms2Test extends JmsTest { private ActiveMQServer server; private JMSContext context; diff --git a/rules/opentracing-specialagent-kafka-client/pom.xml b/rules/opentracing-specialagent-kafka-client/pom.xml index 16acbd626..3ef2c7093 100644 --- a/rules/opentracing-specialagent-kafka-client/pom.xml +++ b/rules/opentracing-specialagent-kafka-client/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-kafka-client SpecialAgent Rule for Kafka Client diff --git a/rules/opentracing-specialagent-mongo-driver/pom.xml b/rules/opentracing-specialagent-mongo-driver/pom.xml index 3f1f14698..3c610e70a 100644 --- a/rules/opentracing-specialagent-mongo-driver/pom.xml +++ b/rules/opentracing-specialagent-mongo-driver/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-mongo-driver SpecialAgent Rule for Mongo Driver diff --git a/rules/opentracing-specialagent-okhttp/pom.xml b/rules/opentracing-specialagent-okhttp/pom.xml index c24a8ff71..2250a02db 100644 --- a/rules/opentracing-specialagent-okhttp/pom.xml +++ b/rules/opentracing-specialagent-okhttp/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-okhttp SpecialAgent Rule for OkHttp diff --git a/rules/opentracing-specialagent-rxjava-2/pom.xml b/rules/opentracing-specialagent-rxjava-2/pom.xml index 08863cd5f..42d570dd4 100644 --- a/rules/opentracing-specialagent-rxjava-2/pom.xml +++ b/rules/opentracing-specialagent-rxjava-2/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-rxjava-2 SpecialAgent Rule for RxJava 2 diff --git a/rules/opentracing-specialagent-web-servlet-filter/pom.xml b/rules/opentracing-specialagent-web-servlet-filter/pom.xml index bfbffc432..b81be3451 100644 --- a/rules/opentracing-specialagent-web-servlet-filter/pom.xml +++ b/rules/opentracing-specialagent-web-servlet-filter/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent.rules rules - 1.0.1-SNAPSHOT + 1.0.1 opentracing-specialagent-web-servlet-filter SpecialAgent Rule for Web Servlet Filter diff --git a/rules/pom.xml b/rules/pom.xml index f07bfe32d..258e4e82d 100644 --- a/rules/pom.xml +++ b/rules/pom.xml @@ -21,7 +21,7 @@ io.opentracing.contrib.specialagent specialagent - 1.0.1-SNAPSHOT + 1.0.1 io.opentracing.contrib.specialagent.rules rules