fix

Signed-off-by: emdneto <[email protected]>

Author: emdneto

.github/workflows/core_contrib_test_0.yml

@@ -112,7 +112,6 @@ jobs:
       - name: Run tests
         run: tox -e py39-test-instrumentation-vertexai-latest -- -ra
 
-<<<<<<< HEAD
   py39-test-instrumentation-google-genai-oldest:
     name: instrumentation-google-genai-oldest 
     runs-on: ubuntu-latest
@@ -159,12 +158,8 @@ jobs:
       - name: Run tests
         run: tox -e py39-test-instrumentation-google-genai-latest -- -ra
 
-  py39-test-resource-detector-container:
-    name: resource-detector-container 
-=======
-  py38-test-resource-detector-containerid:
+  py39-test-resource-detector-containerid:
     name: resource-detector-containerid 
->>>>>>> dc37a537 (resource-dector-container: package rename)
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -184,11 +179,7 @@ jobs:
         run: pip install tox-uv
 
       - name: Run tests
-<<<<<<< HEAD
-        run: tox -e py39-test-resource-detector-container -- -ra
-=======
-        run: tox -e py38-test-resource-detector-containerid -- -ra
->>>>>>> dc37a537 (resource-dector-container: package rename)
+        run: tox -e py39-test-resource-detector-containerid -- -ra
 
   py39-test-resource-detector-azure-0:
     name: resource-detector-azure-0 

.github/workflows/test_0.yml

@@ -636,25 +636,6 @@ jobs:
       - name: Run tests
         run: tox -e py313-test-instrumentation-google-genai-latest -- -ra
 
-  py38-test-resource-detector-containerid_ubuntu-latest:
-    name: resource-detector-containerid 3.8 Ubuntu
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - name: Checkout repo @ SHA - ${{ github.sha }}
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.8"
-
-      - name: Install tox
-        run: pip install tox-uv
-
-      - name: Run tests
-        run: tox -e py38-test-resource-detector-containerid -- -ra
-
   py39-test-resource-detector-containerid_ubuntu-latest:
     name: resource-detector-containerid 3.9 Ubuntu
     runs-on: ubuntu-latest
@@ -751,7 +732,7 @@ jobs:
         run: tox -e py313-test-resource-detector-containerid -- -ra
 
   pypy3-test-resource-detector-containerid_ubuntu-latest:
-    name: resource-detector-containerid pypy-3.8 Ubuntu
+    name: resource-detector-containerid pypy-3.9 Ubuntu
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:

tox.ini

@@ -26,7 +26,7 @@ envlist =
     lint-instrumentation-google-genai
 
     ; opentelemetry-resource-detector-containerid
-    py3{8,9,10,11,12,13}-test-resource-detector-containerid
+    py3{9,10,11,12,13}-test-resource-detector-containerid
     pypy3-test-resource-detector-containerid
     lint-resource-detector-containerid