From 44a7facc33c2ca4a50735903f90491307811026e Mon Sep 17 00:00:00 2001 From: Ivan Fernandez Calvo Date: Fri, 16 Feb 2024 11:39:05 +0100 Subject: [PATCH] fix: it test and demos --- .gitignore | 3 ++- docs/demos/jaeger/config/otel-collector-config.yaml | 4 ++-- docs/demos/jaeger/docker-compose.yml | 4 ++-- setup.cfg | 8 ++++---- tests/docker-compose.yml | 2 +- tests/otel-collector.yaml | 6 +++--- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 4112bbb..e653045 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ release.properties target venv pytest_otel.egg-info -junit-test_pytest_otel.xml +junit-test_*.xml .mypy_cache .pytest_cache +tests/tests.json diff --git a/docs/demos/jaeger/config/otel-collector-config.yaml b/docs/demos/jaeger/config/otel-collector-config.yaml index 295acea..6ce3aff 100644 --- a/docs/demos/jaeger/config/otel-collector-config.yaml +++ b/docs/demos/jaeger/config/otel-collector-config.yaml @@ -7,8 +7,8 @@ receivers: grpc: exporters: - logging: - loglevel: debug + debug: + verbosity: detailed jaeger: endpoint: jaeger-all-in-one:14250 tls: diff --git a/docs/demos/jaeger/docker-compose.yml b/docs/demos/jaeger/docker-compose.yml index 74f66ff..9f2839c 100644 --- a/docs/demos/jaeger/docker-compose.yml +++ b/docs/demos/jaeger/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.7' services: jaeger-all-in-one: - image: jaegertracing/all-in-one:latest + image: jaegertracing/all-in-one:1.46.0 ports: - "16686:16686" - "14268" @@ -13,7 +13,7 @@ services: - pytest_otel otel-collector: - image: otel/opentelemetry-collector-contrib-dev:latest + image: otel/opentelemetry-collector-contrib:0.94.0 command: ["--config=/etc/otel-collector-config.yaml", "${OTELCOL_ARGS}"] healthcheck: interval: 10s diff --git a/setup.cfg b/setup.cfg index 361196f..f519fbf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,9 +3,9 @@ name = pytest_otel description = pytest-otel report OpenTelemetry traces about test executed long_description = file: README.md long_description_content_type = text/markdown -url = https://github.com/elastic/apm-pipeline-library/tree/main/resources/scripts/pytest_otel +url = https://github.com/kuisathaverat/pytest_otel maintainer = Ivan Fernandez Calvo -version = 1.4.0 +version = 1.4.1 license = Apache-2.0 license_file = LICENSE.txt platforms = any @@ -27,8 +27,8 @@ classifiers = Topic :: Utilities keywords = pytest, otel, opentelemetry, debug project_urls = - Source=https://github.com/elastic/apm-pipeline-library/tree/main/resources/scripts/pytest_otel - Tracker=https://github.com/elastic/apm-pipeline-library/issues + Source=https://github.com/kuisathaverat/pytest_otel + Tracker=https://github.com/kuisathaverat/pytest_otel/issues [options] packages = find: diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 3c10999..d932d4e 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -4,7 +4,7 @@ version: "3.7" services: otel-collector: - image: otel/opentelemetry-collector:latest + image: otel/opentelemetry-collector:0.94.0 user: ${UID}:${GID} command: ["--config=/etc/otel-collector.yaml"] volumes: diff --git a/tests/otel-collector.yaml b/tests/otel-collector.yaml index 413c5b7..8cdd89f 100644 --- a/tests/otel-collector.yaml +++ b/tests/otel-collector.yaml @@ -8,8 +8,8 @@ receivers: endpoint: 0.0.0.0:4317 exporters: - logging: - logLevel: debug + debug: + verbosity: detailed file: path: /tmp/tests.json processors: @@ -23,5 +23,5 @@ service: processors: - batch exporters: - - logging + - debug - file