Merge pull request #6 from kuisathaverat/fix/lint

fix: add Python requirement before lint

.github/workflows/cd.yml

@@ -1,5 +1,5 @@
 ---
-## continous deployment workflow
+## continuous deployment workflow
 name: cd
 
 on:
@@ -17,6 +17,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: false
+          ref: ${{ github.sha || 'main' }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version-file: .python-version
+          cache: 'pip'
+          cache-dependency-path: requirements.txt
       - name: Lint
         run: make lint
   build:
@@ -57,4 +66,3 @@ jobs:
           publish: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

.github/workflows/ci.yml

@@ -1,5 +1,5 @@
 ---
-## continous integration workflow
+## continuous integration workflow
 name: ci
 
 on:
@@ -18,6 +18,11 @@ jobs:
           fetch-depth: 0
           fetch-tags: false
           ref: ${{ github.sha || 'main' }}
+      - uses: actions/setup-python@v5
+        with:
+          python-version-file: .python-version
+          cache: 'pip'
+          cache-dependency-path: requirements.txt
       - name: Lint
         run: make lint
   build:
@@ -43,4 +48,3 @@ jobs:
         with:
           name: test-results
           path: "**/junit-*.xml"
-

.gitignore

@@ -1,4 +1,3 @@
-__init__.py
 .gradle
 .idea
 .venv
@@ -11,3 +10,8 @@ gha-creds-*.json
 release.properties
 target
 venv
+pytest_otel.egg-info
+junit-test_*.xml
+.mypy_cache
+.pytest_cache
+tests/tests.json

.pre-commit-config.yaml

@@ -0,0 +1,50 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+    -   id: check-case-conflict
+    -   id: check-executables-have-shebangs
+        exclude: (.+.bat$|.+.ps1$|^target/)
+    -   id: check-json
+    -   id: check-merge-conflict
+    -   id: check-yaml
+        args: [--allow-multiple-documents]
+    -   id: check-xml
+    -   id: end-of-file-fixer
+    -   id: mixed-line-ending
+    -   id: trailing-whitespace
+
+-   repo: https://github.com/detailyang/pre-commit-shell.git
+    rev: master
+    hooks:
+    -   id: shell-lint
+        name: "Shellscript: lint"
+        stages: [commit]
+        types: [shell]
+
+-   repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.25.0
+    hooks:
+    -   id: yamllint
+        name: "Yaml: lint"
+        args: ['-c','.yamlint.yml']
+        stages: [commit]
+        types: [yaml]
+        exclude: (^.pre-commit-config.yaml$|^.pre-commit-hooks.yaml$)
+
+-   repo: https://github.com/elastic/apm-pipeline-library.git
+    rev: current
+    hooks:
+    -   id: check-bash-syntax
+    -   id: check-abstract-classes-and-trait   # TODO: this hook won't be needed once the CI migration is completed
+    -   id: check-jsonslurper-class   # TODO: this hook won't be needed once the CI migration is completed
+    -   id: check-unicode-non-breaking-spaces
+    -   id: remove-unicode-non-breaking-spaces
+    -   id: check-en-dashes
+    -   id: remove-en-dashes
+
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.1.0
+    hooks:
+    -   id: codespell
+        args: ['--ignore-words-list','pullrequest,pullrequests']

.yamlint.yml

@@ -0,0 +1,10 @@
+extends: default
+
+rules:
+  # 120 chars should be enough, but don't fail if a line is longer
+  line-length:
+    max: 120
+    level: warning
+
+  indentation:
+    level: warning

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:

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

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: