Releasing v1.2.2.

aws · Dec 5, 2017 · c821d01 · c821d01
1 parent 8e031d0
commit c821d01
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 1.2.2 - 2017-12-05
+### Changed
+- Fixed a bug a bug which caused certain non-sampled segments to be emitted to the X-Ray daemon. This issue occurred only when the segment began as sampled and was manually overridden to non-sampled using `setSampled(false)`.
+
 ## 1.2.1 - 2017-11-20
 ### Changed
 - Fixed a bug in the exception serialization logic that occurred when an added exception had one or more 'cause' exceptions.

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>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-apache-http</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</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-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>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk-instrumentor</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK Instrumentor</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>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-aws-sdk</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK Handler</name>
   <build>
     <plugins>

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>1.2.1</version>
+    <version>1.2.2</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>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-core</artifactId>
   <name>AWS X-Ray Recorder SDK for Java - Core</name>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <build>
     <plugins>
       <plugin>

diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/AWSXRayRecorder.java
@@ -396,7 +396,7 @@ public void endSegment() {
             Segment segment = current.getParentSegment();
             logger.debug("Ending segment named '" + segment.getName() + "'.");
             if(segment.end()) {
-                emitter.sendSegment(segment);
+                sendSegment(segment);
             } else {
                 logger.debug("Not emitting segment named '" + segment.getName() + "' as it parents in-progress subsegments.");
             }

diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/AWSXRayRecorderTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/AWSXRayRecorderTest.java
@@ -223,6 +223,18 @@ public void testSubsegmentBeginWithoutSegmentContextThrowsException() {
         AWSXRay.beginSubsegment("test");
     }
 
+    @Test
+    public void testNotSendingUnsampledSegment() {
+        Emitter mockEmitter = Mockito.mock(UDPEmitter.class);
+        AWSXRayRecorder recorder = AWSXRayRecorderBuilder.standard().withEmitter(mockEmitter).build();
+
+        Segment segment = recorder.beginSegment("test");
+        segment.setSampled(false);
+        recorder.endSegment();
+
+        Mockito.verify(mockEmitter, Mockito.times(0)).sendSegment(Mockito.any());
+    }
+
     @Test
     public void testSegmentEmitted() {
         Emitter mockEmitter = Mockito.mock(UDPEmitter.class);

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>1.2.1</version>
+    <version>1.2.2</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql-mysql</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</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
@@ -3,13 +3,13 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-      <groupId>com.amazonaws</groupId>
-      <artifactId>aws-xray-recorder-sdk-pom</artifactId>
-      <version>1.2.1</version>
+    <groupId>com.amazonaws</groupId>
+    <artifactId>aws-xray-recorder-sdk-pom</artifactId>
+    <version>1.2.2</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-xray-recorder-sdk-sql-postgres</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2</version>
   <name>AWS X-Ray Recorder SDK for Java - AWS SDK PostgreSQL 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>1.2.1</version>
+  <version>1.2.2</version>
   <build>
     <plugins>
       <plugin>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-xray-recorder-sdk-bom</artifactId>
-        <version>1.2.1</version>
+        <version>1.2.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

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>1.2.1</version>
+  <version>1.2.2</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>
@@ -45,7 +45,7 @@
     </repository>
   </distributionManagement>
   <properties>
-    <awsxrayrecordersdk.version>1.2.1</awsxrayrecordersdk.version>
+    <awsxrayrecordersdk.version>1.2.2</awsxrayrecordersdk.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>