Merge branch 'main' into docs

GoogleCloudPlatform · Aug 3, 2023 · 03e9042 · 03e9042
2 parents cd16c37 + e115e33
commit 03e9042
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 24 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -35,8 +35,7 @@ jobs:
           restore-keys: |
             ${{ env.cache-version }}-${{ env.run-matrix-combo }}-pip
       - name: Install tox
-        # Pin tox 3 because of https://github.com/rpkilby/tox-factor/issues/18
-        run: pip install -U tox==3.27.1 tox-factor
+        run: pip install -U tox
       - name: Run tox test factors for python ${{ matrix.py.version }}
         run: >
           tox
@@ -68,7 +67,6 @@ jobs:
           restore-keys: |
             ${{ env.cache-version }}-${{ env.run-matrix-combo }}-pip
       - name: Install tox
-        # Pin tox 3 because of https://github.com/rpkilby/tox-factor/issues/18
-        run: pip install -U tox==3.27.1 tox-factor
+        run: pip install -U tox
       - name: Run tox factors ${{ matrix.target }}
         run: tox -f ${{ matrix.target }}
diff --git a/dev-constraints.txt b/dev-constraints.txt
@@ -16,5 +16,5 @@ types-urllib3==1.26.25.1
 
 # pinned for snapshot tests. this should be bumped regularly and snapshots updated by running
 # tox -f py311-test -- --snapshot-update
-opentelemetry-api==1.18.0
-opentelemetry-sdk==1.18.0
+opentelemetry-api==1.19.0
+opentelemetry-sdk==1.19.0
diff --git a/...telemetry-exporter-gcp-monitoring/src/opentelemetry/exporter/cloud_monitoring/__init__.py b/...telemetry-exporter-gcp-monitoring/src/opentelemetry/exporter/cloud_monitoring/__init__.py
@@ -19,7 +19,6 @@
 from typing import Dict, List, NoReturn, Optional, Set, Union
 
 import google.auth
-import pkg_resources
 from google.api.distribution_pb2 import Distribution
 from google.api.label_pb2 import LabelDescriptor
 from google.api.metric_pb2 import Metric as GMetric
@@ -44,6 +43,7 @@
 from opentelemetry.resourcedetector.gcp_resource_detector._mapping import (
     get_monitored_resource,
 )
+from opentelemetry.sdk import version as opentelemetry_sdk_version
 from opentelemetry.sdk.metrics.export import (
     Gauge,
     Histogram,
@@ -62,7 +62,7 @@
 UNIQUE_IDENTIFIER_KEY = "opentelemetry_id"
 NANOS_PER_SECOND = 10**9
 
-_OTEL_SDK_VERSION = pkg_resources.get_distribution("opentelemetry-sdk").version
+_OTEL_SDK_VERSION = opentelemetry_sdk_version.__version__
 _USER_AGENT = f"opentelemetry-python {_OTEL_SDK_VERSION}; google-cloud-metric-exporter {__version__}"
 
 # Set user-agent metadata, see https://github.com/grpc/grpc/issues/23644 and default options

diff --git a/opentelemetry-exporter-gcp-trace/src/opentelemetry/exporter/cloud_trace/__init__.py b/opentelemetry-exporter-gcp-trace/src/opentelemetry/exporter/cloud_trace/__init__.py
@@ -87,7 +87,6 @@
 
 import google.auth
 import opentelemetry.trace as trace_api
-import pkg_resources
 from google.cloud.trace_v2 import BatchWriteSpansRequest, TraceServiceClient
 from google.cloud.trace_v2 import types as trace_types
 from google.cloud.trace_v2.services.trace_service.transports import (
@@ -108,6 +107,7 @@
 from opentelemetry.resourcedetector.gcp_resource_detector._mapping import (
     get_monitored_resource,
 )
+from opentelemetry.sdk import version as opentelemetry_sdk_version
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import Event
 from opentelemetry.sdk.trace.export import (
@@ -122,7 +122,7 @@
 
 logger = logging.getLogger(__name__)
 
-_OTEL_SDK_VERSION = pkg_resources.get_distribution("opentelemetry-sdk").version
+_OTEL_SDK_VERSION = opentelemetry_sdk_version.__version__
 _USER_AGENT = f"opentelemetry-python {_OTEL_SDK_VERSION}; google-cloud-trace-exporter {__version__}"
 
 # Set user-agent metadata, see https://github.com/grpc/grpc/issues/23644 and default options
@@ -493,9 +493,7 @@ def _extract_attributes(
     if add_agent_attr:
         attributes_dict["g.co/agent"] = _format_attribute_value(
             "opentelemetry-python {}; google-cloud-trace-exporter {}".format(
-                _strip_characters(
-                    pkg_resources.get_distribution("opentelemetry-sdk").version
-                ),
+                _strip_characters(_OTEL_SDK_VERSION),
                 _strip_characters(__version__),
             )
         )

diff --git a/opentelemetry-exporter-gcp-trace/tests/test_cloud_trace_exporter.py b/opentelemetry-exporter-gcp-trace/tests/test_cloud_trace_exporter.py
@@ -16,7 +16,6 @@
 import unittest
 from unittest import mock
 
-import pkg_resources
 from google.cloud.trace_v2.services.trace_service.transports import (
     TraceServiceGrpcTransport,
 )
@@ -43,6 +42,7 @@
     _truncate_str,
 )
 from opentelemetry.exporter.cloud_trace.version import __version__
+from opentelemetry.sdk import version as opentelemetry_sdk_version
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import Event
 from opentelemetry.sdk.trace import _Span as Span
@@ -94,9 +94,7 @@ def setUpClass(cls):
         )
         cls.agent_code = _format_attribute_value(
             "opentelemetry-python {}; google-cloud-trace-exporter {}".format(
-                _strip_characters(
-                    pkg_resources.get_distribution("opentelemetry-sdk").version
-                ),
+                _strip_characters(opentelemetry_sdk_version.__version__),
                 _strip_characters(__version__),
             )
         )

diff --git a/opentelemetry-resourcedetector-gcp/tests/__snapshots__/test_detector.ambr b/opentelemetry-resourcedetector-gcp/tests/__snapshots__/test_detector.ambr
@@ -19,7 +19,7 @@
     'service.name': 'unknown_service',
     'telemetry.sdk.language': 'python',
     'telemetry.sdk.name': 'opentelemetry',
-    'telemetry.sdk.version': '1.18.0',
+    'telemetry.sdk.version': '1.19.0',
   })
 # ---
 # name: test_detects_gke[regional]
@@ -33,7 +33,7 @@
     'service.name': 'unknown_service',
     'telemetry.sdk.language': 'python',
     'telemetry.sdk.name': 'opentelemetry',
-    'telemetry.sdk.version': '1.18.0',
+    'telemetry.sdk.version': '1.19.0',
   })
 # ---
 # name: test_detects_gke[zonal]
@@ -47,6 +47,6 @@
     'service.name': 'unknown_service',
     'telemetry.sdk.language': 'python',
     'telemetry.sdk.name': 'opentelemetry',
-    'telemetry.sdk.version': '1.18.0',
+    'telemetry.sdk.version': '1.19.0',
   })
 # ---
diff --git a/tox.ini b/tox.ini
@@ -65,12 +65,14 @@ passenv = SKIP_GET_MOCK_SERVER
 changedir = {env:PACKAGE_NAME}
 
 commands_pre =
-  pip install .
+  pip install -c {toxinidir}/dev-constraints.txt .
   {toxinidir}/get_mock_server.sh {envbindir}
 
 commands = pytest --junitxml={[constants]test_results_dir}/{envname}/junit.xml {posargs}
 
-whitelist_externals = bash
+allowlist_externals = 
+  bash
+  {toxinidir}/get_mock_server.sh
 
 [testenv:{lint,mypy}-ci-{cloudtrace,cloudmonitoring,propagator,resourcedetector}]
 basepython = {[constants]dev_basepython}
@@ -80,7 +82,7 @@ deps =
 changedir = {env:PACKAGE_NAME}
 
 commands_pre =
-  pip install .
+  pip install -c {toxinidir}/dev-constraints.txt .
 
 commands =
   lint: black . --diff --check
@@ -98,7 +100,7 @@ deps =
 commands =
   make -C docs/ clean html
 
-whitelist_externals =
+allowlist_externals =
   make
   bash