From cad42526bfbad06d95b83db9b7afaad43c3e1fe8 Mon Sep 17 00:00:00 2001 From: Andrew Xue Date: Thu, 28 May 2020 14:48:17 -0400 Subject: [PATCH] project_id not needed --- ext/opentelemetry-ext-cloud-trace/examples/basic_trace.py | 2 +- ext/opentelemetry-ext-cloud-trace/examples/client.py | 2 +- ext/opentelemetry-ext-cloud-trace/examples/server.py | 2 +- .../src/opentelemetry/ext/cloud_trace/__init__.py | 8 ++++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ext/opentelemetry-ext-cloud-trace/examples/basic_trace.py b/ext/opentelemetry-ext-cloud-trace/examples/basic_trace.py index 479cd8dcabe..6b61678f50b 100644 --- a/ext/opentelemetry-ext-cloud-trace/examples/basic_trace.py +++ b/ext/opentelemetry-ext-cloud-trace/examples/basic_trace.py @@ -5,7 +5,7 @@ trace.set_tracer_provider(TracerProvider()) -cloud_trace_exporter = CloudTraceSpanExporter(project_id="my-gcloud-project") +cloud_trace_exporter = CloudTraceSpanExporter() trace.get_tracer_provider().add_span_processor( SimpleExportSpanProcessor(cloud_trace_exporter) ) diff --git a/ext/opentelemetry-ext-cloud-trace/examples/client.py b/ext/opentelemetry-ext-cloud-trace/examples/client.py index 9e665600210..b34de83dba2 100644 --- a/ext/opentelemetry-ext-cloud-trace/examples/client.py +++ b/ext/opentelemetry-ext-cloud-trace/examples/client.py @@ -22,7 +22,7 @@ trace.set_tracer_provider(TracerProvider()) -cloud_trace_exporter = CloudTraceSpanExporter(project_id="my-gcloud-project") +cloud_trace_exporter = CloudTraceSpanExporter() trace.get_tracer_provider().add_span_processor( SimpleExportSpanProcessor(cloud_trace_exporter) ) diff --git a/ext/opentelemetry-ext-cloud-trace/examples/server.py b/ext/opentelemetry-ext-cloud-trace/examples/server.py index 89e6718563a..064811d2bc6 100644 --- a/ext/opentelemetry-ext-cloud-trace/examples/server.py +++ b/ext/opentelemetry-ext-cloud-trace/examples/server.py @@ -24,7 +24,7 @@ trace.set_tracer_provider(TracerProvider()) -cloud_trace_exporter = CloudTraceSpanExporter(project_id="my-gcloud-project") +cloud_trace_exporter = CloudTraceSpanExporter() trace.get_tracer_provider().add_span_processor( SimpleExportSpanProcessor(cloud_trace_exporter) ) diff --git a/ext/opentelemetry-ext-cloud-trace/src/opentelemetry/ext/cloud_trace/__init__.py b/ext/opentelemetry-ext-cloud-trace/src/opentelemetry/ext/cloud_trace/__init__.py index dfdd5ef4632..cd240fe2283 100644 --- a/ext/opentelemetry-ext-cloud-trace/src/opentelemetry/ext/cloud_trace/__init__.py +++ b/ext/opentelemetry-ext-cloud-trace/src/opentelemetry/ext/cloud_trace/__init__.py @@ -22,6 +22,7 @@ from google.cloud.trace_v2.proto.trace_pb2 import Span as ProtoSpan from google.cloud.trace_v2.proto.trace_pb2 import TruncatableString from google.rpc.status_pb2 import Status +import google.auth import opentelemetry.trace as trace_api from opentelemetry.sdk.trace import Event @@ -44,10 +45,13 @@ class CloudTraceSpanExporter(SpanExporter): """ def __init__( - self, project_id, client=None, + self, project_id=None, client=None, ): self.client = client or TraceServiceClient() - self.project_id = project_id + if not project_id: + _, self.project_id = google.auth.default() + else: + self.project_id = project_id def export(self, spans: Sequence[Span]) -> SpanExportResult: """Export the spans to Cloud Trace.