colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #293042 from natsukium/opentelemetry/update

Browse Source 
python311Packages.opentelemetry-api: 1.22.0 -> 1.23.0; python311Packages.opentelemetry-instrumentation: 0.43b0 -> 0.44b0
This commit is contained in:
OTABI Tomoya 2024-03-09 11:56:31 +09:00 committed by GitHub
commit 31ee152f26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 143 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/chromadb/default.nix
View File

@ -150,6 +150,8 @@ buildPythonPackage rec {
"chromadb/test/stress/"
];
__darwinAllowLocalNetworking = true;
meta = with lib; {
description = "The AI-native open-source embedding database";
homepage = "https://github.com/chroma-core/chroma";

18
pkgs/development/python-modules/opentelemetry-api/default.nix
View File

@ -14,30 +14,32 @@
let
self = buildPythonPackage rec {
pname = "opentelemetry-api";
version = "1.22.0";
disabled = pythonOlder "3.7";
version = "1.23.0";
pyproject = true;
disabled = pythonOlder "3.8";
# to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-python";
rev = "refs/tags/v${version}";
hash = "sha256-6BmBmooVaH1FOpgXpFlYth0r9XaNtmb9UezeP8hWEok=";
hash = "sha256-Ge/DjVG7ajoS0nJLZxtfn4Mmx0SffAE/91dViA5qWAA=";
};
sourceRoot = "${src.name}/opentelemetry-api";
format = "pyproject";
nativeBuildInputs = [
hatchling
pythonRelaxDepsHook
];
propagatedBuildInputs = [
build-system = [
hatchling
];
dependencies = [
deprecated
importlib-metadata
setuptools
];
pythonRelaxDeps = [

14
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-common/default.nix
View File

@ -2,10 +2,8 @@
, buildPythonPackage
, pythonOlder
, hatchling
, backoff
, opentelemetry-api
, opentelemetry-proto
, opentelemetry-sdk
, opentelemetry-test-utils
, pytestCheckHook
}:
@ -13,19 +11,17 @@
buildPythonPackage {
inherit (opentelemetry-api) version src;
pname = "opentelemetry-exporter-otlp-proto-common";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-common";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
backoff
opentelemetry-sdk
dependencies = [
opentelemetry-proto
];

22
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-grpc/default.nix
View File

@ -1,35 +1,37 @@
{ lib
, buildPythonPackage
, pythonOlder
, backoff
, deprecated
, googleapis-common-protos
, grpcio
, hatchling
, opentelemetry-api
, opentelemetry-test-utils
, opentelemetry-exporter-otlp-proto-common
, pytest-grpc
, opentelemetry-proto
, opentelemetry-test-utils
, pytestCheckHook
}:
buildPythonPackage {
inherit (opentelemetry-api) version src;
pname = "opentelemetry-exporter-otlp-proto-grpc";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-grpc";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
backoff
dependencies = [
deprecated
googleapis-common-protos
grpcio
opentelemetry-api
opentelemetry-exporter-otlp-proto-common
opentelemetry-proto
];
nativeCheckInputs = [
@ -43,6 +45,8 @@ buildPythonPackage {
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ];
__darwinAllowLocalNetworking = true;
meta = opentelemetry-api.meta // {
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc";
description = "OpenTelemetry Collector Protobuf over gRPC Exporter";

19
pkgs/development/python-modules/opentelemetry-exporter-otlp-proto-http/default.nix
View File

@ -1,11 +1,13 @@
{ lib
, buildPythonPackage
, pythonOlder
, backoff
, deprecated
, googleapis-common-protos
, hatchling
, opentelemetry-api
, opentelemetry-exporter-otlp-proto-common
, opentelemetry-proto
, opentelemetry-sdk
, opentelemetry-test-utils
, requests
, responses
@ -15,20 +17,23 @@
buildPythonPackage {
inherit (opentelemetry-api) version src;
pname = "opentelemetry-exporter-otlp-proto-http";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp-proto-http";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
backoff
dependencies = [
deprecated
googleapis-common-protos
opentelemetry-api
opentelemetry-exporter-otlp-proto-common
opentelemetry-proto
opentelemetry-sdk
requests
];

13
pkgs/development/python-modules/opentelemetry-exporter-otlp/default.nix
View File

@ -1,33 +1,34 @@
{ lib
, buildPythonPackage
, pythonOlder
, backoff
, hatchling
, opentelemetry-api
, opentelemetry-exporter-otlp-proto-grpc
, opentelemetry-exporter-otlp-proto-http
, opentelemetry-test-utils
, pytestCheckHook
}:
buildPythonPackage {
inherit (opentelemetry-api) version src;
pname = "opentelemetry-exporter-otlp";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-otlp";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
opentelemetry-exporter-otlp-proto-grpc
opentelemetry-exporter-otlp-proto-http
];
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];

13
pkgs/development/python-modules/opentelemetry-exporter-prometheus/default.nix
View File

@ -10,19 +10,20 @@
}:
buildPythonPackage {
inherit (opentelemetry-api) version src;
inherit (opentelemetry-api) src;
pname = "opentelemetry-exporter-prometheus";
disabled = pythonOlder "3.7";
version = "0.44b0";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/exporter/opentelemetry-exporter-prometheus";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
opentelemetry-api
opentelemetry-sdk
prometheus-client

12
pkgs/development/python-modules/opentelemetry-instrumentation-aiohttp-client/default.nix
View File

@ -15,23 +15,23 @@
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-aiohttp-client";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-aiohttp-client";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
aiohttp
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-semantic-conventions
opentelemetry-util-http
wrapt
aiohttp
];
# missing https://github.com/ezequielramos/http-server-mock

10
pkgs/development/python-modules/opentelemetry-instrumentation-asgi/default.nix
View File

@ -14,17 +14,17 @@
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-asgi";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-asgi";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
asgiref
opentelemetry-instrumentation
opentelemetry-api

19
pkgs/development/python-modules/opentelemetry-instrumentation-django/default.nix
View File

@ -13,33 +13,36 @@
, pytestCheckHook
}:
buildPythonPackage {
buildPythonPackage rec {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-django";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-django";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
django
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-instrumentation-asgi
opentelemetry-instrumentation-wsgi
opentelemetry-semantic-conventions
opentelemetry-util-http
];
passthru.optional-dependencies = {
asgi = [ opentelemetry-instrumentation-asgi ];
};
nativeCheckInputs = [
opentelemetry-test-utils
pytestCheckHook
];
] ++ passthru.optional-dependencies.asgi;
pythonImportsCheck = [ "opentelemetry.instrumentation.django" ];

6
pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix
View File

@ -19,15 +19,15 @@ buildPythonPackage {
pname = "opentelemetry-instrumentation-fastapi";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
fastapi
opentelemetry-api
opentelemetry-instrumentation

12
pkgs/development/python-modules/opentelemetry-instrumentation-flask/default.nix
View File

@ -7,6 +7,7 @@
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, opentelemetry-util-http
, packaging
, pytestCheckHook
, pythonOlder
}:
@ -14,21 +15,22 @@
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-flask";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-flask";
format = "pyproject";
build-system = [ hatchling ];
nativeBuildInputs = [ hatchling ];
propagatedBuildInputs = [
dependencies = [
flask
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-instrumentation-wsgi
opentelemetry-semantic-conventions
opentelemetry-util-http
packaging
];
nativeCheckInputs = [

18
pkgs/development/python-modules/opentelemetry-instrumentation-grpc/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, stdenv
, buildPythonPackage
, pythonOlder
, hatchling
@ -15,17 +16,17 @@
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-grpc";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-grpc";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
opentelemetry-api
opentelemetry-instrumentation
opentelemetry-sdk
@ -43,8 +44,15 @@ buildPythonPackage {
pytestCheckHook
];
disabledTests = lib.optionals stdenv.isDarwin [
# RuntimeError: Failed to bind to address
"TestOpenTelemetryServerInterceptorUnix"
];
pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ];
__darwinAllowLocalNetworking = true;
meta = opentelemetry-instrumentation.meta // {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc";
description = "OpenTelemetry Instrumentation for grpc";

10
pkgs/development/python-modules/opentelemetry-instrumentation-wsgi/default.nix
View File

@ -13,17 +13,17 @@
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-instrumentation-wsgi";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-wsgi";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
opentelemetry-instrumentation
opentelemetry-api
opentelemetry-semantic-conventions

16
pkgs/development/python-modules/opentelemetry-instrumentation/default.nix
View File

@ -4,7 +4,6 @@
, fetchFromGitHub
, hatchling
, opentelemetry-api
, opentelemetry-sdk
, opentelemetry-test-utils
, setuptools
, wrapt
@ -13,28 +12,27 @@
buildPythonPackage rec {
pname = "opentelemetry-instrumentation";
version = "0.43b0";
disabled = pythonOlder "3.7";
version = "0.44b0";
pyproject = true;
disabled = pythonOlder "3.8";
# 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-fUyA3cPXAxO506usEWxOUX9xiapc8Ocnbx73LP6ghRE=";
hash = "sha256-r+k/YdK7YqYme8nKoy3ig3krvZjxYRKgLBkcdEtFy3k=";
};
sourceRoot = "${src.name}/opentelemetry-instrumentation";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
opentelemetry-api
opentelemetry-sdk
setuptools
wrapt
];

10
pkgs/development/python-modules/opentelemetry-proto/default.nix
View File

@ -10,17 +10,17 @@
buildPythonPackage {
inherit (opentelemetry-api) version src;
pname = "opentelemetry-proto";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-proto";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
protobuf
];

11
pkgs/development/python-modules/opentelemetry-sdk/default.nix
View File

@ -15,20 +15,19 @@ let
self = buildPythonPackage {
inherit (opentelemetry-api) version src;
pname = "opentelemetry-sdk";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-sdk";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
opentelemetry-api
opentelemetry-semantic-conventions
setuptools
typing-extensions
];

11
pkgs/development/python-modules/opentelemetry-semantic-conventions/default.nix
View File

@ -7,15 +7,16 @@
}:
buildPythonPackage {
inherit (opentelemetry-api) version src;
inherit (opentelemetry-api) src;
pname = "opentelemetry-semantic-conventions";
disabled = pythonOlder "3.7";
version = "0.44b0";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/opentelemetry-semantic-conventions";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];

14
pkgs/development/python-modules/opentelemetry-test-utils/default.nix
View File

@ -1,5 +1,4 @@
{ lib
, callPackage
, buildPythonPackage
, pythonOlder
, asgiref
@ -9,19 +8,20 @@
}:
buildPythonPackage {
inherit (opentelemetry-api) version src;
inherit (opentelemetry-api) src;
pname = "opentelemetry-test-utils";
disabled = pythonOlder "3.7";
version = "0.44b0";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-api.src.name}/tests/opentelemetry-test-utils";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
dependencies = [
asgiref
opentelemetry-api
opentelemetry-sdk

19
pkgs/development/python-modules/opentelemetry-util-http/default.nix
View File

@ -3,8 +3,6 @@
, pythonOlder
, hatchling
, opentelemetry-instrumentation
, opentelemetry-sdk
, opentelemetry-semantic-conventions
, opentelemetry-test-utils
, pytestCheckHook
}:
@ -12,23 +10,18 @@
buildPythonPackage {
inherit (opentelemetry-instrumentation) version src;
pname = "opentelemetry-util-http";
disabled = pythonOlder "3.7";
pyproject = true;
disabled = pythonOlder "3.8";
sourceRoot = "${opentelemetry-instrumentation.src.name}/util/opentelemetry-util-http";
format = "pyproject";
nativeBuildInputs = [
build-system = [
hatchling
];
propagatedBuildInputs = [
opentelemetry-instrumentation
opentelemetry-sdk
opentelemetry-semantic-conventions
];
nativeCheckInputs = [
opentelemetry-instrumentation
opentelemetry-test-utils
pytestCheckHook
];
@ -41,6 +34,8 @@ buildPythonPackage {
pythonImportsCheck = [ "opentelemetry.util.http" ];
__darwinAllowLocalNetworking = true;
meta = opentelemetry-instrumentation.meta // {
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http";
description = "Web util for OpenTelemetry";