Respond to comments

Author: DylanRussell

eachdist.ini

@@ -13,6 +13,7 @@ sortfirst=
     instrumentation/opentelemetry-instrumentation-botocore
     instrumentation/*
     exporter/*
+    exporter/exporter-credential-providers/*
     ext/*
 
 [stable]
@@ -32,6 +33,7 @@ packages=
     opentelemetry-exporter-jaeger-proto-grpc
     opentelemetry-exporter-jaeger
     opentelemetry-api
+    opentelemetry-exporter-credential-provider-gcp
 
 [prerelease]
 version=0.59b0.dev
@@ -57,7 +59,6 @@ packages=
     opentelemetry-instrumentation-langchain
     opentelemetry-instrumentation-weaviate
     opentelemetry-util-genai
-    opentelemetry-exporter-credential-provider-gcp
 
 [lintroots]
 extraroots=examples/*,scripts/

exporter/exporter-credential-providers/gcp-credential-provider/MANIFEST.rst

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.1b0.dev"
+__version__ = "0.59b0.dev"

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

@@ -1 +1,4 @@
-pytest==7.4.4
+pytest==7.4.4
+opentelemetry-exporter-otlp-proto-http==1.37
+opentelemetry-exporter-otlp-proto-common==1.37
+opentelemetry-proto==1.37

exporter/exporter-credential-providers/gcp-credential-provider/test-requirements.txt

@@ -17,9 +17,6 @@
 
 from google.auth.transport.requests import AuthorizedSession
 
-from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
-    OTLPSpanExporter as GRPCOTLPSpanExporter,
-)
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter,
 )
@@ -43,6 +40,3 @@ def test_loads_otlp_exporters_with_google_creds(self):  # pylint: disable=no-sel
 
         http_exporter = OTLPSpanExporter()
         assert isinstance(http_exporter._session, AuthorizedSession)
-        # TODO: figure out how to assert something about the credentials that this thing initializes..
-        grpc_exporter = GRPCOTLPSpanExporter()
-        print(dir(grpc_exporter))

exporter/exporter-credential-providers/gcp-credential-provider/tests/test_credential_provider.py

@@ -6,6 +6,7 @@
 set -ev
 
 # Get the latest versions of packaging tools
+python3 -m pip install --upgrade pip build setuptools wheel
 
 BASEDIR=$(dirname "$(readlink -f "$(dirname $0)")")
 DISTDIR=dist
@@ -15,10 +16,13 @@ DISTDIR=dist
   mkdir -p $DISTDIR
   rm -rf ${DISTDIR:?}/*
 
- for d in exporter/*/ opentelemetry-instrumentation/ opentelemetry-contrib-instrumentations/ opentelemetry-distro/ instrumentation/*/ processor/*/ propagator/*/ resource/*/ sdk-extension/*/ util/*/ ; do
+ for d in exporter/*/ exporter/exporter-credential-providers/*/ opentelemetry-instrumentation/ opentelemetry-contrib-instrumentations/ opentelemetry-distro/ instrumentation/*/ processor/*/ propagator/*/ resource/*/ sdk-extension/*/ util/*/ ; do
    (
      echo "building $d"
      cd "$d"
+     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.
    )

scripts/build.sh

@@ -443,10 +443,6 @@ test_deps =
   opentelemetry-semantic-conventions@{env:CORE_REPO}\#egg=opentelemetry-semantic-conventions&subdirectory=opentelemetry-semantic-conventions
   opentelemetry-sdk@{env:CORE_REPO}\#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk
   opentelemetry-test-utils@{env:CORE_REPO}\#egg=opentelemetry-test-utils&subdirectory=tests/opentelemetry-test-utils
-  opentelemetry-exporter-otlp-proto-grpc@{env:CORE_REPO}\#egg=opentelemetry-exporter-otlp-proto-grpc&subdirectory=exporter/opentelemetry-exporter-otlp-proto-grpc
-  opentelemetry-exporter-otlp-proto-http@{env:CORE_REPO}\#egg=opentelemetry-exporter-otlp-proto-http&subdirectory=exporter/opentelemetry-exporter-otlp-proto-http
-  opentelemetry-exporter-otlp-proto-common@{env:CORE_REPO}\#egg=opentelemetry-exporter-otlp-proto-common&subdirectory=exporter/opentelemetry-exporter-otlp-proto-common
-  opentelemetry-proto@{env:CORE_REPO}\#egg=opentelemetry-proto&subdirectory=opentelemetry-proto
 deps =
   lint: -r dev-requirements.txt
   coverage: pytest
@@ -729,7 +725,6 @@ deps =
   util-http: -r {toxinidir}/util/opentelemetry-util-http/test-requirements.txt
   util-http: {toxinidir}/util/opentelemetry-util-http
 
-  exporter-credential-provider-gcp: {[testenv]test_deps}
   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