From 679ad7ae6cbae8dc3abff43579674de32917988a Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Fri, 16 Oct 2026 16:42:25 -0700 Subject: [PATCH 1/3] Fix service name calculation in Lambda --- solarwinds_apm/apm_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/solarwinds_apm/apm_config.py b/solarwinds_apm/apm_config.py index eee99dc31..bb8719be0 100644 --- a/solarwinds_apm/apm_config.py +++ b/solarwinds_apm/apm_config.py @@ -355,7 +355,8 @@ def _calculate_service_name_lambda( if not otel_service_name: return self.lambda_function_name - if otel_service_name == "unknown_service": + # e.g. OTel spec and SDK set as unknown_service: or unknown_service + if otel_service_name.startswith("unknown_service"): # OTEL_SERVICE_NAME was not set # and exec wrapper did not wrap instrumentation return self.lambda_function_name From bd5d8f03034ddf5b53960eea80f7c0cc5d1919cf Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Fri, 16 Oct 2026 16:45:01 -0700 Subject: [PATCH 2/3] Better --- solarwinds_apm/apm_config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/solarwinds_apm/apm_config.py b/solarwinds_apm/apm_config.py index bb8719be0..c27e8f399 100644 --- a/solarwinds_apm/apm_config.py +++ b/solarwinds_apm/apm_config.py @@ -356,7 +356,10 @@ def _calculate_service_name_lambda( return self.lambda_function_name # e.g. OTel spec and SDK set as unknown_service: or unknown_service - if otel_service_name.startswith("unknown_service"): + if ( + otel_service_name == "unknown_service" + or otel_service_name.startswith("unknown_service:") + ): # OTEL_SERVICE_NAME was not set # and exec wrapper did not wrap instrumentation return self.lambda_function_name From 7b67391ba659bf7c34b43e813321fb99bc9ec8af Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Fri, 16 Oct 2026 16:50:38 -0700 Subject: [PATCH 3/3] Fix codeql hash --- .github/workflows/codeql_analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql_analysis.yml b/.github/workflows/codeql_analysis.yml index b8826f65a..df9b86b02 100644 --- a/.github/workflows/codeql_analysis.yml +++ b/.github/workflows/codeql_analysis.yml @@ -52,7 +52,7 @@ jobs: queries: security-extended,security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 + uses: github/codeql-action/autobuild@24c54180a607b1449ed407dd24f251e4e9147c8d - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d