Merge branch 'main' into improve_resource_detector

Author: aabmass

.github/workflows/ci.yaml

@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         py:
-          - { version: "3.8", tox: "38" }
           - { version: "3.9", tox: "39" }
           - { version: "3.10", tox: "310" }
           - { version: "3.11", tox: "311" }

.gitignore

@@ -146,3 +146,6 @@ cython_debug/
 # Sphinx
 _build/
 _autosummary/
+
+# Ephemeral Databases
+*.db

docs/contributing.md

@@ -55,17 +55,17 @@ tox -e dev
 
 ### Running tests
 
-This project supports python versions 3.5 to 3.9. To run tests, use `tox`:
+This project supports python versions 3.9 to 3.13. To run tests, use `tox`:
 
 ```sh
 # List all tox environments
 tox -l
 
-# Run python3.8 exporter tests
-tox -e py38-ci-test-exporter
+# Run python3.12 exporter tests
+tox -e py312-ci-test-exporter
 
-# Run all python3.8 tests in parallel
-tox -f py38-test -pauto
+# Run all python3.12 tests in parallel
+tox -f py312-test -pauto
 
 # All checks that run in continuous integration use the "ci" factor, which
 # makes it easy to test without submitting a PR. To run all of them in

opentelemetry-exporter-gcp-logging/setup.cfg

@@ -14,14 +14,13 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
 
 [options]
-python_requires = >=3.8
+python_requires = >=3.9
 package_dir=
     =src
 packages=find_namespace:

opentelemetry-exporter-gcp-logging/src/opentelemetry/exporter/cloud_logging/__init__.py

@@ -112,9 +112,6 @@ def _convert_any_value_to_string(value: Any) -> str:
         return str(value)
     if isinstance(value, (list, tuple)):
         return json.dumps(value)
-    logging.warning(
-        "Unknown value %s found, cannot convert to string.", type(value)
-    )
     return ""
 
 
@@ -158,7 +155,7 @@ def _set_payload_in_log_entry(log_entry: LogEntry, body: AnyValue):
             log_entry.json_payload = struct
         else:
             log_entry.text_payload = base64.b64encode(body).decode()
-    else:
+    elif body is not None:
         log_entry.text_payload = _convert_any_value_to_string(body)
 
 

opentelemetry-exporter-gcp-logging/tests/__snapshots__/test_cloud_logging/test_convert_various_types_of_bodies[None].json

@@ -0,0 +1,19 @@
+[
+  {
+    "entries": [
+      {
+        "logName": "projects/fakeproject/logs/test",
+        "resource": {
+          "labels": {
+            "location": "global",
+            "namespace": "",
+            "node_id": ""
+          },
+          "type": "generic_node"
+        },
+        "timestamp": "2025-01-15T21:25:10.997977393Z"
+      }
+    ],
+    "partialSuccess": true
+  }
+]

opentelemetry-exporter-gcp-logging/tests/test_cloud_logging.py

@@ -155,12 +155,16 @@ def test_convert_non_json_dict_bytes(
 
 @pytest.mark.parametrize(
     "body",
-    [pytest.param("A text body", id="str"), pytest.param(True, id="bool")],
+    [
+        pytest.param("A text body", id="str"),
+        pytest.param(True, id="bool"),
+        pytest.param(None, id="None"),
+    ],
 )
 def test_convert_various_types_of_bodies(
     cloudloggingfake: CloudLoggingFake,
     snapshot_writelogentrycalls: List[WriteLogEntriesCall],
-    body: Union[str, bool],
+    body: Union[str, bool, None],
 ) -> None:
     log_data = [
         LogData(

opentelemetry-exporter-gcp-monitoring/setup.cfg

@@ -14,15 +14,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
     Programming Language :: Python :: 3.13
 
 [options]
-python_requires = >=3.8
+python_requires = >=3.9
 package_dir=
     =src
 packages=find_namespace:

opentelemetry-exporter-gcp-trace/setup.cfg

@@ -14,14 +14,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
     Programming Language :: Python :: 3.13
 
 [options]
+python_requires = >=3.9
 package_dir=
     =src
 packages=find_namespace:

opentelemetry-propagator-gcp/setup.cfg

@@ -14,15 +14,14 @@ classifiers =
     License :: OSI Approved :: Apache Software License
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
     Programming Language :: Python :: 3.13
 
 [options]
-python_requires = >=3.8
+python_requires = >=3.9
 package_dir=
     =src
 packages=find_namespace: