From 7ef1b9dfa51b65b9262245ef1e798ef4aec83d82 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 12 Oct 2024 15:58:05 +0000
Subject: [PATCH] python3Packages.opentelemetry-instrumentation-logging: init
 at 0.47b0

---
 pkgs/by-name/ba/baserow/package.nix           | 33 ++++++++++---------
 .../default.nix                               | 32 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix

diff --git a/pkgs/by-name/ba/baserow/package.nix b/pkgs/by-name/ba/baserow/package.nix
index f6d4439cb79d7d..ed16decbceb509 100644
--- a/pkgs/by-name/ba/baserow/package.nix
+++ b/pkgs/by-name/ba/baserow/package.nix
@@ -222,6 +222,9 @@ python.pkgs.buildPythonApplication rec {
     "test_email_notifications_are_created_correctly"
     "test_remove_unused_personal_views"
     "test_files_are_served_by_base_file_storage_by_default"
+    "test_files_can_be_served_by_the_backend"
+    "test_secure_file_serve_requires_license_to_download_files"
+    "test_files_can_be_downloaded_by_the_backend_with_valid_license"
     # AttributeError: 'called_once' is not a valid assertion. Use a spec for the mock if 'called_once' is meant to be an attribute
     "test_notification_creation_on_creating_row_comment_mention"
     "test_notify_only_new_mentions_when_updating_a_comment"
@@ -235,21 +238,21 @@ python.pkgs.buildPythonApplication rec {
     "test_audit_log_entries_are_translated_in_the_user_language"
   ];
 
-  disabledTestPaths = [
-    # Disable enterprise & premium tests
-    # because they require a database.
-    "../enterprise/backend/tests"
-    "../enterprise/backend/src"
-    "../premium/backend/tests"
-    "../premium/backend/src"
-    # Disable database related tests
-    "tests/baserow/contrib/database"
-    "tests/baserow/api"
-    "tests/baserow/core"
-    "tests/baserow/ws"
-    # Requires an installed app or something, investigate later
-    "tests/baserow/contrib/builder/"
-  ];
+  #disabledTestPaths = [
+  #  # Disable enterprise & premium tests
+  #  # because they require a database.
+  #  "../enterprise/backend/tests"
+  #  "../enterprise/backend/src"
+  #  "../premium/backend/tests"
+  #  "../premium/backend/src"
+  #  # Disable database related tests
+  #  "tests/baserow/contrib/database"
+  #  "tests/baserow/api"
+  #  "tests/baserow/core"
+  #  "tests/baserow/ws"
+  #  # Requires an installed app or something, investigate later
+  #  "tests/baserow/contrib/builder/"
+  #];
 
   pythonImportsCheck = [
     "baserow"
diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix
new file mode 100644
index 00000000000000..8b663c7758ea69
--- /dev/null
+++ b/pkgs/development/python-modules/opentelemetry-instrumentation-logging/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  hatchling,
+  opentelemetry-api,
+  opentelemetry-instrumentation,
+  opentelemetry-test-utils,
+}:
+
+buildPythonPackage rec {
+  inherit (opentelemetry-instrumentation) version src;
+  pname = "opentelemetry-instrumentation-logging";
+  pyproject = true;
+
+  sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-logging";
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    opentelemetry-api
+    opentelemetry-instrumentation
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "opentelemetry.instrumentation.logging" ];
+
+  meta = opentelemetry-instrumentation.meta // {
+    homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-logging";
+    description = "Logging instrumentation for OpenTelemetry";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3a7fb14646bbd..17af78dd36188e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9415,6 +9415,8 @@ self: super: with self; {
 
   opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { };
 
+  opentelemetry-instrumentation-logging = callPackage ../development/python-modules/opentelemetry-instrumentation-logging { };
+
   opentelemetry-instrumentation-psycopg2 = callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2 { };
 
   opentelemetry-instrumentation-requests = callPackage ../development/python-modules/opentelemetry-instrumentation-requests { };