Test and lint opentelemetry-resource-detector-azure (#2651)

Author: xrmx

.github/workflows/instrumentations_1.yml

@@ -35,6 +35,7 @@ jobs:
           - "sdk-extension-aws"
           - "propagator-aws-xray"
           - "propagator-ot-trace"
+          - "resource-detector-azure"
           - "resource-detector-container"
         os: [ubuntu-20.04]
         exclude:

.github/workflows/lint.yml

@@ -68,6 +68,7 @@ jobs:
           - "processor-baggage"
           - "propagator-aws-xray"
           - "propagator-ot-trace"
+          - "resource-detector-azure"
           - "resource-detector-container"
           - "sdk-extension-aws"
         os: [ubuntu-20.04]

resource/opentelemetry-resource-detector-azure/pyproject.toml

@@ -26,6 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-sdk ~= 1.21",
+  "opentelemetry-instrumentation == 0.47b0.dev",
 ]
 
 [project.entry-points.opentelemetry_resource_detector]

resource/opentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/app_service.py

@@ -12,23 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Optional
 from os import environ
 
+from opentelemetry.resource.detector.azure._utils import (
+    _get_azure_resource_uri,
+    _is_on_functions,
+)
 from opentelemetry.sdk.resources import Resource, ResourceDetector
 from opentelemetry.semconv.resource import (
     CloudPlatformValues,
     CloudProviderValues,
     ResourceAttributes,
 )
-from opentelemetry.resource.detector.azure._utils import _get_azure_resource_uri
-
-from ._constants import (
-    _APP_SERVICE_ATTRIBUTE_ENV_VARS,
-    _WEBSITE_SITE_NAME,
-)
 
-from opentelemetry.resource.detector.azure._utils import _is_on_functions
+from ._constants import _APP_SERVICE_ATTRIBUTE_ENV_VARS, _WEBSITE_SITE_NAME
 
 
 class AzureAppServiceResourceDetector(ResourceDetector):

resource/opentelemetry-resource-detector-azure/src/opentelemetry/resource/detector/azure/functions.py

@@ -14,6 +14,10 @@
 
 from os import environ, getpid
 
+from opentelemetry.resource.detector.azure._utils import (
+    _get_azure_resource_uri,
+    _is_on_functions,
+)
 from opentelemetry.sdk.resources import Resource, ResourceDetector
 from opentelemetry.semconv.resource import (
     CloudPlatformValues,
@@ -26,10 +30,6 @@
     _REGION_NAME,
     _WEBSITE_SITE_NAME,
 )
-from opentelemetry.resource.detector.azure._utils import (
-    _get_azure_resource_uri,
-    _is_on_functions,
-)
 
 
 class AzureFunctionsResourceDetector(ResourceDetector):
@@ -65,4 +65,3 @@ def detect(self) -> Resource:
                     attributes[key] = value
 
         return Resource(attributes)
-

resource/opentelemetry-resource-detector-azure/tests/test_app_service.py

@@ -68,7 +68,7 @@ def test_on_app_service(self):
         self.assertEqual(
             attributes["azure.app.service.stamp"], TEST_WEBSITE_HOME_STAMPNAME
         )
-    
+
     @patch.dict(
         "os.environ",
         {

tox.ini

@@ -11,6 +11,11 @@ envlist =
     pypy3-test-resource-detector-container
     lint-resource-detector-container
 
+    ; opentelemetry-resource-detector-azure
+    py3{8,9,10,11,12}-test-resource-detector-azure
+    pypy3-test-resource-detector-azure
+    lint-resource-detector-azure
+
     ; opentelemetry-sdk-extension-aws
     py3{8,9,10,11,12}-test-sdk-extension-aws
     pypy3-test-sdk-extension-aws
@@ -744,6 +749,12 @@ commands_pre =
   resource-detector-container: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
   resource-detector-container: pip install -r {toxinidir}/resource/opentelemetry-resource-detector-container/test-requirements.txt
 
+  resource-detector-azure: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
+  resource-detector-azure: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
+  resource-detector-azure: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
+  resource-detector-azure: pip install opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
+  resource-detector-azure: pip install -e {toxinidir}/resource/opentelemetry-resource-detector-azure -e {toxinidir}/opentelemetry-instrumentation
+
   propagator-ot-trace: pip install opentelemetry-api@{env:CORE_REPO}\#egg=opentelemetry-api&subdirectory=opentelemetry-api
   propagator-ot-trace: pip install opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
   propagator-ot-trace: pip install opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
@@ -1139,6 +1150,13 @@ commands =
   lint-resource-detector-container: pylint {toxinidir}/resource/opentelemetry-resource-detector-container/src/opentelemetry
   lint-resource-detector-container: pylint {toxinidir}/resource/opentelemetry-resource-detector-container/tests
 
+  test-resource-detector-azure: pytest {toxinidir}/resource/opentelemetry-resource-detector-azure/tests {posargs}
+  lint-resource-detector-azure: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/resource/opentelemetry-resource-detector-azure
+  lint-resource-detector-azure: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/resource/opentelemetry-resource-detector-azure
+  lint-resource-detector-azure: flake8 --config {toxinidir}/.flake8 {toxinidir}/resource/opentelemetry-resource-detector-azure
+  lint-resource-detector-azure: pylint {toxinidir}/resource/opentelemetry-resource-detector-azure/src/opentelemetry
+  lint-resource-detector-azure: pylint {toxinidir}/resource/opentelemetry-resource-detector-azure/tests
+
   test-processor-baggage: pytest {toxinidir}/processor/opentelemetry-processor-baggage/tests {posargs}
   lint-processor-baggage: black --diff --check --config {toxinidir}/pyproject.toml {toxinidir}/processor/opentelemetry-processor-baggage
   lint-processor-baggage: isort --diff --check-only --settings-path {toxinidir}/.isort.cfg {toxinidir}/processor/opentelemetry-processor-baggage