Merge pull request #305470 from natsukium/opentelemetry/update

python311Packages.opentelemetry-api: 1.23.0 -> 1.24.0; python311Packages: opentelemetry-instrumentation: 0.44b0 -> 0.45b0
This commit is contained in:
OTABI Tomoya 2024-04-28 11:03:39 +09:00 committed by GitHub
commit c1f257b0fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 6 deletions

View file

@ -9,12 +9,13 @@
, setuptools , setuptools
, pytestCheckHook , pytestCheckHook
, pythonRelaxDepsHook , pythonRelaxDepsHook
, writeScript
}: }:
let let
self = buildPythonPackage rec { self = buildPythonPackage rec {
pname = "opentelemetry-api"; pname = "opentelemetry-api";
version = "1.23.0"; version = "1.24.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,7 +25,7 @@ let
owner = "open-telemetry"; owner = "open-telemetry";
repo = "opentelemetry-python"; repo = "opentelemetry-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA="; hash = "sha256-id5cwNl2idgZa1AFfolzEo5vzspv3V2c1Vtzg3EWDZs=";
}; };
sourceRoot = "${src.name}/opentelemetry-api"; sourceRoot = "${src.name}/opentelemetry-api";
@ -55,8 +56,18 @@ let
doCheck = false; doCheck = false;
# Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils. passthru = {
passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; }; updateScript = writeScript "update.sh" ''
#!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix-update
set -eu -o pipefail
nix-update --version-regex 'v(.*)' python3Packages.opentelemetry-api
nix-update python3Packages.opentelemetry-instrumentation
'';
# Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.
tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
};
meta = with lib; { meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api"; homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api";

View file

@ -12,7 +12,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "opentelemetry-instrumentation"; pname = "opentelemetry-instrumentation";
version = "0.44b0"; version = "0.45b0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "open-telemetry"; owner = "open-telemetry";
repo = "opentelemetry-python-contrib"; repo = "opentelemetry-python-contrib";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k="; hash = "sha256-snpanTREdvfqpqPI8UWzm55pDK8Q77guqgT8kFULRKU=";
}; };
sourceRoot = "${src.name}/opentelemetry-instrumentation"; sourceRoot = "${src.name}/opentelemetry-instrumentation";
@ -44,6 +44,8 @@ buildPythonPackage rec {
pythonImportsCheck = [ "opentelemetry.instrumentation" ]; pythonImportsCheck = [ "opentelemetry.instrumentation" ];
passthru.updateScript = opentelemetry-api.updateScript;
meta = with lib; { meta = with lib; {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python";