releasing 2.6.1 (#172)

willarmiros · web-flow · commit 05508f4ca536 · 2020-06-21T00:16:24.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 2.6.1 - 2020-06-20
+- Fixed JSON parsing logic for Centralized Sampling
+[PR 171](https://github.com/aws/aws-xray-sdk-java/pull/171)
+
 ## 2.6.0 - 2020-06-10
 - Added calls to X-Ray daemon for rules/targets with a simple JDK-based client
 [PR 145](https://github.com/aws/aws-xray-sdk-java/pull/145)
diff --git a/README.md b/README.md
@@ -14,67 +14,67 @@ Add the AWS X-Ray SDK dependencies to your pom.xml:
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-core</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-apache-http</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk-v2</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk-instrumentor</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk-v2-instrumentor</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql-mysql</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql-postgresql</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-spring</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-log4j</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-slf4j</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 <dependency>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-metrics</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
 </dependency>
 ```
 
diff --git a/aws-xray-recorder-sdk-apache-http/pom.xml b/aws-xray-recorder-sdk-apache-http/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-apache-http</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - Apache HTTP Client Proxy</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk-aws-sdk-core/pom.xml b/aws-xray-recorder-sdk-aws-sdk-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
         <groupId>com.amazonaws</groupId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aws-xray-recorder-sdk-aws-sdk-core</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <name>AWS X-Ray Recorder SDK for Java - AWS SDK Core</name>
     <build>
         <plugins>
diff --git a/aws-xray-recorder-sdk-aws-sdk-instrumentor/pom.xml b/aws-xray-recorder-sdk-aws-sdk-instrumentor/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk-instrumentor</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK Instrumentor</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk-aws-sdk-v2-instrumentor/pom.xml b/aws-xray-recorder-sdk-aws-sdk-v2-instrumentor/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
         <groupId>com.amazonaws</groupId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aws-xray-recorder-sdk-aws-sdk-v2-instrumentor</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <name>AWS X-Ray Recorder SDK for Java - AWS SDK V2 Instrumentor</name>
     <build>
         <plugins>
diff --git a/aws-xray-recorder-sdk-aws-sdk-v2/pom.xml b/aws-xray-recorder-sdk-aws-sdk-v2/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
         <groupId>com.amazonaws</groupId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aws-xray-recorder-sdk-aws-sdk-v2</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <name>AWS X-Ray Recorder SDK for Java - AWS SDK V2</name>
     <build>
         <plugins>
diff --git a/aws-xray-recorder-sdk-aws-sdk/pom.xml b/aws-xray-recorder-sdk-aws-sdk/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK Handler</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk-benchmark/pom.xml b/aws-xray-recorder-sdk-benchmark/pom.xml
@@ -5,12 +5,12 @@
         <parent>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
         <groupId>com.amazonaws</groupId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>aws-xray-recorder-sdk-benchmark</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
     <name>AWS X-Ray Recorder SDK for Java - AWS SDK Benchmark</name>
 
     <packaging>jar</packaging>
diff --git a/aws-xray-recorder-sdk-bom/pom.xml b/aws-xray-recorder-sdk-bom/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-bom</artifactId>
diff --git a/aws-xray-recorder-sdk-core/pom.xml b/aws-xray-recorder-sdk-core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-core</artifactId>
   <name>AWS X-Ray Recorder SDK for Java - Core</name>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <build>
     <plugins>
       <plugin>
diff --git a/aws-xray-recorder-sdk-log4j/pom.xml b/aws-xray-recorder-sdk-log4j/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-log4j</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     <name>AWS X-Ray Recorder SDK for Java – Log4J Trace ID Injection</name>
     <build>
         <plugins>
diff --git a/aws-xray-recorder-sdk-metrics/pom.xml b/aws-xray-recorder-sdk-metrics/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-metrics</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - Segment Metrics</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk-slf4j/pom.xml b/aws-xray-recorder-sdk-slf4j/pom.xml
@@ -4,11 +4,11 @@
     <parent>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-slf4j</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     <name>AWS X-Ray Recorder SDK for Java - SLF4J Trace ID Injection</name>
     <build>
         <plugins>
diff --git a/aws-xray-recorder-sdk-spring/pom.xml b/aws-xray-recorder-sdk-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
     </parent>
 
     <artifactId>aws-xray-recorder-sdk-spring</artifactId>
diff --git a/aws-xray-recorder-sdk-sql-mysql/pom.xml b/aws-xray-recorder-sdk-sql-mysql/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql-mysql</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK MySQL Interceptor</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk-sql-postgres/pom.xml b/aws-xray-recorder-sdk-sql-postgres/pom.xml
@@ -5,11 +5,11 @@
   <parent>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql-postgres</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK PostgreSQL Interceptor</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk-sql/pom.xml b/aws-xray-recorder-sdk-sql/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
   <name>AWS X-Ray Recorder SDK for Java - SQL Interceptor</name>
   <build>
     <plugins>
diff --git a/aws-xray-recorder-sdk/pom.xml b/aws-xray-recorder-sdk/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk</artifactId>
-    <version>2.6.0</version>
+    <version>2.6.1</version>
   <build>
     <plugins>
       <plugin>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-xray-recorder-sdk-bom</artifactId>
-          <version>2.6.0</version>
+          <version>2.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version = 2.6.1-SNAPSHOT
+version = 2.6.2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-  <version>2.6.0</version>
+  <version>2.6.1</version>
   <packaging>pom</packaging>
   <name>AWS X-Ray Recorder SDK for Java</name>
   <description>The Amazon Web Services X-Ray Recorder SDK for Java provides Java APIs for emitting tracing data to AWS X-Ray. AWS X-Ray helps developers analyze and debug distributed applications. With X-Ray, you can understand how your application and its underlying services are performing to identify and troubleshoot the root cause of performance issues and errors.</description>
@@ -79,7 +79,7 @@
     </repository>
   </distributionManagement>
   <properties>
-    <awsxrayrecordersdk.version>2.6.0</awsxrayrecordersdk.version>
+    <awsxrayrecordersdk.version>2.6.1</awsxrayrecordersdk.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = 2.6.1-SNAPSHOT`
	`1`	`+version = 2.6.2-SNAPSHOT`