From 10cbe150224366395221a86aeb1ec906ce3b255d Mon Sep 17 00:00:00 2001
From: David Ashpole <dashpole@google.com>
Date: Tue, 27 Feb 2024 15:29:53 +0000
Subject: [PATCH] simplify logging in instrumentation quickstart

---
 examples/instrumentation-quickstart/docker-compose.yaml         | 1 -
 examples/instrumentation-quickstart/otel-collector-config.yaml  | 2 +-
 .../instrumentation-quickstart/src/main/resources/logback.xml   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/instrumentation-quickstart/docker-compose.yaml b/examples/instrumentation-quickstart/docker-compose.yaml
index 8aa73d92..c4793f78 100644
--- a/examples/instrumentation-quickstart/docker-compose.yaml
+++ b/examples/instrumentation-quickstart/docker-compose.yaml
@@ -21,7 +21,6 @@ services:
       - OTEL_EXPORTER_OTLP_ENDPOINT=http://otelcol:4317
       - OTEL_SERVICE_NAME=otel-quickstart-spring-boot
       - OTEL_METRIC_EXPORT_INTERVAL=5000
-      - GOOGLE_CLOUD_PROJECT
     volumes:
       - logs:/var/log:rw
     depends_on:
diff --git a/examples/instrumentation-quickstart/otel-collector-config.yaml b/examples/instrumentation-quickstart/otel-collector-config.yaml
index 6be5ee13..c195d404 100644
--- a/examples/instrumentation-quickstart/otel-collector-config.yaml
+++ b/examples/instrumentation-quickstart/otel-collector-config.yaml
@@ -46,7 +46,7 @@ receivers:
       - type: regex_parser
         parse_from: body["logging.googleapis.com/trace"]
         parse_to: body
-        regex: projects/.+/traces/(?P<trace_id>.*)
+        regex: (?P<trace_id>.*)
         trace:
           span_id:
             parse_from: body["logging.googleapis.com/spanId"]
diff --git a/examples/instrumentation-quickstart/src/main/resources/logback.xml b/examples/instrumentation-quickstart/src/main/resources/logback.xml
index a89b19f8..748ba22b 100644
--- a/examples/instrumentation-quickstart/src/main/resources/logback.xml
+++ b/examples/instrumentation-quickstart/src/main/resources/logback.xml
@@ -23,7 +23,7 @@
       <provider class="net.logstash.logback.composite.loggingevent.LoggingEventPatternJsonProvider">
         <pattern>
           {
-            "logging.googleapis.com/trace": "projects/${GOOGLE_CLOUD_PROJECT}/traces/%mdc{trace_id}",
+            "logging.googleapis.com/trace": "%mdc{trace_id}",
             "logging.googleapis.com/spanId": "%mdc{span_id}",
             "logging.googleapis.com/trace_sampled": "#asBoolean{%replace(%mdc{trace_flags}){'01', 'true'}}"
           }