Merge branch '2.10' into backport-10131-to-2.10

DataDog · Aug 9, 2024 · 1a94c5b · 1a94c5b
2 parents f654a7b + f05caf3
commit 1a94c5b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/.gitlab/build-oci.sh b/.gitlab/build-oci.sh
@@ -43,6 +43,7 @@ cp ../lib-injection/sitecustomize.py $BUILD_DIR/
 cp auto_inject-python.version $BUILD_DIR/version
 cp ../min_compatible_versions.csv $BUILD_DIR/
 cp ../lib-injection/telemetry-forwarder.sh $BUILD_DIR/
+chmod -R +r $BUILD_DIR
 chmod -R o-w $BUILD_DIR
 chmod -R g-w $BUILD_DIR
 

diff --git a/ddtrace/contrib/tornado/handlers.py b/ddtrace/contrib/tornado/handlers.py
@@ -58,7 +58,8 @@ def execute(func, handler, args, kwargs):
             request_span.set_tag(ANALYTICS_SAMPLE_RATE_KEY, settings.get("analytics_sample_rate", True))
 
         http_route = _find_route(handler.application.default_router.rules, handler.request)
-        request_span.set_tag_str("http.route", http_route)
+        if http_route is not None and isinstance(http_route, str):
+            request_span.set_tag_str("http.route", http_route)
         setattr(handler.request, REQUEST_SPAN_KEY, request_span)
 
         return func(*args, **kwargs)

diff --git a/releasenotes/notes/fix-ssi-permissions-647693af3d5ce49d.yaml b/releasenotes/notes/fix-ssi-permissions-647693af3d5ce49d.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    SSI: This fixes incorrect file permissions on lib-injection images for 2.10.x releases.
+