Update quickstart sample to output correct severity strings

GoogleCloudPlatform · Apr 17, 2024 · 0c8acf2 · 0c8acf2
1 parent 97a8f20
commit 0c8acf2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/examples/instrumentation-quickstart/otel-collector-config.yaml b/examples/instrumentation-quickstart/otel-collector-config.yaml
@@ -35,6 +35,18 @@ receivers:
           layout: '%Y-%m-%dT%H:%M:%S.%fZ'
         severity:
           parse_from: body.severity
+          preset: none
+          # parse minimal set of severity strings that Cloud Logging explicitly supports
+          # https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry#LogSeverity
+          mapping:
+            debug: debug
+            info: info
+            info3: notice
+            warn: warning
+            error: error
+            fatal: critical
+            fatal3: alert
+            fatal4: emergency
 
       # set trace_flags to SAMPLED if GCP attribute is set to true
       - type: add

diff --git a/examples/instrumentation-quickstart/src/main/resources/logback.xml b/examples/instrumentation-quickstart/src/main/resources/logback.xml
@@ -25,15 +25,16 @@
           {
             "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'}}"
+            "logging.googleapis.com/trace_sampled": "#asBoolean{%replace(%mdc{trace_flags}){'01', 'true'}}",
+            "severity": "%replace(%replace(%level){'WARN', 'WARNING'}){'TRACE', 'DEBUG'}"
           }
         </pattern>
       </provider>
 
       <!-- Rename fields for the Logging agent -->
       <fieldNames>
-        <level>severity</level>
         <timestamp>timestamp</timestamp>
+        <level>[ignore]</level>
         <levelValue>[ignore]</levelValue>
       </fieldNames>
 
@@ -45,7 +46,7 @@
     <!-- [END opentelemetry_instrumentation_logbackxml] -->
   </appender>
 
-  <root level="INFO">
+  <root level="TRACE">
     <appender-ref ref="STDOUT"/>
   </root>