Merge branch 'main' into improve_resource_detector

Author: DylanRussell

docs/releasing.md

@@ -89,17 +89,8 @@ with:
 **pointing at the first commit (a)** that was merged into main. For the
 example PR listed above, that creates release
 [`v0.11b0@4ad9ccd`](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/releases/tag/v0.11b0).
-- In description, paste a changelog for the packages. I used this (probably
-buggy) small script for the example PR's tag:
-
-  ```bash
-  for cl in opentelemetry-*/CHANGELOG.md; do
-      if cl_entries=`pcregrep -M -o1 "^## Version 0\.10b0$\n\n^Released.*\n\n((?:- [\s\S]+?)*?)(?=(\s+##|\Z))" $cl`
-      then
-          echo -e "# `dirname $cl`\n$cl_entries"
-      fi
-  done
-  ```
+
+Click the "Generate release notes" button in the UI to get an autogenerated changelog for the packages.
 
 Once the release tag is created, move the `stable` tag to point to the same
 commit.

opentelemetry-exporter-gcp-logging/README.rst

@@ -35,6 +35,7 @@ Usage
 -----
 
 .. code:: python
+
     import logging
     from opentelemetry.exporter.cloud_logging import (
         CloudLoggingExporter,

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

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.9.0a0"
+__version__ = "1.10.0.dev0"

opentelemetry-exporter-gcp-monitoring/src/opentelemetry/exporter/cloud_monitoring/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.9.0a0"
+__version__ = "1.10.0.dev0"

opentelemetry-exporter-gcp-trace/src/opentelemetry/exporter/cloud_trace/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.9.0"
+__version__ = "1.10.0.dev0"

opentelemetry-propagator-gcp/src/opentelemetry/propagators/cloud_trace_propagator/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.9.0"
+__version__ = "1.10.0.dev0"

opentelemetry-resourcedetector-gcp/src/opentelemetry/resourcedetector/gcp_resource_detector/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.9.0a0"
+__version__ = "1.10.0.dev0"

samples/otlptrace/example_grpc.py

@@ -32,20 +32,22 @@
 This is a sample script that exports OTLP traces encoded as protobufs via gRPC. 
 """
 
-credentials, project_id = google.auth.default()
+credentials, _ = google.auth.default()
 request = google.auth.transport.requests.Request()
 resource = Resource.create(attributes={SERVICE_NAME: "otlp-gcp-grpc-sample"})
 
-auth_metadata_plugin = AuthMetadataPlugin(
-    credentials=credentials, request=request
-)
+auth_metadata_plugin = AuthMetadataPlugin(credentials=credentials, request=request)
 channel_creds = grpc.composite_channel_credentials(
     grpc.ssl_channel_credentials(),
     grpc.metadata_call_credentials(auth_metadata_plugin),
 )
 
 trace_provider = TracerProvider(resource=resource)
-processor = BatchSpanProcessor(OTLPSpanExporter(credentials=channel_creds))
+processor = BatchSpanProcessor(
+    OTLPSpanExporter(
+        credentials=channel_creds,
+    )
+)
 trace_provider.add_span_processor(processor)
 trace.set_tracer_provider(trace_provider)
 tracer = trace.get_tracer("my.tracer.name")

samples/otlptrace/example_http.py

@@ -19,21 +19,20 @@
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter,
 )
+from google.auth.transport.requests import AuthorizedSession
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
-credentials, project_id = google.auth.default()
-request = google.auth.transport.requests.Request()
-credentials.refresh(request)
-req_headers = {
-    "x-goog-user-project": credentials.quota_project_id,
-    "Authorization": "Bearer " + credentials.token,
-}
-resource = Resource.create(attributes={SERVICE_NAME: "otlp-gcp-http-sample"})
-
-trace_provider = TracerProvider(resource=resource)
-processor = BatchSpanProcessor(OTLPSpanExporter(headers=req_headers))
+credentials, _ = google.auth.default()
+trace_provider = TracerProvider(
+    resource=Resource.create(attributes={SERVICE_NAME: "otlp-gcp-http-sample"})
+)
+processor = BatchSpanProcessor(
+    OTLPSpanExporter(
+        session=AuthorizedSession(credentials),
+    )
+)
 trace_provider.add_span_processor(processor)
 trace.set_tracer_provider(trace_provider)
 tracer = trace.get_tracer("my.tracer.name")