From c564659b24058a6683ac7143026550e8ca1d24d3 Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Sun, 29 Aug 2021 04:02:00 +0530 Subject: [PATCH] Upgraded to Otel 1.5.0 (#116) - Dropped SPLUNK_MAX_ATTR_LENGTH env var (was undocumented). - Dropped SPLUNK_SERVICE_NAME env var. --- CHANGELOG.md | 15 ++ poetry.lock | 263 ++++++++++++++++----------- pyproject.toml | 13 +- scripts/create_gh_release.py | 2 +- scripts/prepare_release.py | 4 +- splunk_otel/cmd/trace.py | 2 +- splunk_otel/environment_variables.py | 6 +- splunk_otel/options.py | 73 +++----- splunk_otel/symbols.py | 2 +- splunk_otel/tracing.py | 2 - tests/unit/test_options.py | 17 +- tests/unit/test_otel_defaults.py | 8 + 12 files changed, 217 insertions(+), 190 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a445327e..0a10131e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,18 +1,33 @@ # Changelog ## [Unreleased] +### Changed + +- Upgraded Otel dependencies to 1.5.0 and 0.24.0b0 + +### Removed + +- SPLUNK_SERVICE_NAME and SPLUNK_MAX_ATTR_LENGTH env vars were removed. + Use `OTEL_SERVICE_NAME` and `OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT` instead. + [#116](https://github.com/signalfx/splunk-otel-python/pull/116) ## [0.16.0] - 2021-08-04 +### Changed + - Upgraded Otel dependencies to 1.4.1 and 0.23.0b2 ## [1.0.0rc3] - 2021-06-08 +### Changed + - Pin exact Otel deps until 1.0 [#88](https://github.com/signalfx/splunk-otel-python/pull/88) ## [1.0.0-rc2] - 2021-06-03 +### Changed + - Upgrade OpenTelemetry Python to 1.3.0 and 0.22b0 [#85](https://github.com/signalfx/splunk-otel-python/pull/85) diff --git a/poetry.lock b/poetry.lock index a9efcf02..35f25874 100644 --- a/poetry.lock +++ b/poetry.lock @@ -19,7 +19,7 @@ python-versions = "*" [[package]] name = "astroid" -version = "2.6.6" +version = "2.7.2" description = "An abstract syntax tree for Python with inference support." category = "dev" optional = false @@ -182,7 +182,7 @@ toml = ["toml"] [[package]] name = "cryptography" -version = "3.4.7" +version = "3.4.8" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "dev" optional = false @@ -357,18 +357,21 @@ python-versions = ">=3.5" [[package]] name = "immutables" -version = "0.15" +version = "0.16" description = "Immutable Collections" category = "main" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6" + +[package.dependencies] +typing-extensions = {version = ">=3.7.4.3", markers = "python_version < \"3.8\""} [package.extras] -test = ["flake8 (>=3.8.4,<3.9.0)", "pycodestyle (>=2.6.0,<2.7.0)"] +test = ["flake8 (>=3.8.4,<3.9.0)", "pycodestyle (>=2.6.0,<2.7.0)", "mypy (>=0.910)", "pytest (>=6.2.4,<6.3.0)"] [[package]] name = "importlib-metadata" -version = "4.6.3" +version = "4.7.0" description = "Read metadata from Python packages" category = "dev" optional = false @@ -485,7 +488,7 @@ python-versions = "*" [[package]] name = "opentelemetry-api" -version = "1.4.1" +version = "1.5.0" description = "OpenTelemetry Python API" category = "main" optional = false @@ -497,7 +500,7 @@ Deprecated = ">=1.2.6" [[package]] name = "opentelemetry-exporter-jaeger-thrift" -version = "1.4.1" +version = "1.5.0" description = "Jaeger Thrift Exporter for OpenTelemetry" category = "main" optional = true @@ -510,7 +513,7 @@ thrift = ">=0.10.0" [[package]] name = "opentelemetry-exporter-otlp-proto-grpc" -version = "1.4.1" +version = "1.5.0" description = "OpenTelemetry Collector Protobuf over gRPC Exporter" category = "main" optional = true @@ -521,7 +524,7 @@ backoff = ">=1.10.0,<1.11.0" googleapis-common-protos = ">=1.52,<2.0" grpcio = ">=1.0.0,<2.0.0" opentelemetry-api = ">=1.3,<2.0" -opentelemetry-proto = "1.4.1" +opentelemetry-proto = "1.5.0" opentelemetry-sdk = ">=1.3,<2.0" [package.extras] @@ -529,19 +532,19 @@ test = ["pytest-grpc"] [[package]] name = "opentelemetry-instrumentation" -version = "0.23b2" +version = "0.24b0" description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python" category = "main" optional = false python-versions = ">=3.6" [package.dependencies] -opentelemetry-api = "1.4.1" +opentelemetry-api = ">=1.4,<2.0" wrapt = ">=1.0.0,<2.0.0" [[package]] name = "opentelemetry-propagator-b3" -version = "1.4.1" +version = "1.5.0" description = "OpenTelemetry B3 Propagator" category = "main" optional = true @@ -553,7 +556,7 @@ opentelemetry-api = ">=1.3,<2.0" [[package]] name = "opentelemetry-proto" -version = "1.4.1" +version = "1.5.0" description = "OpenTelemetry Python Proto" category = "main" optional = true @@ -564,20 +567,20 @@ protobuf = ">=3.13.0" [[package]] name = "opentelemetry-sdk" -version = "1.4.1" +version = "1.5.0" description = "OpenTelemetry Python SDK" category = "main" optional = false python-versions = ">=3.6" [package.dependencies] -opentelemetry-api = "1.4.1" -opentelemetry-instrumentation = "0.23b2" -opentelemetry-semantic-conventions = "0.23b2" +opentelemetry-api = "1.5.0" +opentelemetry-instrumentation = "0.24b0" +opentelemetry-semantic-conventions = "0.24b0" [[package]] name = "opentelemetry-semantic-conventions" -version = "0.23b2" +version = "0.24b0" description = "OpenTelemetry Semantic Conventions" category = "main" optional = false @@ -621,6 +624,18 @@ category = "dev" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" +[[package]] +name = "platformdirs" +version = "2.2.0" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.extras] +docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"] +test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"] + [[package]] name = "pluggy" version = "0.13.1" @@ -680,17 +695,18 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] name = "pylint" -version = "2.9.6" +version = "2.10.2" description = "python code static checker" category = "dev" optional = false python-versions = "~=3.6" [package.dependencies] -astroid = ">=2.6.5,<2.7" +astroid = ">=2.7.2,<2.8" colorama = {version = "*", markers = "sys_platform == \"win32\""} isort = ">=4.2.5,<6" mccabe = ">=0.6,<0.7" +platformdirs = ">=2.2.0" toml = ">=0.7.1" [[package]] @@ -816,7 +832,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" [[package]] name = "regex" -version = "2021.8.3" +version = "2021.8.21" description = "Alternative regular expression module, to replace re." category = "dev" optional = false @@ -901,7 +917,7 @@ python-versions = "*" [[package]] name = "types-setuptools" -version = "57.0.0" +version = "57.0.2" description = "Typing stubs for setuptools" category = "dev" optional = false @@ -911,7 +927,7 @@ python-versions = "*" name = "typing-extensions" version = "3.10.0.0" description = "Backported and Experimental Type Hints for Python 3.5+" -category = "dev" +category = "main" optional = false python-versions = "*" @@ -968,7 +984,7 @@ otlp = ["opentelemetry-exporter-otlp-proto-grpc"] [metadata] lock-version = "1.1" python-versions = "^3.6" -content-hash = "5e009c66039761faf098e17a34c368706b53b7b63204b91c3a85960209305744" +content-hash = "cc14fa02ec21dd2c9f5ecbd2da130dffc98490c161f3f48bf9b9e2d9eed9f323" [metadata.files] aiocontextvars = [ @@ -980,8 +996,8 @@ appdirs = [ {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, ] astroid = [ - {file = "astroid-2.6.6-py3-none-any.whl", hash = "sha256:ab7f36e8a78b8e54a62028ba6beef7561db4cdb6f2a5009ecc44a6f42b5697ef"}, - {file = "astroid-2.6.6.tar.gz", hash = "sha256:3975a0bd5373bdce166e60c851cfcbaf21ee96de80ec518c1f4cb3e94c3fb334"}, + {file = "astroid-2.7.2-py3-none-any.whl", hash = "sha256:ecc50f9b3803ebf8ea19aa2c6df5622d8a5c31456a53c741d3be044d96ff0948"}, + {file = "astroid-2.7.2.tar.gz", hash = "sha256:b6c2d75cd7c2982d09e7d41d70213e863b3ba34d3bd4014e08f167cee966e99e"}, ] atomicwrites = [ {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, @@ -1132,18 +1148,23 @@ coverage = [ {file = "coverage-5.5.tar.gz", hash = "sha256:ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"}, ] cryptography = [ - {file = "cryptography-3.4.7-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3d8427734c781ea5f1b41d6589c293089704d4759e34597dce91014ac125aad1"}, - {file = "cryptography-3.4.7-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:8e56e16617872b0957d1c9742a3f94b43533447fd78321514abbe7db216aa250"}, - {file = "cryptography-3.4.7-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:37340614f8a5d2fb9aeea67fd159bfe4f5f4ed535b1090ce8ec428b2f15a11f2"}, - {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6"}, - {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959"}, - {file = "cryptography-3.4.7-cp36-abi3-win32.whl", hash = "sha256:0f1212a66329c80d68aeeb39b8a16d54ef57071bf22ff4e521657b27372e327d"}, - {file = "cryptography-3.4.7-cp36-abi3-win_amd64.whl", hash = "sha256:de4e5f7f68220d92b7637fc99847475b59154b7a1b3868fb7385337af54ac9ca"}, - {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:26965837447f9c82f1855e0bc8bc4fb910240b6e0d16a664bb722df3b5b06873"}, - {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:eb8cc2afe8b05acbd84a43905832ec78e7b3873fb124ca190f574dca7389a87d"}, - {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ec5d3b029f5fa2b179325908b9cd93db28ab7b85bb6c1db56b10e0b54235177"}, - {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:ee77aa129f481be46f8d92a1a7db57269a2f23052d5f2433b4621bb457081cc9"}, - {file = "cryptography-3.4.7.tar.gz", hash = "sha256:3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, + {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, + {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, ] dataclasses = [ {file = "dataclasses-0.8-py3-none-any.whl", hash = "sha256:0201d89fa866f68c8ebd9d08ee6ff50c0b255f8ec63a71c16fda7af82bb887bf"}, @@ -1241,25 +1262,37 @@ idna = [ {file = "idna-3.2.tar.gz", hash = "sha256:467fbad99067910785144ce333826c71fb0e63a425657295239737f7ecd125f3"}, ] immutables = [ - {file = "immutables-0.15-cp35-cp35m-macosx_10_14_x86_64.whl", hash = "sha256:6728f4392e3e8e64b593a5a0cd910a1278f07f879795517e09f308daed138631"}, - {file = "immutables-0.15-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:f0836cd3bdc37c8a77b192bbe5f41dbcc3ce654db048ebbba89bdfe6db7a1c7a"}, - {file = "immutables-0.15-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:8703d8abfd8687932f2a05f38e7de270c3a6ca3bd1c1efb3c938656b3f2f985a"}, - {file = "immutables-0.15-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:b8ad986f9b532c026f19585289384b0769188fcb68b37c7f0bd0df9092a6ca54"}, - {file = "immutables-0.15-cp36-cp36m-win_amd64.whl", hash = "sha256:6f117d9206165b9dab8fd81c5129db757d1a044953f438654236ed9a7a4224ae"}, - {file = "immutables-0.15-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:b75ade826920c4e490b1bb14cf967ac14e61eb7c5562161c5d7337d61962c226"}, - {file = "immutables-0.15-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:b7e13c061785e34f73c4f659861f1b3e4a5fd918e4395c84b21c4e3d449ebe27"}, - {file = "immutables-0.15-cp37-cp37m-win_amd64.whl", hash = "sha256:3035849accee4f4e510ed7c94366a40e0f5fef9069fbe04a35f4787b13610a4a"}, - {file = "immutables-0.15-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:b04fa69174e0c8f815f9c55f2a43fc9e5a68452fab459a08e904a74e8471639f"}, - {file = "immutables-0.15-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:141c2e9ea515a3a815007a429f0b47a578ebeb42c831edaec882a245a35fffca"}, - {file = "immutables-0.15-cp38-cp38-win_amd64.whl", hash = "sha256:cbe8c64640637faa5535d539421b293327f119c31507c33ca880bd4f16035eb6"}, - {file = "immutables-0.15-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:a0a4e4417d5ef4812d7f99470cd39347b58cb927365dd2b8da9161040d260db0"}, - {file = "immutables-0.15-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:3b15c08c71c59e5b7c2470ef949d49ff9f4263bb77f488422eaa157da84d6999"}, - {file = "immutables-0.15-cp39-cp39-win_amd64.whl", hash = "sha256:2283a93c151566e6830aee0e5bee55fc273455503b43aa004356b50f9182092b"}, - {file = "immutables-0.15.tar.gz", hash = "sha256:3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b"}, + {file = "immutables-0.16-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:acbfa79d44228d96296279068441f980dc63dbed52522d9227ff9f4d96c6627e"}, + {file = "immutables-0.16-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c9ed003eacb92e630ef200e31f47236c2139b39476894f7963b32bd39bafa3"}, + {file = "immutables-0.16-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0a396314b9024fa55bf83a27813fd76cf9f27dce51f53b0f19b51de035146251"}, + {file = "immutables-0.16-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4a2a71678348fb95b13ca108d447f559a754c41b47bd1e7e4fb23974e735682d"}, + {file = "immutables-0.16-cp36-cp36m-win32.whl", hash = "sha256:064001638ab5d36f6aa05b6101446f4a5793fb71e522bc81b8fc65a1894266ff"}, + {file = "immutables-0.16-cp36-cp36m-win_amd64.whl", hash = "sha256:1de393f1b188740ca7b38f946f2bbc7edf3910d2048f03bbb8d01f17a038d67c"}, + {file = "immutables-0.16-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcf678a3074613119385a02a07c469ec5130559f5ea843c85a0840c80b5b71c6"}, + {file = "immutables-0.16-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a307eb0984eb43e815dcacea3ac50c11d00a936ecf694c46991cd5a23bcb0ec0"}, + {file = "immutables-0.16-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7a58825ff2254e2612c5a932174398a4ea8fbddd8a64a02c880cc32ee28b8820"}, + {file = "immutables-0.16-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:798b095381eb42cf40db6876339e7bed84093e5868018a9e73d8e1f7ab4bb21e"}, + {file = "immutables-0.16-cp37-cp37m-win32.whl", hash = "sha256:19bdede174847c2ef1292df0f23868ab3918b560febb09fcac6eec621bd4812b"}, + {file = "immutables-0.16-cp37-cp37m-win_amd64.whl", hash = "sha256:9ccf4c0e3e2e3237012b516c74c49de8872ccdf9129739f7a0b9d7444a8c4862"}, + {file = "immutables-0.16-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:d59beef203a3765db72b1d0943547425c8318ecf7d64c451fd1e130b653c2fbb"}, + {file = "immutables-0.16-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0020aaa4010b136056c20a46ce53204e1407a9e4464246cb2cf95b90808d9161"}, + {file = "immutables-0.16-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edd9f67671555af1eb99ad3c7550238487dd7ac0ac5205b40204ed61c9a922ac"}, + {file = "immutables-0.16-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:298a301f85f307b4c056a0825eb30f060e64d73605e783289f3df37dd762bab8"}, + {file = "immutables-0.16-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b779617f5b94486bfd0f22162cd72eb5f2beb0214a14b75fdafb7b2c908ed0cb"}, + {file = "immutables-0.16-cp38-cp38-win32.whl", hash = "sha256:511c93d8b1bbbf103ff3f1f120c5a68a9866ce03dea6ac406537f93ca9b19139"}, + {file = "immutables-0.16-cp38-cp38-win_amd64.whl", hash = "sha256:b651b61c1af6cda2ee201450f2ffe048a5959bc88e43e6c312f4c93e69c9e929"}, + {file = "immutables-0.16-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:aa7bf572ae1e006104c584be70dc634849cf0dc62f42f4ee194774f97e7fd17d"}, + {file = "immutables-0.16-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:50793a44ba0d228ed8cad4d0925e00dfd62ea32f44ddee8854f8066447272d05"}, + {file = "immutables-0.16-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:799621dcdcdcbb2516546a40123b87bf88de75fe7459f7bd8144f079ace6ec3e"}, + {file = "immutables-0.16-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7bcf52aeb983bd803b7c6106eae1b2d9a0c7ab1241bc6b45e2174ba2b7283031"}, + {file = "immutables-0.16-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:734c269e82e5f307fb6e17945953b67659d1731e65309787b8f7ba267d1468f2"}, + {file = "immutables-0.16-cp39-cp39-win32.whl", hash = "sha256:a454d5d3fee4b7cc627345791eb2ca4b27fa3bbb062ccf362ecaaa51679a07ed"}, + {file = "immutables-0.16-cp39-cp39-win_amd64.whl", hash = "sha256:2505d93395d3f8ae4223e21465994c3bc6952015a38dc4f03cb3e07a2b8d8325"}, + {file = "immutables-0.16.tar.gz", hash = "sha256:d67e86859598eed0d926562da33325dac7767b7b1eff84e232c22abea19f4360"}, ] importlib-metadata = [ - {file = "importlib_metadata-4.6.3-py3-none-any.whl", hash = "sha256:51c6635429c77cf1ae634c997ff9e53ca3438b495f10a55ba28594dd69764a8b"}, - {file = "importlib_metadata-4.6.3.tar.gz", hash = "sha256:0645585859e9a6689c523927a5032f2ba5919f1f7d0e84bd4533312320de1ff9"}, + {file = "importlib_metadata-4.7.0-py3-none-any.whl", hash = "sha256:a69df6d94f8ac09cd46fdf79a955c153164b312442f7594a3eeeec46f230fe2b"}, + {file = "importlib_metadata-4.7.0.tar.gz", hash = "sha256:1be82867064622fe56c7046bb5280063949f56c0abcdfc3cd33875efd4fc5498"}, ] iniconfig = [ {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, @@ -1338,36 +1371,36 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] opentelemetry-api = [ - {file = "opentelemetry-api-1.4.1.tar.gz", hash = "sha256:4043fe4d2e4368e1d4bb91142fad83f6621127066e2c788a2a2e953c09d3ed09"}, - {file = "opentelemetry_api-1.4.1-py3-none-any.whl", hash = "sha256:1da19082c05f30c362012e71d494e2a3c6be36d5a6340af12fe2273647681855"}, + {file = "opentelemetry-api-1.5.0.tar.gz", hash = "sha256:ce439a940c37f9e8aa7c65b35c56a94e728a9e46b3df60caa0fb656a05bd4285"}, + {file = "opentelemetry_api-1.5.0-py3-none-any.whl", hash = "sha256:19055f258459c0d2a4fe14ff00ba7e17044bec2ea80af4347cc724301ebb3cda"}, ] opentelemetry-exporter-jaeger-thrift = [ - {file = "opentelemetry-exporter-jaeger-thrift-1.4.1.tar.gz", hash = "sha256:ee821445a8dc85c07f0739a4f6e4f63f44fb3d06c9df3dc362f84ffda30df350"}, - {file = "opentelemetry_exporter_jaeger_thrift-1.4.1-py3-none-any.whl", hash = "sha256:b4e43c9381f6c45cb3fb7459935a014e9e3e5f7ebadad6748c8e024554fd4239"}, + {file = "opentelemetry-exporter-jaeger-thrift-1.5.0.tar.gz", hash = "sha256:169da4f7ce5fdccc8fb7bbac86e1bfd7ce9f3327a64e73d70c0971cf0d39e586"}, + {file = "opentelemetry_exporter_jaeger_thrift-1.5.0-py3-none-any.whl", hash = "sha256:0368b6e4e205b63df0a18064c51bf84e1576ae1e5f7da55335f841d6f3fbf858"}, ] opentelemetry-exporter-otlp-proto-grpc = [ - {file = "opentelemetry-exporter-otlp-proto-grpc-1.4.1.tar.gz", hash = "sha256:b35f5912035972e22430d711a95c5a2431e0af48afcc3eb1be02a0145c0df22f"}, - {file = "opentelemetry_exporter_otlp_proto_grpc-1.4.1-py3-none-any.whl", hash = "sha256:0eb9fad0dbcdfdd89a50a3398b87be6c08594968fd33efb05d3935941a63a66f"}, + {file = "opentelemetry-exporter-otlp-proto-grpc-1.5.0.tar.gz", hash = "sha256:bcf8657ac87e27f87bc0bf7d41b35e5063aeb16d39e4f89980c8dec8c3be703f"}, + {file = "opentelemetry_exporter_otlp_proto_grpc-1.5.0-py3-none-any.whl", hash = "sha256:ff61cc53dc87b980ab1ebcea63708ea9cb865b8028295320c98b9d6e50861ce6"}, ] opentelemetry-instrumentation = [ - {file = "opentelemetry-instrumentation-0.23b2.tar.gz", hash = "sha256:03f47469f47970e96d69ae65a231c3e3510b160ac19c90b09ab33893876e2b89"}, - {file = "opentelemetry_instrumentation-0.23b2-py3-none-any.whl", hash = "sha256:71878bf774fb4c501d994a9389f5de75915fd2450e4cc4a9898c1b1faf3690ac"}, + {file = "opentelemetry-instrumentation-0.24b0.tar.gz", hash = "sha256:91c50b3e81c6f5e64a06f55ae95b1b901cd58556d50cf378e401b4a647737a57"}, + {file = "opentelemetry_instrumentation-0.24b0-py3-none-any.whl", hash = "sha256:adbda25d66e9a8dfa506324a4089c34524dc54d3ee279c3d20cb0e315418f7f9"}, ] opentelemetry-propagator-b3 = [ - {file = "opentelemetry-propagator-b3-1.4.1.tar.gz", hash = "sha256:b9568b23164e3fcdfe981c542e51beb83c8c08631ec59d7ff9cc2d693935baff"}, - {file = "opentelemetry_propagator_b3-1.4.1-py3-none-any.whl", hash = "sha256:14aebdca0919ef325eef86efa0cf38097724730faf765596ac037ead69571867"}, + {file = "opentelemetry-propagator-b3-1.5.0.tar.gz", hash = "sha256:4f1924e3f429e569ae13894272e100d12f4f697960c80fa54491dce2bc5072a8"}, + {file = "opentelemetry_propagator_b3-1.5.0-py3-none-any.whl", hash = "sha256:0e1fbfd10d6f2600140ee015bfd5608f7564ad43667e1a611800a4e7427a97d2"}, ] opentelemetry-proto = [ - {file = "opentelemetry-proto-1.4.1.tar.gz", hash = "sha256:306320d6a7dc79c33b1c749ed35c681920015e821ff5837626dcab01720bab33"}, - {file = "opentelemetry_proto-1.4.1-py3-none-any.whl", hash = "sha256:e655bfbd9573e9648d93b189a655589813f371e211f020142d8867e47c69fd91"}, + {file = "opentelemetry-proto-1.5.0.tar.gz", hash = "sha256:a0bbaefa09c839858cf15f3bd41ede7e8faf13f8039beb2301a03d1dd3647464"}, + {file = "opentelemetry_proto-1.5.0-py3-none-any.whl", hash = "sha256:c9c12415a112b035c3d801893bc9819427d9d12f2fdc6c79d1c5f2205808b2cf"}, ] opentelemetry-sdk = [ - {file = "opentelemetry-sdk-1.4.1.tar.gz", hash = "sha256:ef0d6fe69c0e6dffe24114af5dc87f8155347a59e8feba6da81cf96837623b6a"}, - {file = "opentelemetry_sdk-1.4.1-py3-none-any.whl", hash = "sha256:17f3dd6b7dc9015d7ef59f00ad20d78b500d64ae047c11c33fac23359a4a9af9"}, + {file = "opentelemetry-sdk-1.5.0.tar.gz", hash = "sha256:1bb82b3d15c13057f9cfa5524e81e8c2afed74281a911b5063048a8837452ccb"}, + {file = "opentelemetry_sdk-1.5.0-py3-none-any.whl", hash = "sha256:5ce5a6bf2b14f20e703024546114b63eb15209dc28327556ccb6645b24495f96"}, ] opentelemetry-semantic-conventions = [ - {file = "opentelemetry-semantic-conventions-0.23b2.tar.gz", hash = "sha256:f3f1a26afde671e0a80a9bb6e6f2826a034105482e8465497ab798fc72547b5c"}, - {file = "opentelemetry_semantic_conventions-0.23b2-py3-none-any.whl", hash = "sha256:76e65b9b7ec20894fed84c49b40bf1f9a26c7d605c44481ead503dc91876ae94"}, + {file = "opentelemetry-semantic-conventions-0.24b0.tar.gz", hash = "sha256:636e3f241ec0623c37147b4cfd2e34e2fdb57b791ff268f76400de4bfd10e667"}, + {file = "opentelemetry_semantic_conventions-0.24b0-py3-none-any.whl", hash = "sha256:c35d24342e61fa014126a471fd2efdadc28f917ce828cf12ee85e950e16071d9"}, ] packaging = [ {file = "packaging-21.0-py3-none-any.whl", hash = "sha256:c86254f9220d55e31cc94d69bade760f0847da8000def4dfe1c6b872fd14ff14"}, @@ -1381,6 +1414,10 @@ pathspec = [ {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"}, {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"}, ] +platformdirs = [ + {file = "platformdirs-2.2.0-py3-none-any.whl", hash = "sha256:4666d822218db6a262bdfdc9c39d21f23b4cfdb08af331a81e92751daf6c866c"}, + {file = "platformdirs-2.2.0.tar.gz", hash = "sha256:632daad3ab546bd8e6af0537d09805cec458dce201bccfe23012df73332e181e"}, +] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, @@ -1427,8 +1464,8 @@ pyflakes = [ {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, ] pylint = [ - {file = "pylint-2.9.6-py3-none-any.whl", hash = "sha256:2e1a0eb2e8ab41d6b5dbada87f066492bb1557b12b76c47c2ee8aa8a11186594"}, - {file = "pylint-2.9.6.tar.gz", hash = "sha256:8b838c8983ee1904b2de66cce9d0b96649a91901350e956d78f289c3bc87b48e"}, + {file = "pylint-2.10.2-py3-none-any.whl", hash = "sha256:e178e96b6ba171f8ef51fbce9ca30931e6acbea4a155074d80cc081596c9e852"}, + {file = "pylint-2.10.2.tar.gz", hash = "sha256:6758cce3ddbab60c52b57dcc07f0c5d779e5daf0cf50f6faacbef1d3ea62d2a1"}, ] pylintfileheader = [ {file = "pylintfileheader-0.3.0-py3-none-any.whl", hash = "sha256:7871193691484210268d467dc12d88ac5b3ba7eb7dec6239e24075797185a3b2"}, @@ -1543,39 +1580,47 @@ pyyaml = [ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"}, ] regex = [ - {file = "regex-2021.8.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8764a78c5464ac6bde91a8c87dd718c27c1cabb7ed2b4beaf36d3e8e390567f9"}, - {file = "regex-2021.8.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4551728b767f35f86b8e5ec19a363df87450c7376d7419c3cac5b9ceb4bce576"}, - {file = "regex-2021.8.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:577737ec3d4c195c4aef01b757905779a9e9aee608fa1cf0aec16b5576c893d3"}, - {file = "regex-2021.8.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c856ec9b42e5af4fe2d8e75970fcc3a2c15925cbcc6e7a9bcb44583b10b95e80"}, - {file = "regex-2021.8.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3835de96524a7b6869a6c710b26c90e94558c31006e96ca3cf6af6751b27dca1"}, - {file = "regex-2021.8.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cea56288eeda8b7511d507bbe7790d89ae7049daa5f51ae31a35ae3c05408531"}, - {file = "regex-2021.8.3-cp36-cp36m-win32.whl", hash = "sha256:a4eddbe2a715b2dd3849afbdeacf1cc283160b24e09baf64fa5675f51940419d"}, - {file = "regex-2021.8.3-cp36-cp36m-win_amd64.whl", hash = "sha256:57fece29f7cc55d882fe282d9de52f2f522bb85290555b49394102f3621751ee"}, - {file = "regex-2021.8.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a5c6dbe09aff091adfa8c7cfc1a0e83fdb8021ddb2c183512775a14f1435fe16"}, - {file = "regex-2021.8.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff4a8ad9638b7ca52313d8732f37ecd5fd3c8e3aff10a8ccb93176fd5b3812f6"}, - {file = "regex-2021.8.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b63e3571b24a7959017573b6455e05b675050bbbea69408f35f3cb984ec54363"}, - {file = "regex-2021.8.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:fbc20975eee093efa2071de80df7f972b7b35e560b213aafabcec7c0bd00bd8c"}, - {file = "regex-2021.8.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:14caacd1853e40103f59571f169704367e79fb78fac3d6d09ac84d9197cadd16"}, - {file = "regex-2021.8.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bb350eb1060591d8e89d6bac4713d41006cd4d479f5e11db334a48ff8999512f"}, - {file = "regex-2021.8.3-cp37-cp37m-win32.whl", hash = "sha256:18fdc51458abc0a974822333bd3a932d4e06ba2a3243e9a1da305668bd62ec6d"}, - {file = "regex-2021.8.3-cp37-cp37m-win_amd64.whl", hash = "sha256:026beb631097a4a3def7299aa5825e05e057de3c6d72b139c37813bfa351274b"}, - {file = "regex-2021.8.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:16d9eaa8c7e91537516c20da37db975f09ac2e7772a0694b245076c6d68f85da"}, - {file = "regex-2021.8.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3905c86cc4ab6d71635d6419a6f8d972cab7c634539bba6053c47354fd04452c"}, - {file = "regex-2021.8.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937b20955806381e08e54bd9d71f83276d1f883264808521b70b33d98e4dec5d"}, - {file = "regex-2021.8.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:28e8af338240b6f39713a34e337c3813047896ace09d51593d6907c66c0708ba"}, - {file = "regex-2021.8.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3c09d88a07483231119f5017904db8f60ad67906efac3f1baa31b9b7f7cca281"}, - {file = "regex-2021.8.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:85f568892422a0e96235eb8ea6c5a41c8ccbf55576a2260c0160800dbd7c4f20"}, - {file = "regex-2021.8.3-cp38-cp38-win32.whl", hash = "sha256:bf6d987edd4a44dd2fa2723fca2790f9442ae4de2c8438e53fcb1befdf5d823a"}, - {file = "regex-2021.8.3-cp38-cp38-win_amd64.whl", hash = "sha256:8fe58d9f6e3d1abf690174fd75800fda9bdc23d2a287e77758dc0e8567e38ce6"}, - {file = "regex-2021.8.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7976d410e42be9ae7458c1816a416218364e06e162b82e42f7060737e711d9ce"}, - {file = "regex-2021.8.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9569da9e78f0947b249370cb8fadf1015a193c359e7e442ac9ecc585d937f08d"}, - {file = "regex-2021.8.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:459bbe342c5b2dec5c5223e7c363f291558bc27982ef39ffd6569e8c082bdc83"}, - {file = "regex-2021.8.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4f421e3cdd3a273bace013751c345f4ebeef08f05e8c10757533ada360b51a39"}, - {file = "regex-2021.8.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ea212df6e5d3f60341aef46401d32fcfded85593af1d82b8b4a7a68cd67fdd6b"}, - {file = "regex-2021.8.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a3b73390511edd2db2d34ff09aa0b2c08be974c71b4c0505b4a048d5dc128c2b"}, - {file = "regex-2021.8.3-cp39-cp39-win32.whl", hash = "sha256:f35567470ee6dbfb946f069ed5f5615b40edcbb5f1e6e1d3d2b114468d505fc6"}, - {file = "regex-2021.8.3-cp39-cp39-win_amd64.whl", hash = "sha256:bfa6a679410b394600eafd16336b2ce8de43e9b13f7fb9247d84ef5ad2b45e91"}, - {file = "regex-2021.8.3.tar.gz", hash = "sha256:8935937dad2c9b369c3d932b0edbc52a62647c2afb2fafc0c280f14a8bf56a6a"}, + {file = "regex-2021.8.21-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4b0c211c55d4aac4309c3209833c803fada3fc21cdf7b74abedda42a0c9dc3ce"}, + {file = "regex-2021.8.21-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d5209c3ba25864b1a57461526ebde31483db295fc6195fdfc4f8355e10f7376"}, + {file = "regex-2021.8.21-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c835c30f3af5c63a80917b72115e1defb83de99c73bc727bddd979a3b449e183"}, + {file = "regex-2021.8.21-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:615fb5a524cffc91ab4490b69e10ae76c1ccbfa3383ea2fad72e54a85c7d47dd"}, + {file = "regex-2021.8.21-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9966337353e436e6ba652814b0a957a517feb492a98b8f9d3b6ba76d22301dcc"}, + {file = "regex-2021.8.21-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a49f85f0a099a5755d0a2cc6fc337e3cb945ad6390ec892332c691ab0a045882"}, + {file = "regex-2021.8.21-cp310-cp310-win32.whl", hash = "sha256:f93a9d8804f4cec9da6c26c8cfae2c777028b4fdd9f49de0302e26e00bb86504"}, + {file = "regex-2021.8.21-cp310-cp310-win_amd64.whl", hash = "sha256:a795829dc522227265d72b25d6ee6f6d41eb2105c15912c230097c8f5bfdbcdc"}, + {file = "regex-2021.8.21-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:bca14dfcfd9aae06d7d8d7e105539bd77d39d06caaae57a1ce945670bae744e0"}, + {file = "regex-2021.8.21-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41acdd6d64cd56f857e271009966c2ffcbd07ec9149ca91f71088574eaa4278a"}, + {file = "regex-2021.8.21-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96f0c79a70642dfdf7e6a018ebcbea7ea5205e27d8e019cad442d2acfc9af267"}, + {file = "regex-2021.8.21-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:45f97ade892ace20252e5ccecdd7515c7df5feeb42c3d2a8b8c55920c3551c30"}, + {file = "regex-2021.8.21-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f9974826aeeda32a76648fc677e3125ade379869a84aa964b683984a2dea9f1"}, + {file = "regex-2021.8.21-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ea9753d64cba6f226947c318a923dadaf1e21cd8db02f71652405263daa1f033"}, + {file = "regex-2021.8.21-cp36-cp36m-win32.whl", hash = "sha256:ef9326c64349e2d718373415814e754183057ebc092261387a2c2f732d9172b2"}, + {file = "regex-2021.8.21-cp36-cp36m-win_amd64.whl", hash = "sha256:6dbd51c3db300ce9d3171f4106da18fe49e7045232630fe3d4c6e37cb2b39ab9"}, + {file = "regex-2021.8.21-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a89ca4105f8099de349d139d1090bad387fe2b208b717b288699ca26f179acbe"}, + {file = "regex-2021.8.21-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d6c2b1d78ceceb6741d703508cd0e9197b34f6bf6864dab30f940f8886e04ade"}, + {file = "regex-2021.8.21-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a34ba9e39f8269fd66ab4f7a802794ffea6d6ac500568ec05b327a862c21ce23"}, + {file = "regex-2021.8.21-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ecb6e7c45f9cd199c10ec35262b53b2247fb9a408803ed00ee5bb2b54aa626f5"}, + {file = "regex-2021.8.21-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:330836ad89ff0be756b58758878409f591d4737b6a8cef26a162e2a4961c3321"}, + {file = "regex-2021.8.21-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:71a904da8c9c02aee581f4452a5a988c3003207cb8033db426f29e5b2c0b7aea"}, + {file = "regex-2021.8.21-cp37-cp37m-win32.whl", hash = "sha256:b511c6009d50d5c0dd0bab85ed25bc8ad6b6f5611de3a63a59786207e82824bb"}, + {file = "regex-2021.8.21-cp37-cp37m-win_amd64.whl", hash = "sha256:93f9f720081d97acee38a411e861d4ce84cbc8ea5319bc1f8e38c972c47af49f"}, + {file = "regex-2021.8.21-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:3a195e26df1fbb40ebee75865f9b64ba692a5824ecb91c078cc665b01f7a9a36"}, + {file = "regex-2021.8.21-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:06ba444bbf7ede3890a912bd4904bb65bf0da8f0d8808b90545481362c978642"}, + {file = "regex-2021.8.21-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b8d551f1bd60b3e1c59ff55b9e8d74607a5308f66e2916948cafd13480b44a3"}, + {file = "regex-2021.8.21-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ebbceefbffae118ab954d3cd6bf718f5790db66152f95202ebc231d58ad4e2c2"}, + {file = "regex-2021.8.21-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ccd721f1d4fc42b541b633d6e339018a08dd0290dc67269df79552843a06ca92"}, + {file = "regex-2021.8.21-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ae87ab669431f611c56e581679db33b9a467f87d7bf197ac384e71e4956b4456"}, + {file = "regex-2021.8.21-cp38-cp38-win32.whl", hash = "sha256:38600fd58c2996829480de7d034fb2d3a0307110e44dae80b6b4f9b3d2eea529"}, + {file = "regex-2021.8.21-cp38-cp38-win_amd64.whl", hash = "sha256:61e734c2bcb3742c3f454dfa930ea60ea08f56fd1a0eb52d8cb189a2f6be9586"}, + {file = "regex-2021.8.21-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b091dcfee169ad8de21b61eb2c3a75f9f0f859f851f64fdaf9320759a3244239"}, + {file = "regex-2021.8.21-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:640ccca4d0a6fcc6590f005ecd7b16c3d8f5d52174e4854f96b16f34c39d6cb7"}, + {file = "regex-2021.8.21-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac95101736239260189f426b1e361dc1b704513963357dc474beb0f39f5b7759"}, + {file = "regex-2021.8.21-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b79dc2b2e313565416c1e62807c7c25c67a6ff0a0f8d83a318df464555b65948"}, + {file = "regex-2021.8.21-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d8b623fc429a38a881ab2d9a56ef30e8ea20c72a891c193f5ebbddc016e083ee"}, + {file = "regex-2021.8.21-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:8021dee64899f993f4b5cca323aae65aabc01a546ed44356a0965e29d7893c94"}, + {file = "regex-2021.8.21-cp39-cp39-win32.whl", hash = "sha256:d6ec4ae13760ceda023b2e5ef1f9bc0b21e4b0830458db143794a117fdbdc044"}, + {file = "regex-2021.8.21-cp39-cp39-win_amd64.whl", hash = "sha256:03840a07a402576b8e3a6261f17eb88abd653ad4e18ec46ef10c9a63f8c99ebd"}, + {file = "regex-2021.8.21.tar.gz", hash = "sha256:faf08b0341828f6a29b8f7dd94d5cf8cc7c39bfc3e67b78514c54b494b66915a"}, ] requests = [ {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"}, @@ -1632,8 +1677,8 @@ typed-ast = [ {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"}, ] types-setuptools = [ - {file = "types-setuptools-57.0.0.tar.gz", hash = "sha256:b3ada82b21dcb8e0cafd7658d8a16018a000e55bdb7f6f3cec033223360563ce"}, - {file = "types_setuptools-57.0.0-py3-none-any.whl", hash = "sha256:71ed0f4c71d8fb5f3026a90ae82d163c13749b110e157d82126725ac8f714360"}, + {file = "types-setuptools-57.0.2.tar.gz", hash = "sha256:4ead432cc394b8de5ee94a312494f3c730d21dbfef37f300a6ac5e742271d735"}, + {file = "types_setuptools-57.0.2-py3-none-any.whl", hash = "sha256:62c8dc465f29eeaad6b9025645138738d3df1cafc70cb0b14aea700946f2cbb7"}, ] typing-extensions = [ {file = "typing_extensions-3.10.0.0-py2-none-any.whl", hash = "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497"}, diff --git a/pyproject.toml b/pyproject.toml index 6531151e..9df13e1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,12 +27,13 @@ splunk_distro = "splunk_otel.distro:SplunkDistro" [tool.poetry.dependencies] python = "^3.6" -opentelemetry-api = "1.4.1" -opentelemetry-sdk = "1.4.1" -opentelemetry-instrumentation = "0.23b2" -opentelemetry-propagator-b3 = {version = "1.4.1", optional = true} -opentelemetry-exporter-jaeger-thrift = {version = "1.4.1", optional = true} -opentelemetry-exporter-otlp-proto-grpc = {version = "1.4.1", optional = true} +opentelemetry-api = "1.5.0" +opentelemetry-sdk = "1.5.0" +opentelemetry-instrumentation = "0.24b0" +opentelemetry-semantic-conventions = "0.24b0" +opentelemetry-propagator-b3 = {version = "1.5.0", optional = true} +opentelemetry-exporter-jaeger-thrift = {version = "1.5.0", optional = true} +opentelemetry-exporter-otlp-proto-grpc = {version = "1.5.0", optional = true} [tool.poetry.extras] all = ["opentelemetry-propagator-b3", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-jaeger-thrift"] diff --git a/scripts/create_gh_release.py b/scripts/create_gh_release.py index 3303dd61..27231133 100755 --- a/scripts/create_gh_release.py +++ b/scripts/create_gh_release.py @@ -28,7 +28,7 @@ def render_changelog(version): def render_release_notes(**kwargs): - with open(relase_template_path, "r") as tmpl: + with open(relase_template_path, "r", encoding="utf-8") as tmpl: notes = tmpl.read().format(**kwargs) return notes diff --git a/scripts/prepare_release.py b/scripts/prepare_release.py index dccd276f..ebd39aab 100644 --- a/scripts/prepare_release.py +++ b/scripts/prepare_release.py @@ -56,13 +56,13 @@ def update_docs(versions): } markdown = "" - with open(readme_path, "r") as readme: + with open(readme_path, "r", encoding="utf-8") as readme: markdown = readme.read() for name, value in variables.items(): markdown = re.sub(regexp.format(name), value, markdown) - with open(readme_path, "w") as readme: + with open(readme_path, "w", encoding="utf-8") as readme: readme.write(markdown) diff --git a/splunk_otel/cmd/trace.py b/splunk_otel/cmd/trace.py index e68e5613..8f453278 100644 --- a/splunk_otel/cmd/trace.py +++ b/splunk_otel/cmd/trace.py @@ -66,7 +66,7 @@ def run() -> None: os.environ["SPLUNK_ACCESS_TOKEN"] = args.token if args.service_name: - os.environ["SPLUNK_SERVICE_NAME"] = args.service_name + os.environ["OTEL_SERVICE_NAME"] = args.service_name if not args.command: ap.error(ap.format_help()) diff --git a/splunk_otel/environment_variables.py b/splunk_otel/environment_variables.py index a5829054..7ee6eae0 100644 --- a/splunk_otel/environment_variables.py +++ b/splunk_otel/environment_variables.py @@ -12,7 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -SPLUNK_ACCESS_TOKEN = "SPLUNK_ACCESS_TOKEN" -SPLUNK_MAX_ATTR_LENGTH = "SPLUNK_MAX_ATTR_LENGTH" -SPLUNK_TRACE_RESPONSE_HEADER_ENABLED = "SPLUNK_TRACE_RESPONSE_HEADER_ENABLED" -SPLUNK_SERVICE_NAME = "SPLUNK_SERVICE_NAME" +_SPLUNK_ACCESS_TOKEN = "SPLUNK_ACCESS_TOKEN" +_SPLUNK_TRACE_RESPONSE_HEADER_ENABLED = "SPLUNK_TRACE_RESPONSE_HEADER_ENABLED" diff --git a/splunk_otel/options.py b/splunk_otel/options.py index f3aa421e..174d5bab 100644 --- a/splunk_otel/options.py +++ b/splunk_otel/options.py @@ -23,8 +23,10 @@ __version__ as auto_instrumentation_version, ) from opentelemetry.sdk.environment_variables import ( + OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT, + OTEL_EVENT_ATTRIBUTE_COUNT_LIMIT, OTEL_EXPORTER_JAEGER_ENDPOINT, - OTEL_SERVICE_NAME, + OTEL_LINK_ATTRIBUTE_COUNT_LIMIT, OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT, OTEL_SPAN_EVENT_COUNT_LIMIT, OTEL_SPAN_LINK_COUNT_LIMIT, @@ -34,10 +36,8 @@ from pkg_resources import iter_entry_points from splunk_otel.environment_variables import ( - SPLUNK_ACCESS_TOKEN, - SPLUNK_MAX_ATTR_LENGTH, - SPLUNK_SERVICE_NAME, - SPLUNK_TRACE_RESPONSE_HEADER_ENABLED, + _SPLUNK_ACCESS_TOKEN, + _SPLUNK_TRACE_RESPONSE_HEADER_ENABLED, ) from splunk_otel.propagators import ServerTimingResponsePropagator from splunk_otel.symbols import ( @@ -69,7 +69,6 @@ class _Options: span_exporter_factories: Collection[_SpanExporterFactory] access_token: Optional[str] - max_attr_length: int resource: Resource response_propagation: bool response_propagator: Optional[ResponsePropagator] @@ -79,13 +78,11 @@ def __init__( service_name: Optional[str] = None, span_exporter_factories: Optional[Collection[_SpanExporterFactory]] = None, access_token: Optional[str] = None, - max_attr_length: Optional[int] = None, resource_attributes: Optional[Dict[str, Union[str, bool, int, float]]] = None, trace_response_header_enabled: Optional[bool] = None, ): self._set_default_env() self.access_token = self._get_access_token(access_token) - self.max_attr_length = self._get_max_attr_length(max_attr_length) self.response_propagator = self._get_trace_response_header_enabled( trace_response_header_enabled ) @@ -97,27 +94,16 @@ def __init__( @staticmethod def _get_access_token(access_token: Optional[str]) -> Optional[str]: if not access_token: - access_token = environ.get(SPLUNK_ACCESS_TOKEN) + access_token = environ.get(_SPLUNK_ACCESS_TOKEN) return access_token or None - @staticmethod - def _get_max_attr_length(max_attr_length: Optional[int]) -> int: - if not max_attr_length: - value = environ.get(SPLUNK_MAX_ATTR_LENGTH) - if value: - try: - max_attr_length = int(value) - except (TypeError, ValueError): - logger.error("SPLUNK_MAX_ATTR_LENGTH must be a number.") - return max_attr_length or _DEFAULT_MAX_ATTR_LENGTH - @staticmethod def _get_trace_response_header_enabled( enabled: Optional[bool], ) -> Optional[ResponsePropagator]: if enabled is None: enabled = _Options._is_truthy( - environ.get(SPLUNK_TRACE_RESPONSE_HEADER_ENABLED, "true") + environ.get(_SPLUNK_TRACE_RESPONSE_HEADER_ENABLED, "true") ) if enabled: return ServerTimingResponsePropagator() @@ -172,20 +158,19 @@ def _is_truthy(cls, value: Optional[str]) -> bool: @staticmethod def _set_default_env() -> None: - otel_service_name = environ.get(OTEL_SERVICE_NAME, "") - splunk_service_name = environ.get(SPLUNK_SERVICE_NAME) - if not otel_service_name and splunk_service_name: - logger.warning( - "SPLUNK_SERVICE_NAME is deprecated and will be removed soon. Please use OTEL_SERVICE_NAME instead" - ) - environ[OTEL_SERVICE_NAME] = splunk_service_name + defaults = { + OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT: _LIMIT_UNSET_VALUE, + OTEL_SPAN_EVENT_COUNT_LIMIT: _LIMIT_UNSET_VALUE, + OTEL_SPAN_EVENT_COUNT_LIMIT: _LIMIT_UNSET_VALUE, + OTEL_EVENT_ATTRIBUTE_COUNT_LIMIT: _LIMIT_UNSET_VALUE, + OTEL_LINK_ATTRIBUTE_COUNT_LIMIT: _LIMIT_UNSET_VALUE, + OTEL_SPAN_LINK_COUNT_LIMIT: str(_DEFAULT_SPAN_LINK_COUNT_LIMIT), + OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT: str(_DEFAULT_MAX_ATTR_LENGTH), + } - if OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT not in environ: - environ[OTEL_SPAN_ATTRIBUTE_COUNT_LIMIT] = _LIMIT_UNSET_VALUE - if OTEL_SPAN_EVENT_COUNT_LIMIT not in environ: - environ[OTEL_SPAN_EVENT_COUNT_LIMIT] = _LIMIT_UNSET_VALUE - if OTEL_SPAN_LINK_COUNT_LIMIT not in environ: - environ[OTEL_SPAN_LINK_COUNT_LIMIT] = str(_DEFAULT_SPAN_LINK_COUNT_LIMIT) + for key, value in defaults.items(): + if key not in environ: + environ[key] = value @classmethod def _get_span_exporter_names_from_env(cls) -> Collection[Tuple[str, str]]: @@ -276,22 +261,14 @@ def _jaeger_factory( return exporter(**_Options._get_jaeger_kwargs(options)) @staticmethod - def _get_jaeger_kwargs(options: "_Options") -> Dict[str, Union[int, str]]: - kwargs: Dict[str, Union[int, str]] = { - "max_tag_value_length": options.max_attr_length, - } + def _get_jaeger_kwargs(options: "_Options") -> Dict[str, str]: if options.access_token: - kwargs.update( - { - "username": "auth", - "password": options.access_token, - } - ) - return kwargs + return { + "username": "auth", + "password": options.access_token, + } + return {} @staticmethod def _otlp_factory(exporter: _SpanExporterClass, options: "_Options") -> SpanExporter: - # TODO: enable after PR is merged and released: - # https://github.com/open-telemetry/opentelemetry-python/pull/1824 - # kwargs = {"max_attr_value_length": self.max_attr_length} return exporter(headers=(("x-sf-token", options.access_token),)) diff --git a/splunk_otel/symbols.py b/splunk_otel/symbols.py index 14fc7ab9..be33c959 100644 --- a/splunk_otel/symbols.py +++ b/splunk_otel/symbols.py @@ -38,4 +38,4 @@ _EXPORTER_JAEGER_SPLUNK: "opentelemetry-exporter-jaeger-thrift", } -_LIMIT_UNSET_VALUE = "unset" +_LIMIT_UNSET_VALUE = "" diff --git a/splunk_otel/tracing.py b/splunk_otel/tracing.py index 7415bdca..df931053 100644 --- a/splunk_otel/tracing.py +++ b/splunk_otel/tracing.py @@ -34,7 +34,6 @@ def start_tracing( service_name: Optional[str] = None, span_exporter_factories: Optional[Collection[_SpanExporterFactory]] = None, access_token: Optional[str] = None, - max_attr_length: Optional[int] = None, resource_attributes: Optional[Dict[str, Union[str, bool, int, float]]] = None, trace_response_header_enabled: Optional[bool] = None, ) -> None: @@ -47,7 +46,6 @@ def start_tracing( service_name, span_exporter_factories, access_token, - max_attr_length, resource_attributes, trace_response_header_enabled, ) diff --git a/tests/unit/test_options.py b/tests/unit/test_options.py index c6b6114c..bc4fda75 100644 --- a/tests/unit/test_options.py +++ b/tests/unit/test_options.py @@ -21,7 +21,7 @@ from opentelemetry.sdk.trace.export import ConsoleSpanExporter from splunk_otel.options import _Options -from splunk_otel.symbols import _DEFAULT_JAEGER_ENDPOINT, _DEFAULT_MAX_ATTR_LENGTH +from splunk_otel.symbols import _DEFAULT_JAEGER_ENDPOINT from splunk_otel.version import __version__ # pylint: disable=protected-access @@ -67,18 +67,6 @@ def test_service_name_from_env_service_name(self): "service name from otel service name env", ) - @mock.patch.dict( - os.environ, - {"SPLUNK_SERVICE_NAME": "service name from splunk env"}, - ) - def test_service_name_backward_compatibility(self): - self.assertNotIn("OTEL_SERVICE_NAME", os.environ) - _Options() - self.assertEqual( - os.environ["OTEL_SERVICE_NAME"], os.environ["SPLUNK_SERVICE_NAME"] - ) - del os.environ["OTEL_SERVICE_NAME"] - @mock.patch.dict(os.environ, {"OTEL_TRACES_EXPORTER": ""}) def test_exporters_default(self): options = _Options() @@ -130,14 +118,12 @@ def test_exporters_jaeger_defaults(self): exporter = factory(options) self.assertIsInstance(exporter, JaegerExporter) self.assertEqual(exporter.collector_endpoint, _DEFAULT_JAEGER_ENDPOINT) - self.assertEqual(exporter._max_tag_value_length, _DEFAULT_MAX_ATTR_LENGTH) @mock.patch.dict( os.environ, { "OTEL_TRACES_EXPORTER": "jaeger-thrift-splunk", "OTEL_EXPORTER_JAEGER_ENDPOINT": "localhost:1234", - "SPLUNK_MAX_ATTR_LENGTH": "10", "SPLUNK_ACCESS_TOKEN": "12345", }, ) @@ -148,7 +134,6 @@ def test_exporters_jaeger_custom(self): exporter = factory(options) self.assertIsInstance(exporter, JaegerExporter) self.assertEqual(exporter.collector_endpoint, "localhost:1234") - self.assertEqual(exporter._max_tag_value_length, 10) self.assertEqual(exporter.username, "auth") self.assertEqual(exporter.password, "12345") diff --git a/tests/unit/test_otel_defaults.py b/tests/unit/test_otel_defaults.py index 28c385fe..1afbf5ea 100644 --- a/tests/unit/test_otel_defaults.py +++ b/tests/unit/test_otel_defaults.py @@ -28,9 +28,17 @@ def test_default_limits(self): # instantiating _Options() sets default env vars _Options() limits = TracerProvider()._span_limits + + # unlimited by default self.assertIsNone(limits.max_attributes) self.assertIsNone(limits.max_events) + self.assertIsNone(limits.max_event_attributes) + self.assertIsNone(limits.max_link_attributes) + + # have default limits self.assertEqual(limits.max_links, 1000) + self.assertEqual(limits.max_attribute_length, 1200) + self.assertEqual(limits.max_span_attribute_length, 1200) def test_otel_log_correlation_enabled(self): self.assertTrue(environ[_OTEL_PYTHON_LOG_CORRELATION])