From 0ac40a06c50bfafbd46a627367425fd631584473 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 19:06:45 +0900 Subject: [PATCH 1/4] python312Packages.opentelemetry-api: 1.25.0 -> 1.26.0 Changelog: https://github.com/open-telemetry/opentelemetry-python/releases/tag/refs/tags/v1.26.0 --- pkgs/development/python-modules/opentelemetry-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-api/default.nix b/pkgs/development/python-modules/opentelemetry-api/default.nix index 8fde20af6cbf..d81a0ed09812 100644 --- a/pkgs/development/python-modules/opentelemetry-api/default.nix +++ b/pkgs/development/python-modules/opentelemetry-api/default.nix @@ -15,7 +15,7 @@ let self = buildPythonPackage rec { pname = "opentelemetry-api"; - version = "1.25.0"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ let owner = "open-telemetry"; repo = "opentelemetry-python"; rev = "refs/tags/v${version}"; - hash = "sha256-9mxgPYliGkNsZGOhF9YCmxZjP3hc2UUmxSpWY4IMLCo="; + hash = "sha256-slb1ZKGnfJRZiBh++S20en7U6RckspHHuMohHOz2Hts="; }; sourceRoot = "${src.name}/opentelemetry-api"; From 38047274fc3bab187a8ea1988e4b929d6cebb934 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 19:07:34 +0900 Subject: [PATCH 2/4] python312Packages.opentelemetry-instrumentation: 0.46b0 -> 0.47b0 Changelog: https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.47b0 --- .../python-modules/opentelemetry-instrumentation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 1939a63fa6a1..bdf9720c6c38 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "opentelemetry-instrumentation"; - version = "0.46b0"; + version = "0.47b0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-BC/RJL4GgC3vGe4bC9mavPNpE+j8ZIkOKCbK4I4LuGQ="; + hash = "sha256-XtJ4u891vI7wDtReoucm+qk3BkKJ+aZrYy7zfxmqfgk="; }; sourceRoot = "${src.name}/opentelemetry-instrumentation"; From 1a31cc7bf3aac59310a9daed64422ca5f2b15f95 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 20:10:49 +0900 Subject: [PATCH 3/4] python312Packages.opentelemetry-exporter-otlp-proto-grpc: fix tests --- .../opentelemetry-exporter-otlp-proto-grpc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix index 2e55477ffc0a..3ddd107770b0 100644 --- a/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { pytestCheckHook ]; - disabledTestPaths = [ "tests/performance/benchmarks/" ]; + pytestFlagsArray = [ "tests" ]; pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ]; From d3c042f02c58288035ffec7d6d712089e9468f9d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 27 Jul 2024 22:32:54 +0900 Subject: [PATCH 4/4] python312Packages.opentelemetry-instrumentation-grpc: mark as broken --- .../opentelemetry-instrumentation-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index 1d400f8e53b0..6dc01accb96d 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -6,7 +6,6 @@ hatchling, opentelemetry-api, opentelemetry-instrumentation, - opentelemetry-sdk, opentelemetry-semantic-conventions, opentelemetry-test-utils, wrapt, @@ -28,7 +27,6 @@ buildPythonPackage { dependencies = [ opentelemetry-api opentelemetry-instrumentation - opentelemetry-sdk opentelemetry-semantic-conventions wrapt ]; @@ -55,5 +53,7 @@ buildPythonPackage { meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; description = "OpenTelemetry Instrumentation for grpc"; + # https://github.com/open-telemetry/opentelemetry-python-contrib/issues/2483 + broken = lib.versionAtLeast grpcio.version "1.63"; }; }