Respond to comments

Author: DylanRussell

exporter/exporter-credential-providers/gcp-credential-provider/LICENSE renamed to exporter/opentelemetry-exporter-credential-provider-gcp/LICENSE

@@ -25,21 +25,21 @@ classifiers = [
   "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "grpcio ~= 1.7",
-  "google-auth ~= 2.4",
-  "requests ~= 2.3",
+  "grpcio >= 1.67.0",
+  "google-auth >= 2.25",
+  "requests >= 2.7",
 ]
 
 [project.entry-points.opentelemetry_otlp_credential_provider]
-gcp_grpc_credentials = "opentelemetry.credential_provider:create_google_grpc_credentials"
-gcp_http_credentials = "opentelemetry.credential_provider:create_google_authorized_session"
+gcp_grpc_credentials = "opentelemetry.gcp_credential_provider:create_google_grpc_credentials"
+gcp_http_credentials = "opentelemetry.gcp_credential_provider:create_google_authorized_session"
 
 [project.urls]
 Homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/exporter/exporter-credential-providers/gcp-credential-provider"
 Repository = "https://github.com/open-telemetry/opentelemetry-python-contrib"
 
 [tool.hatch.version]
-path = "src/opentelemetry/credential_provider/version.py"
+path = "src/opentelemetry/gcp_credential_provider/version.py"
 
 [tool.hatch.build.targets.sdist]
 include = [

exporter/exporter-credential-providers/gcp-credential-provider/README.rst renamed to exporter/opentelemetry-exporter-credential-provider-gcp/README.rst

@@ -13,12 +13,13 @@
 # limitations under the License.
 
 import google.auth
-import google.auth.transport.requests
 import grpc
 import requests
 from google.auth.transport.grpc import AuthMetadataPlugin
 from google.auth.transport.requests import AuthorizedSession, Request
 
+# pyright: reportUnknownMemberType=false, reportUnknownArgumentType=false, reportUnknownVariableType=false
+
 
 def create_google_grpc_credentials() -> grpc.ChannelCredentials:
     credentials, _ = google.auth.default()

exporter/exporter-credential-providers/gcp-credential-provider/pyproject.toml renamed to exporter/opentelemetry-exporter-credential-provider-gcp/pyproject.toml

@@ -25,6 +25,8 @@
     _OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
 )
 
+# pyright: reportUnknownMemberType=false, reportUnknownVariableType=false, reportMissingImports=false
+
 
 class TestOTLPTraceAutoInstrumentGcpCredential(TestCase):
     @patch("google.auth.default")
@@ -35,7 +37,9 @@ class TestOTLPTraceAutoInstrumentGcpCredential(TestCase):
             _OTEL_PYTHON_EXPORTER_OTLP_GRPC_TRACES_CREDENTIAL_PROVIDER: "gcp_grpc_credentials",
         },
     )
-    def test_loads_otlp_exporters_with_google_creds(self, mock_default):  # pylint: disable=no-self-use
+    def test_loads_otlp_exporters_with_google_creds(
+        self, mock_default: MagicMock
+    ):  # pylint: disable=no-self-use
         """Test that OTel configuration internals can load the credentials from entrypoint by
         name"""
         mock_credentials = MagicMock()

exporter/exporter-credential-providers/gcp-credential-provider/src/opentelemetry/credential_provider/__init__.py renamed to exporter/opentelemetry-exporter-credential-provider-gcp/src/opentelemetry/gcp_credential_provider/__init__.py

@@ -145,16 +145,11 @@ members = [
   "instrumentation/*",
   "instrumentation-genai/*",
   "exporter/*",
-  "exporter/exporter-credential-providers/*",
   "opentelemetry-instrumentation",
   "propagator/*",
   "util/*",
 ]
 
-exclude = [
-  "exporter/exporter-credential-providers",
-]
-
 [tool.ruff]
 # https://docs.astral.sh/ruff/configuration/
 target-version = "py39"
@@ -210,6 +205,7 @@ include = [
   "instrumentation-genai/opentelemetry-instrumentation-langchain",
   "instrumentation-genai/opentelemetry-instrumentation-weaviate",
   "util/opentelemetry-util-genai",
+  "exporter/opentelemetry-exporter-credential-provider-gcp",
 ]
 # We should also add type hints to the test suite - It helps on finding bugs.
 # We are excluding for now because it's easier, and more important to add to the instrumentation packages.
@@ -224,5 +220,4 @@ exclude = [
   "instrumentation-genai/opentelemetry-instrumentation-weaviate/tests/**/*.py",
   "instrumentation-genai/opentelemetry-instrumentation-weaviate/examples/**/*.py",
   "util/opentelemetry-util-genai/tests/**/*.py",
-  "exporter-auth-provider/gcp-auth-provider/tests/**/*.py",
 ]

exporter/exporter-credential-providers/gcp-credential-provider/src/opentelemetry/credential_provider/version.py renamed to exporter/opentelemetry-exporter-credential-provider-gcp/src/opentelemetry/gcp_credential_provider/version.py

@@ -16,15 +16,15 @@ DISTDIR=dist
   mkdir -p $DISTDIR
   rm -rf ${DISTDIR:?}/*
 
- for d in exporter/*/ exporter/exporter-credential-providers/*/ opentelemetry-instrumentation/ opentelemetry-contrib-instrumentations/ opentelemetry-distro/ instrumentation/*/ processor/*/ propagator/*/ resource/*/ sdk-extension/*/ util/*/ ; do
+ for d in exporter/*/ opentelemetry-instrumentation/ opentelemetry-contrib-instrumentations/ opentelemetry-distro/ instrumentation/*/ processor/*/ propagator/*/ resource/*/ sdk-extension/*/ util/*/ ; do
    (
      echo "building $d"
      cd "$d"
+     # Some ext directories (such as docker tests) are not intended to be
+     # packaged. Verify the intent by looking for a pyproject.toml.
      if [ -f pyproject.toml ]; then
       python3 -m build --outdir "$BASEDIR/dist/"
      fi
-     # Some ext directories (such as docker tests) are not intended to be
-     # packaged. Verify the intent by looking for a pyproject.toml.
    )
  done
 

exporter/exporter-credential-providers/gcp-credential-provider/test-requirements.txt renamed to exporter/opentelemetry-exporter-credential-provider-gcp/test-requirements.txt

@@ -725,8 +725,8 @@ deps =
   util-http: -r {toxinidir}/util/opentelemetry-util-http/test-requirements.txt
   util-http: {toxinidir}/util/opentelemetry-util-http
 
-  exporter-credential-provider-gcp: -r {toxinidir}/exporter/exporter-credential-providers/gcp-credential-provider/test-requirements.txt
-  exporter-credential-provider-gcp: {toxinidir}/exporter/exporter-credential-providers/gcp-credential-provider
+  exporter-credential-provider-gcp: -r {toxinidir}/exporter/opentelemetry-exporter-credential-provider-gcp/test-requirements.txt
+  exporter-credential-provider-gcp: {toxinidir}/exporter/opentelemetry-exporter-credential-provider-gcp
 
   util-genai: {[testenv]test_deps}
   util-genai: -r {toxinidir}/util/opentelemetry-util-genai/test-requirements.txt
@@ -927,8 +927,8 @@ commands =
   test-util-http: pytest {toxinidir}/util/opentelemetry-util-http/tests {posargs}
   lint-util-http: sh -c "cd util && pylint --rcfile ../.pylintrc opentelemetry-util-http"
 
-  test-exporter-credential-provider-gcp: pytest {toxinidir}/exporter/exporter-credential-providers/gcp-credential-provider/tests {posargs}
-  lint-exporter-credential-provider-gcp: sh -c "cd exporter/exporter-credential-providers && pylint --rcfile ../../.pylintrc gcp-credential-provider"
+  test-exporter-credential-provider-gcp: pytest {toxinidir}/exporter/opentelemetry-exporter-credential-provider-gcp/tests {posargs}
+  lint-exporter-credential-provider-gcp: sh -c "cd exporter && pylint --rcfile ../.pylintrc opentelemetry-exporter-credential-provider-gcp"
 
   test-util-genai: pytest {toxinidir}/util/opentelemetry-util-genai/tests {posargs}
   lint-util-genai: sh -c "cd util && pylint --rcfile ../.pylintrc opentelemetry-util-genai"
@@ -1078,7 +1078,7 @@ deps =
   {toxinidir}/instrumentation-genai/opentelemetry-instrumentation-google-genai[instruments]
   {toxinidir}/instrumentation/opentelemetry-instrumentation-aiokafka[instruments]
   {toxinidir}/instrumentation/opentelemetry-instrumentation-asyncclick[instruments]
-  {toxinidir}/exporter/exporter-credential-providers/gcp-credential-provider
+  {toxinidir}/exporter/opentelemetry-exporter-credential-provider-gcp
 
 commands =
   pyright