testfix

Author: thpierce

.github/actions/set_up/action.yml

@@ -41,4 +41,9 @@ runs:
     - name: Run unit tests/benchmarks with tox
       if: ${{ inputs.run_unit_tests == 'true' }}
       shell: bash
-      run: tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra
+      run: |
+        tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra
+        tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra
+        tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra
+        tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra
+        tox -f ${{ inputs.python_version }}-${{ inputs.package_name }} -- -ra

.github/workflows/pr_build.yml

@@ -20,64 +20,10 @@ jobs:
       - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
 
-      - name: Build Wheel and Image Files
-        uses: ./.github/actions/artifacts_build
-        with:
-          image_uri_with_tag: pr_build/${{ matrix.python-version }}
-          push_image: false
-          load_image: true
-          python_version: ${{ matrix.python-version }}
-          package_name: aws-opentelemetry-distro
-          os: ubuntu-latest
-
-      - name: Set up and run contract tests with pytest
-        run: |
-          bash scripts/set-up-contract-tests.sh
-          pip install pytest
-          pytest contract-tests/tests
-
-  lint:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
-      matrix:
-        tox-environment: ["spellcheck", "lint"]
-    steps:
-      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Install libsnappy-dev
-        if: ${{ matrix.tox-environment == 'lint' }}
-        run: sudo apt-get update && sudo apt-get install -y libsnappy-dev
-
       - name: Set up
         uses: ./.github/actions/set_up
         with:
-          python_version: 3.11
+          python_version: ${{ matrix.python-version }}
           package_name: aws-opentelemetry-distro
           os: ubuntu-latest
-          run_unit_tests: false
-
-      - name: Run ${{ matrix.tox-environment }} with tox
-        run: tox -e ${{ matrix.tox-environment }}
-
-  spotless:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Gradle validation
-        uses: gradle/wrapper-validation-action@v1
-
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: temurin
-
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v3
-
-      - name: Build with Gradle
-        run: cd performance-tests; ./gradlew spotlessCheck
+          run_unit_tests: true

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/sampler/test_aws_xray_sampling_client.py

@@ -197,7 +197,10 @@ def test_urls_excluded_from_sampling(self):
             pass
 
         span_list = memory_exporter.get_finished_spans()
-        self.assertEqual(2, len(span_list))
+        spans: str = ""
+        for span in span_list:
+            spans = spans + span.to_json()
+        self.assertEqual(2, len(span_list), msg=spans)
         span_http_url = span_list[1].attributes.get("http.url")
         self.assertEqual(span_http_url, "http://this_is_a_fake_url:3849/SamplingTargets")