diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix index 379b5a608ae..de0823c0aac 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -12,21 +11,13 @@ , pytestCheckHook , aiohttp }: -let - pname = "opentelemetry-instrumentation-aiohttp-client"; - version = "0.39b0"; -in + buildPythonPackage { - inherit pname version; + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-aiohttp-client"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-HFDebR3d1osFAIlNuIbs5s+uPeTTJ1xkz+BpE5BpciU="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client"; format = "pyproject"; @@ -54,10 +45,8 @@ buildPythonPackage { pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-aiohttp-client"; description = "OpenTelemetry Instrumentation for aiohttp-client"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix index 3fb18175ab2..5777498873b 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , asgiref , hatchling , opentelemetry-api @@ -12,18 +11,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-asgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-BfNrbOQwyApdcKOVGF0LqzWOxzLkHZYiYdYVVPkGmdQ="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi"; format = "pyproject"; @@ -46,10 +39,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi"; description = "ASGI instrumentation for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix index 2d8536a9037..ec19eacf0e3 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , django , hatchling , opentelemetry-api @@ -14,18 +13,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-django"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-5tyLFQTYuJBFAFZirqsaHXCw72Q3TigDctZZFi/2zdI="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django"; format = "pyproject"; @@ -50,10 +43,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.django" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django"; description = "OpenTelemetry Instrumentation for Django"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix index abeed7f0588..8313faa8d6d 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -13,18 +12,12 @@ , grpcio }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-grpc"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-DkDAE0MsF9HdywxlFzqJaqNor4O/jpnSqINsKTuiVqU="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc"; format = "pyproject"; @@ -52,10 +45,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc"; description = "OpenTelemetry Instrumentation for grpc"; - license = licenses.asl20; - maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix index b50674ea1b6..408cfb69232 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-api , opentelemetry-instrumentation @@ -11,18 +10,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-instrumentation-wsgi"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-DBZGXY8Y208YC/guk0qUB04UA/JFAtiv3kjsikskTRs="; - sparseCheckout = [ "/instrumentation/${pname}" ]; - } + "/instrumentation/${pname}"; + sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi"; format = "pyproject"; @@ -44,10 +37,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.instrumentation.wsgi" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-wsgi"; description = "WSGI Middleware for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; } diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix index 140ca386554..c47b211a139 100644 --- a/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix +++ b/pkgs/development/python-modules/opentelemetry-instrumentation/default.nix @@ -16,13 +16,15 @@ buildPythonPackage rec { version = "0.39b0"; disabled = pythonOlder "3.7"; + # to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-python-contrib"; rev = "refs/tags/v${version}"; - hash = "sha256-+zk76A640nyd1L0I55JrMMs7EnQ+SPQdYGAFIyQFc6E="; - sparseCheckout = [ "/${pname}" ]; - } + "/${pname}"; + hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc="; + }; + + sourceRoot = "source/opentelemetry-instrumentation"; format = "pyproject"; @@ -47,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation"; description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python"; + changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = teams.deshaw.members; }; diff --git a/pkgs/development/python-modules/opentelemetry-util-http/default.nix b/pkgs/development/python-modules/opentelemetry-util-http/default.nix index ddd25dccb78..49ec52a380b 100644 --- a/pkgs/development/python-modules/opentelemetry-util-http/default.nix +++ b/pkgs/development/python-modules/opentelemetry-util-http/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , pythonOlder -, fetchFromGitHub , hatchling , opentelemetry-instrumentation , opentelemetry-sdk @@ -10,18 +9,12 @@ , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; pname = "opentelemetry-util-http"; - version = "0.39b0"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "open-telemetry"; - repo = "opentelemetry-python-contrib"; - rev = "refs/tags/v${version}"; - hash = "sha256-C20/M5wimQec/8tTKx7+jkIYgfgNPtU9lkPKliIM3Uk="; - sparseCheckout = [ "/util/${pname}" ]; - } + "/util/${pname}"; + sourceRoot = "source/util/opentelemetry-util-http"; format = "pyproject"; @@ -42,10 +35,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "opentelemetry.util.http" ]; - meta = with lib; { + meta = opentelemetry-instrumentation.meta // { homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http"; description = "Web util for OpenTelemetry"; - license = licenses.asl20; - maintainers = teams.deshaw.members; }; }