Merge branch 'main' into windows-ci

Author: owais

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       py37: 3.7
       py38: 3.8
       py39: 3.9
-      pypy3: pypy3
+      pypy3: pypy-3.7
       RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
@@ -55,6 +55,13 @@ jobs:
         id: windows-pypy-check
         if: ${{ matrix.os == 'windows-2019' && matrix.python-version == 'pypy3' && matrix.package == 'instrumentation' }}
         run: echo "::set-output name=found::true"
+
+      - name: Download cryptography wheel
+        if: steps.windows-pypy-check.outputs.found
+        run: |
+          pip download --only-binary :all: --dest . --no-cache cryptography
+          ls
+
       - name: Win+PyPy - Setup Rust Crates 
         if: steps.windows-pypy-check.outputs.found
         run: rustup target add i686-pc-windows-msvc

tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py

@@ -14,8 +14,9 @@
 
 
 import celery
-import pytest
 from celery.exceptions import Retry
+from flaky import flaky
+from pytest import mark
 
 import opentelemetry.instrumentation.celery
 from opentelemetry import trace as trace_api
@@ -33,7 +34,7 @@ class MyException(Exception):
     pass
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_instrumentation_info(celery_app, memory_exporter):
     @celery_app.task
     def fn_task():
@@ -143,7 +144,7 @@ def fn_task(self):
     assert span.attributes.get("celery.state") == "SUCCESS"
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_fn_task_apply_async(celery_app, memory_exporter):
     @celery_app.task
     def fn_task_parameters(user, force_logout=False):
@@ -190,7 +191,7 @@ def fn_task_parameters(user, force_logout=False):
     )
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_concurrent_delays(celery_app, memory_exporter):
     @celery_app.task
     def fn_task():
@@ -206,7 +207,7 @@ def fn_task():
     assert len(spans) == 200
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_fn_task_delay(celery_app, memory_exporter):
     @celery_app.task
     def fn_task_parameters(user, force_logout=False):
@@ -476,7 +477,7 @@ def add(x, y):
     )
 
 
-@pytest.mark.skip(reason="inconsistent test results")
+@mark.skip(reason="inconsistent test results")
 def test_apply_async_previous_style_tasks(
     celery_app, celery_worker, memory_exporter
 ):
@@ -558,6 +559,8 @@ class CelerySubClass(CelerySuperClass):
     ) == async_run_span.attributes.get(SpanAttributes.MESSAGING_MESSAGE_ID)
 
 
+# FIXME find a permanent solution for the flakiness of this test
+@flaky
 def test_custom_tracer_provider(celery_app, memory_exporter):
     @celery_app.task
     def fn_task():

tox.ini

@@ -409,6 +409,7 @@ deps =
   protobuf>=3.13.0
   requests==2.25.0
   pyodbc~=4.0.30
+  flaky==3.7.0
 
 changedir =
   tests/opentelemetry-docker-tests/tests