Adding opentracing-spring-haystack-cloud-starter module (#84)

* updating README

* cloud starter

* including README

* including README

Author: Magesh Chandramouli

.travis/deploy.sh

@@ -9,13 +9,14 @@ if [ "${TRAVIS_BRANCH}" == 'master' -a "${TRAVIS_PULL_REQUEST}" == 'false' ] ||
 
   if [ ! -z "${TRAVIS_TAG}" ]; then
     echo "travis tag is set -> updating pom.xml <version> attribute to ${TRAVIS_TAG}"
-    ./mvnw --batch-mode --settings .travis/settings.xml --no-snapshot-updates -Prelease -DskipTests=true -DreleaseVersion=${TRAVIS_TAG} release:prepare
+    ./mvnw --batch-mode --settings .travis/settings.xml -DskipTests=true -DreleaseVersion=${TRAVIS_TAG} release:clean release:prepare release:perform
+    SUCCESS=$?
   else
     echo "no travis tag is set, hence keeping the snapshot version in pom.xml"
+    ./mvnw --batch-mode --settings .travis/settings.xml clean deploy -DskipTests=true -B -U
+    SUCCESS=$?
   fi
 
-  ./mvnw --batch-mode --settings .travis/settings.xml -Prelease clean deploy -DskipTests=true -B -U
-  SUCCESS=$?
   if [ ${SUCCESS} -eq 0 ]; then
     echo "successfully deployed the jars to nexus"
   fi

README.md

@@ -35,19 +35,11 @@ For a full build, including unit tests you can run the following
 
 Latest releases of this library are available in [Maven central](https://mvnrepository.com/search?q=Haystack&d=com.expedia)
 
-1. Decide what kind of version bump is necessary, based on [Semantic Versioning](http://semver.org/) conventions.
-In the items below, the version number you select will be referred to as `x.y.z`.
-2. Update the [pom.xml](https://github.com/ExpediaDotCom/haystack-client-java/blob/master/pom.xml),
-changing the version element to `<version>x.y.z</version>`. Note the *removal* of the `-SNAPSHOT` suffix.
-3. Update the
-[ReleaseNotes.md]((https://github.com/ExpediaDotCom/haystack-client-java/blob/master/ReleaseNotes.md))
-file with details of your changes.
-5. Create a pull request with your changes.
-6. Ask for a review of the pull request; when it is approved, the Travis CI build will upload the resulting jar file
-to the [SonaType Staging Repository](https://oss.sonatype.org/#stagingRepositories).
-This will cause the jar file to be released to the 
+1. Create a pull request with your changes.
+2. Ask for a review of the pull request; when it is approved, the Travis CI build will upload the resulting SNAPSHOT jar file
+to the [SonaType Staging Repository](https://oss.sonatype.org/#stagingRepositories)
+3. Once merged to master, one can use github https://github.com/ExpediaDotCom/haystack-client-java/releases or manual tagging to the next semantic version
+4. This will cause the build to run for the new tagged version. This will cause the jar files to be released to the 
 [SonaType Release Repository](https://oss.sonatype.org/#nexus-search;quick~haystack-client-java).
-7. Now you have to *put back* the -SNAPSHOT that you removed in step 2. When you do that, bump the `z` value to `z + 1`
-to minimize the chance of somebody trying to release on top of the x.y.z version you just released. Note that the next
-release might not use `x.y.z+1`; it could instead be `x.y+1.0` or `x+1.0.0`
-8. Create another pull request with the change from step 7 and get it merged.
+5. Now, update the POM version to next snapshot version for development
+6. Create another pull request with the change from step 5 and get it merged.

integrations/opentracing-spring-haystack-cloud-starter/README.md

@@ -0,0 +1 @@
+Check the [Quick Start](../opentracing-spring-haystack-web-starter#quick-start) section of the README file in [opentracing-spring-haystack-web-starter](../opentracing-spring-haystack-web-starter) module

integrations/opentracing-spring-haystack-cloud-starter/pom.xml

@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.expedia.www</groupId>
+        <artifactId>haystack-client-java-integrations</artifactId>
+        <version>0.2.3-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>opentracing-spring-haystack-cloud-starter</artifactId>
+    <packaging>jar</packaging>
+    <name>opentracing-spring-haystack-cloud-starter</name>
+    <description>Spring integration for haystack</description>
+
+    <properties>
+        <opentracing-spring-cloud-starter.version>0.2.2</opentracing-spring-cloud-starter.version>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.expedia.www</groupId>
+            <artifactId>opentracing-spring-haystack-starter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentracing.contrib</groupId>
+            <artifactId>opentracing-spring-cloud-starter</artifactId>
+            <version>${opentracing-spring-cloud-starter.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentracing.contrib</groupId>
+            <artifactId>opentracing-tracerresolver</artifactId>
+            <version>0.1.5</version>
+        </dependency>
+        <dependency>
+            <groupId>io.opentracing.contrib</groupId>
+            <artifactId>opentracing-web-servlet-filter</artifactId>
+            <version>0.2.2</version>
+        </dependency>
+    </dependencies>
+</project>

integrations/opentracing-spring-haystack-web-starter/README.md

@@ -46,6 +46,16 @@ Add the following dependency to your application
 </dependency>
 ```
 
+Alternately, one can use `opentracing-spring-haystack-cloud-starter` instead. It is convenience starter that includes opentracing-spring-haystack-starter, opentracing-spring-web-starter and opentracing-spring-cloud-starter. This allows one to take advantage of opentracing instrumentation provided for Spring Cloud.
+
+```xml
+<dependency>
+    <groupId>com.expedia.www</groupId>
+    <artifactId>opentracing-spring-haystack-cloud-starter</artifactId>
+    <version>${opentracing-spring-haystack-cloud-starter.version}</version>
+</dependency>
+```
+
 ### Spring Application dependency
 
 To access an instance of `opentracing.io.Tracer` to instrument a Spring application, one can add the following dependencies

integrations/pom.xml

@@ -44,6 +44,7 @@
         <module>micrometer</module>
         <module>opentracing-spring-haystack-starter</module>
         <module>opentracing-spring-haystack-web-starter</module>
+        <module>opentracing-spring-haystack-cloud-starter</module>
         <module>opencensus</module>
     </modules>
 </project>