Merge branch 'develop' into fix/downgrade-aspect-injector

Author: hjgraca

.github/workflows/codeql-analysis.yml

@@ -35,7 +35,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885  # v3.29.5
+      uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047  # v3.29.5
       with:
         languages: ${{ matrix.language }}
 
@@ -45,7 +45,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885  # v3.29.5
+      uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047  # v3.29.5
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -58,4 +58,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885  # v3.29.5
+      uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047  # v3.29.5

.github/workflows/ossf_scorecard.yml

@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
         with:
           sarif_file: results.sarif

CONTRIBUTING.md

@@ -3,6 +3,9 @@
 Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
 documentation, we greatly value feedback and contributions from our community.
 
+We encourage contributions from the community and we will work with contributors to merge their pull requests.
+Rarely, we may close pull requests that do not meet our guidelines specified in CONTRIBUTING.md, or will require unreasonable effort to meet our quality bar.
+
 Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
 information to effectively respond to your bug report or contribution.
 

docs/Dockerfile

@@ -1,5 +1,5 @@
 # v9.1.18
-FROM squidfunk/mkdocs-material@sha256:00f9276315990b82f5af8c47bb2b71e2c69aef9f02a08f8dffd2515f42310753
+FROM squidfunk/mkdocs-material@sha256:f5c556a6d30ce0c1c0df10e3c38c79bbcafdaea4b1c1be366809d0d4f6f9d57f
 
 COPY requirements.txt /tmp/
 RUN pip install --require-hashes -r /tmp/requirements.txt

libraries/src/AWS.Lambda.Powertools.Tracing/Tracing.cs

@@ -154,8 +154,20 @@ public static void WithSubsegment(string nameSpace, string name, Action<TracingS
         XRayRecorder.Instance.SetNamespace(GetNamespaceOrDefault(nameSpace));
         try
         {
-            var entity = XRayRecorder.Instance.GetEntity() as TracingSubsegment;
-            subsegment?.Invoke(entity);
+            var entity = XRayRecorder.Instance.GetEntity();
+            var tracingSubsegment = new TracingSubsegment("## " + name);
+            
+            // Copy properties from the current entity
+            if (entity != null)
+            {
+                if (entity is Subsegment subsegmentEntity)
+                {
+                    tracingSubsegment.Namespace = subsegmentEntity.Namespace;
+                }
+                tracingSubsegment.Sampled = entity.Sampled;
+            }
+            
+            subsegment?.Invoke(tracingSubsegment);
         }
         finally
         {