Fix e2e test and more samples to use GoogleCloudResourceDetector

Author: DylanRussell

e2e-test-server/e2e_test_server/scenarios.py

@@ -22,9 +22,7 @@
 from opentelemetry.propagators.cloud_trace_propagator import (
     CloudTraceFormatPropagator,
 )
-from opentelemetry.resourcedetector.gcp_resource_detector._detector import (
-    GoogleCloudResourceDetector,
-)
+from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.sdk.trace.sampling import ALWAYS_ON

samples/otlpmetric/example.py

@@ -24,9 +24,7 @@
 from opentelemetry.exporter.otlp.proto.grpc.metric_exporter import (
     OTLPMetricExporter,
 )
-from opentelemetry.resourcedetector.gcp_resource_detector._detector import (
-    GoogleCloudResourceDetector,
-)
+from opentelemetry.resourcedetector.gcp_resource_detector import GoogleCloudResourceDetector
 from opentelemetry.sdk.resources import SERVICE_NAME, Resource, get_aggregated_resources
 from opentelemetry.sdk.metrics import MeterProvider
 from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader

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 = Resource.create(attributes={SERVICE_NAME: "otlp-gcp-grpc-sample"})
+resource = GoogleCloudResourceDetector().detect()
 
 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=Resource.create(attributes={SERVICE_NAME: "otlp-gcp-http-sample"})
+    resource=GoogleCloudResourceDetector().detect()
 )
 processor = BatchSpanProcessor(
     OTLPSpanExporter(