Applied HttpClient to get sampling info

sdk/src/Core/AWSXRayRecorder.Core.csproj

@@ -39,7 +39,6 @@
 
   <ItemGroup>
     <PackageReference Include="AWSSDK.Core" Version="[3.3.25.1,4.0)" />
-    <PackageReference Include="AWSSDK.XRay" Version="[3.3.3,4.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

sdk/src/Core/Sampling/DefaultSamplingStrategy.cs

@@ -43,9 +43,9 @@ public class DefaultSamplingStrategy : ISamplingStrategy
         public DaemonConfig DaemonCfg { get; private set; }
 
         /// <summary>
-        /// Instance of <see cref="AmazonXRayClient"/>.
+        /// Instance of <see cref="XRayConfig"/>.
         /// </summary>
-        public AmazonXRayClient XRayClient = null;
+        public XRayConfig XRayConfig = null;
 
         /// <summary>
         /// Instance of <see cref="DefaultSamplingStrategy"/>.
@@ -81,7 +81,7 @@ private void Start()
             {
                 if (!_isPollerStarted)
                 {
-                    _connector = new ServiceConnector(DaemonCfg, XRayClient);
+                    _connector = new ServiceConnector(DaemonCfg, XRayConfig);
                     _rulePoller.Poll(_connector);
                     _targetPoller.Poll(_connector);
                     _isPollerStarted = true;

sdk/src/Core/Sampling/GetSamplingRulesResponse.cs

@@ -19,7 +19,7 @@
 namespace Amazon.XRay.Recorder.Core.Sampling
 {
     /// <summary>
-    /// Wrapper to <see cref="AmazonXRayClient.GetSamplingRulesAsync(Model.GetSamplingRulesRequest, System.Threading.CancellationToken)"/> API call response.
+    /// Class for keep list of sampling rules from x-ray backend.
     /// </summary>
     public class GetSamplingRulesResponse
     {

sdk/src/Core/Sampling/GetSamplingTargetsResponse.cs

@@ -19,7 +19,7 @@
 namespace Amazon.XRay.Recorder.Core.Sampling
 {
     /// <summary>
-    /// Wrapper for <see cref="AmazonXRayClient.GetSamplingTargetsAsync(Model.GetSamplingTargetsRequest, System.Threading.CancellationToken)"/> API call response.
+    /// Class for keep last rule modification timestamp and list of sampling targets from x-ray backend.
     /// </summary>
     public class GetSamplingTargetsResponse
     {

sdk/src/Core/Sampling/Model/SamplingRuleModel.cs

@@ -0,0 +1,53 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingRuleModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class model for unmarshalling sampling rule from sampling rule response json.
+    /// </summary>
+    public class SamplingRuleModel
+    {
+        public string RuleName;
+
+        public int? Priority;
+
+        public double? FixedRate;
+
+        public int? ReservoirSize;
+
+        public string Host;
+
+        public string ServiceName;
+
+        public string HTTPMethod;
+
+        public string URLPath;
+
+        public string ServiceType;
+
+        public string ResourceARN;
+
+        public string RuleARN;
+
+        public int? Version;
+
+        public Dictionary<string, string> Attributes;
+    }
+}

sdk/src/Core/Sampling/Model/SamplingRuleRecordsModel.cs

@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingRuleRecordsModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class model for unmarshalling sampling rule record from sampling rule response json.
+    /// </summary>
+    public class SamplingRuleRecordsModel
+    {
+        public double? CreatedAt;
+
+        public double? ModifiedAt;
+
+        public SamplingRuleModel SamplingRule;
+    }
+}

sdk/src/Core/Sampling/Model/SamplingRuleResponseModel.cs

@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingRuleResponseModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class model for unmarshalling sampling rule response json.
+    /// </summary>
+    public class SamplingRuleResponseModel
+    {
+        public string NextToken;
+
+        public List<SamplingRuleRecordsModel> SamplingRuleRecords = new List<SamplingRuleRecordsModel>();
+    }
+}

sdk/src/Core/Sampling/Model/SamplingStatisticsDocumentModel.cs

@@ -0,0 +1,37 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingStatisticsDocumentModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class for marshalling sampling statistics document json.
+    /// </summary>
+    public class SamplingStatisticsDocumentModel
+    {
+        public string ClientID { get; set; }
+
+        public string RuleName { get; set; }
+
+        public int? RequestCount { get; set; }
+
+        public int? SampledCount { get; set; }
+
+        public int? BorrowCount { get; set; }
+
+        public double? Timestamp { get; set; }
+    }
+}

sdk/src/Core/Sampling/Model/SamplingStatisticsModel.cs

@@ -0,0 +1,29 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingStatisticsModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class for marshalling sampling statistics document json.
+    /// </summary>
+    public class SamplingStatisticsModel
+    {
+        public List<SamplingStatisticsDocumentModel> SamplingStatisticsDocuments { get; set; } = new List<SamplingStatisticsDocumentModel>();
+    }
+}

sdk/src/Core/Sampling/Model/SamplingTargetModel.cs

@@ -0,0 +1,35 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingTargetModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class model for unmarshalling sampling target from sampling target response json.
+    /// </summary>
+    public class SamplingTargetModel
+    {
+        public double? FixedRate;
+
+        public int? ReservoirQuota;
+
+        public double? ReservoirQuotaTTL;
+
+        public string RuleName;
+
+        public int? Interval;
+    }
+}

sdk/src/Core/Sampling/Model/SamplingTargetResponseModel.cs

@@ -0,0 +1,33 @@
+//-----------------------------------------------------------------------------
+// <copyright file="SamplingTargetResponseModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+using System.Collections.Generic;
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class model for unmarshalling sampling target response json.
+    /// </summary>
+    public class SamplingTargetResponseModel
+    {
+        public double? LastRuleModification;
+
+        public List<SamplingTargetModel> SamplingTargetDocuments = new List<SamplingTargetModel>();
+
+        public List<UnprocessedStatisticsModel> UnprocessedStatistics = new List<UnprocessedStatisticsModel>();
+    }
+}

sdk/src/Core/Sampling/Model/UnprocessedStatisticsModel.cs

@@ -0,0 +1,31 @@
+//-----------------------------------------------------------------------------
+// <copyright file="UnprocessedStatisticsModel.cs" company="Amazon.com">
+//      Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+//      Licensed under the Apache License, Version 2.0 (the "License").
+//      You may not use this file except in compliance with the License.
+//      A copy of the License is located at
+//
+//      http://aws.amazon.com/apache2.0
+//
+//      or in the "license" file accompanying this file. This file is distributed
+//      on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+//      express or implied. See the License for the specific language governing
+//      permissions and limitations under the License.
+// </copyright>
+//-----------------------------------------------------------------------------
+
+namespace Amazon.XRay.Recorder.Core.Sampling.Model
+{
+    /// <summary>
+    /// Class for unmarshalling unprocessed statistics from sampling target response json.
+    /// </summary>
+    public class UnprocessedStatisticsModel
+    {
+        public string RuleName;
+
+        public string ErrorCode;
+
+        public string Message;
+    }
+}

sdk/src/Core/Sampling/SamplingRule.cs

@@ -85,9 +85,9 @@ internal void IncrementSampledCount()
         /// <summary>
         /// Validates sampling rule. ResourceARN with "*" value is valid. SDK doesn't support Atrributes parameter with any value.
         /// </summary>
-        /// <param name ="rule">Instance of <see cref="Model.SamplingRule"/></param>
+        /// <param name ="rule">Instance of <see cref="Model.SamplingRuleModel"/></param>
         /// <returns> True, if the rule is valid else false.</returns>
-        internal static bool IsValid(Model.SamplingRule rule)
+        internal static bool IsValid(Model.SamplingRuleModel rule)
         {
             if (!string.Equals(rule.ResourceARN, "*"))
             {