Fix samples again

Author: DylanRussell

opentelemetry-resourcedetector-gcp/README.rst

@@ -30,13 +30,20 @@ Usage
 ------------
 
 .. code:: python
-    from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
     from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
     from opentelemetry.sdk.trace import TracerProvider
     from opentelemetry.sdk.trace.export import BatchSpanProcessor
     from opentelemetry import trace
-
-    resource = GoogleCloudResourceDetector().detect()
+    from opentelemetry.sdk.resources import SERVICE_INSTANCE_ID, Resource
+
+    # This will use the GooglecloudResourceDetector under the covers.
+    resource = Resource.create(
+        attributes={
+            # Use the PID as the service.instance.id to avoid duplicate timeseries
+            # from different Gunicorn worker processes.
+            SERVICE_INSTANCE_ID: f"worker-{os.getpid()}",
+        }
+    )
     traceProvider = TracerProvider(resource=resource)
     processor = BatchSpanProcessor(OTLPSpanExporter())
     traceProvider.add_span_processor(processor)

samples/instrumentation-quickstart/setup_opentelemetry.py

@@ -23,15 +23,19 @@
 from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
+from opentelemetry.sdk.resources import SERVICE_INSTANCE_ID, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 
-from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
-
 # [START opentelemetry_instrumentation_setup_opentelemetry]
 def setup_opentelemetry() -> None:
-    resource = GoogleCloudResourceDetector().detect()
-
+    resource = Resource.create(
+        attributes={
+            # Use the PID as the service.instance.id to avoid duplicate timeseries
+            # from different Gunicorn worker processes.
+            SERVICE_INSTANCE_ID: f"worker-{os.getpid()}",
+        }
+    )
     # Set up OpenTelemetry Python SDK
     tracer_provider = TracerProvider(resource=resource)
     tracer_provider.add_span_processor(BatchSpanProcessor(OTLPSpanExporter()))

samples/otlptrace/example_grpc.py

@@ -24,17 +24,17 @@
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import (
     OTLPSpanExporter,
 )
+from opentelemetry.sdk.resources import SERVICE_NAME, Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
-from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
 
 """
 This is a sample script that exports OTLP traces encoded as protobufs via gRPC. 
 """
 
 credentials, _ = google.auth.default()
 request = google.auth.transport.requests.Request()
-resource = GoogleCloudResourceDetector().detect()
+resource = Resource.create(attributes={SERVICE_NAME: "otlp-gcp-grpc-sample"})
 
 auth_metadata_plugin = AuthMetadataPlugin(credentials=credentials, request=request)
 channel_creds = grpc.composite_channel_credentials(

samples/otlptrace/example_http.py

@@ -19,14 +19,14 @@
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter,
 )
-from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
 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, _ = google.auth.default()
 trace_provider = TracerProvider(
-    resource=GoogleCloudResourceDetector().detect()
+    resource=Resource.create(attributes={SERVICE_NAME: "otlp-gcp-http-sample"})
 )
 processor = BatchSpanProcessor(
     OTLPSpanExporter(