constants.rb in fluent-plugin-google-cloud-0.7.3

- old
+ new

@@ -369,20 +369,28 @@
       "#{ML_CONSTANTS[:service]}/trial_id" : "#{ML_TRIAL_ID}"
     }
     label_map { "name": "#{ML_CONSTANTS[:service]}/job_id/log_area" }
   ).freeze
 
-  CONFIG_CUSTOM_TRACE_KEY_SPECIFIED = %(
-    trace_key custom_trace_key
+  CONFIG_CUSTOM_INSERT_ID_KEY_SPECIFIED = %(
+    insert_id_key custom_insert_id_key
   ).freeze
 
+  CONFIG_CUSTOM_OPERATION_KEY_SPECIFIED = %(
+    operation_key custom_operation_key
+  ).freeze
+
+  CONFIG_CUSTOM_SOURCE_LOCATION_KEY_SPECIFIED = %(
+    source_location_key custom_source_location_key
+  ).freeze
+
   CONFIG_CUSTOM_SPAN_ID_KEY_SPECIFIED = %(
     span_id_key custom_span_id_key
   ).freeze
 
-  CONFIG_CUSTOM_INSERT_ID_KEY_SPECIFIED = %(
-    insert_id_key custom_insert_id_key
+  CONFIG_CUSTOM_TRACE_KEY_SPECIFIED = %(
+    trace_key custom_trace_key
   ).freeze
 
   # Service configurations for various services.
 
   # GCE.
@@ -738,10 +746,11 @@
     'requestSize' => 210,
     'status' => 200,
     'responseSize' => 65,
     'userAgent' => 'USER AGENT 1.0',
     'remoteIp' => '55.55.55.55',
+    'serverIp' => '66.66.66.66',
     'referer' => 'http://referer/',
     'cacheHit' => true,
     'cacheValidatedWithOriginServer' => true
   }.freeze
 
@@ -749,16 +758,28 @@
     'file' => 'source/file',
     'function' => 'my_function',
     'line' => 18
   }.freeze
 
+  SOURCE_LOCATION_MESSAGE2 = {
+    'file' => 'src/file',
+    'function' => 'my_func',
+    'line' => 8
+  }.freeze
+
   OPERATION_MESSAGE = {
     'id' => 'op_id',
     'producer' => 'my/app',
     'last' => true
   }.freeze
 
+  OPERATION_MESSAGE2 = {
+    'id' => 'op_id2',
+    'producer' => 'my/app2',
+    'last' => false
+  }.freeze
+
   CUSTOM_LABELS_MESSAGE = {
     'customKey' => 'value'
   }.freeze
   CONFLICTING_LABEL_KEY = "#{COMPUTE_CONSTANTS[:service]}/resource_name".freeze
 
@@ -948,6 +969,17 @@
     {
       'google.rpc.debuginfo-bin' => debug_info.to_proto,
       'grpc-status-details-bin' => status_details.to_proto
     }.freeze
   end
+
+  PRESERVED_KEYS_MAP = {
+    'time' => K8S_TIMESTAMP,
+    'severity' => CONTAINER_SEVERITY,
+    DEFAULT_HTTP_REQUEST_KEY => HTTP_REQUEST_MESSAGE,
+    DEFAULT_INSERT_ID_KEY => INSERT_ID,
+    DEFAULT_OPERATION_KEY => OPERATION_MESSAGE,
+    DEFAULT_SOURCE_LOCATION_KEY => SOURCE_LOCATION_MESSAGE,
+    DEFAULT_SPAN_ID_KEY => SPAN_ID,
+    DEFAULT_TRACE_KEY => TRACE
+  }.freeze
 end