fluent-plugin-google-cloud 0.6.5.pre.1 → 0.6.5

data/test/plugin/constants.rb

@@ -23,7 +23,6 @@ module Constants
   # Attributes used for the GCE metadata service.
   PROJECT_ID = 'test-project-id'
   ZONE = 'us-central1-b'
-  ZONE2 = 'us-central1-c'
   FULLY_QUALIFIED_ZONE = 'projects/' + PROJECT_ID + '/zones/' + ZONE
   VM_ID = '9876543210'
 
@@ -52,19 +51,6 @@ module Constants
   MANAGED_VM_BACKEND_NAME = 'default'
   MANAGED_VM_BACKEND_VERSION = 'guestbook2.0'
 
-  # Docker Container labels.
-  DOCKER_CONTAINER_ID = '0d0f03ff8d3c42688692536d1af77a28cd135c0a5c531f25a31'
-  DOCKER_CONTAINER_ID2 = '42688692536d1af77a28cd135c0a5c531f25a0317d37da427e3'
-  DOCKER_CONTAINER_NAME = 'happy_hippo'
-  DOCKER_CONTAINER_NAME2 = 'sad_panda'
-  DOCKER_CONTAINER_STREAM_STDOUT = 'stdout'
-  DOCKER_CONTAINER_STREAM_STDERR = 'stderr'
-  # Timestamp for 1234567890 seconds and 987654321 nanoseconds since epoch.
-  DOCKER_CONTAINER_TIMESTAMP = '2009-02-13T23:31:30.987654321Z'
-  DOCKER_CONTAINER_SECONDS_EPOCH = 1_234_567_890
-  DOCKER_CONTAINER_NANOS = 987_654_321
-  DOCKER_CONTAINER_APPLICATION_LOG_TAG = 'nginx-access-log'
-
   # Container Engine / Kubernetes specific labels.
   CONTAINER_CLUSTER_NAME = 'cluster-1'
   CONTAINER_NAMESPACE_ID = '898268c8-4a36-11e5-9d81-42010af0194c'
@@ -159,14 +145,6 @@ module Constants
     monitoring_type prometheus
   )
 
-  ENABLE_METADATA_AGENT_CONFIG = %(
-    enable_metadata_agent true
-  )
-
-  DISABLE_METADATA_AGENT_CONFIG = %(
-    enable_metadata_agent false
-  )
-
   CUSTOM_METADATA_CONFIG = %(
     project_id #{CUSTOM_PROJECT_ID}
     zone #{CUSTOM_ZONE}
@@ -218,17 +196,11 @@ module Constants
     label_map { "name": "#{ML_CONSTANTS[:service]}/job_id/log_area" }
   )
 
-  CONFIG_KEEP_TRACE_KEY_TRUE = %(
-    keep_trace_key true
-  )
-
   CONFIG_CUSTOM_TRACE_KEY_SPECIFIED = %(
     trace_key custom_trace_key
   )
 
   # Service configurations for various services.
-
-  # GCE.
   COMPUTE_PARAMS = {
     resource: {
       type: COMPUTE_CONSTANTS[:resource_type],
@@ -244,7 +216,6 @@ module Constants
     }
   }
 
-  # GAE.
   VMENGINE_PARAMS = {
     resource: {
       type: APPENGINE_CONSTANTS[:resource_type],
@@ -262,7 +233,6 @@ module Constants
     }
   }
 
-  # GKE Container.
   CONTAINER_TAG = "kubernetes.#{CONTAINER_POD_NAME}_" \
                   "#{CONTAINER_NAMESPACE_NAME}_#{CONTAINER_CONTAINER_NAME}"
 
@@ -315,79 +285,6 @@ module Constants
     }
   }
 
-  CONTAINER_FROM_APPLICATION_PARAMS = {
-    resource: {
-      type: CONTAINER_CONSTANTS[:resource_type],
-      labels: {
-        'cluster_name' => CONTAINER_CLUSTER_NAME,
-        'namespace_id' => CONTAINER_NAMESPACE_ID,
-        'instance_id' => VM_ID,
-        'pod_id' => CONTAINER_POD_ID,
-        'container_name' => CONTAINER_CONTAINER_NAME,
-        'zone' => ZONE
-      }
-    },
-    log_name: 'test',
-    project_id: PROJECT_ID,
-    labels: {
-      "#{COMPUTE_CONSTANTS[:service]}/resource_name" => HOSTNAME
-    }
-  }
-
-  # Docker Container.
-  DOCKER_CONTAINER_TAG = "container.#{DOCKER_CONTAINER_ID}." \
-                         "#{DOCKER_CONTAINER_NAME}"
-  DOCKER_CONTAINER_TAG_WITH_APPLICATION =
-    "application-container.#{DOCKER_CONTAINER_NAME}." \
-    "#{DOCKER_CONTAINER_APPLICATION_LOG_TAG}"
-
-  DOCKER_CONTAINER_PARAMS = {
-    resource: {
-      type: DOCKER_CONSTANTS[:resource_type],
-      labels: {
-        'container_id' => DOCKER_CONTAINER_ID,
-        'location' => ZONE
-      }
-    },
-    log_name: "container.#{DOCKER_CONTAINER_ID}.#{DOCKER_CONTAINER_NAME}",
-    project_id: PROJECT_ID,
-    labels: {
-      "#{COMPUTE_CONSTANTS[:service]}/resource_id" => VM_ID,
-      "#{COMPUTE_CONSTANTS[:service]}/resource_name" => HOSTNAME,
-      "#{DOCKER_CONSTANTS[:service]}/container_name" => DOCKER_CONTAINER_NAME
-    }
-  }
-  DOCKER_CONTAINER_PARAMS_WITH_STREAM_STDOUT = DOCKER_CONTAINER_PARAMS.merge(
-    labels: DOCKER_CONTAINER_PARAMS[:labels].merge(
-      "#{DOCKER_CONSTANTS[:service]}/stream" => DOCKER_CONTAINER_STREAM_STDOUT
-    )
-  )
-  DOCKER_CONTAINER_PARAMS_WITH_METADATA_OVERWRITTEN = \
-    DOCKER_CONTAINER_PARAMS.merge(
-      resource: DOCKER_CONTAINER_PARAMS[:resource].merge(
-        labels: DOCKER_CONTAINER_PARAMS[:resource][:labels].merge(
-          'container_id' => DOCKER_CONTAINER_ID2
-        )
-      ),
-      labels: DOCKER_CONTAINER_PARAMS[:labels].merge(
-        "#{DOCKER_CONSTANTS[:service]}/container_name" =>
-          DOCKER_CONTAINER_NAME2,
-        "#{DOCKER_CONSTANTS[:service]}/stream" =>
-          DOCKER_CONTAINER_STREAM_STDERR
-      )
-    )
-  DOCKER_CONTAINER_PARAMS_WITH_ZONE2 = DOCKER_CONTAINER_PARAMS.merge(
-    resource: DOCKER_CONTAINER_PARAMS[:resource].merge(
-      labels: DOCKER_CONTAINER_PARAMS[:resource][:labels].merge(
-        'location' => ZONE2
-      )
-    )
-  )
-  DOCKER_CONTAINER_WITH_APPLICATION_PARAMS = DOCKER_CONTAINER_PARAMS.merge(
-    log_name: DOCKER_CONTAINER_TAG_WITH_APPLICATION
-  )
-
-  # Cloud Functions.
   CLOUDFUNCTIONS_TAG = "kubernetes.#{CLOUDFUNCTIONS_POD_NAME}_" \
                         "#{CLOUDFUNCTIONS_NAMESPACE_NAME}_" \
                         "#{CLOUDFUNCTIONS_CONTAINER_NAME}"
@@ -433,7 +330,6 @@ module Constants
     }
   }
 
-  # Cloud Dataflow.
   DATAFLOW_PARAMS = {
     resource: {
       type: DATAFLOW_CONSTANTS[:resource_type],
@@ -453,7 +349,6 @@ module Constants
     }
   }
 
-  # Cloud Dataproc.
   DATAPROC_PARAMS = {
     resource: {
       type: DATAPROC_CONSTANTS[:resource_type],
@@ -472,7 +367,6 @@ module Constants
     }
   }
 
-  # Cloud ML.
   ML_PARAMS = {
     resource: {
       type: ML_CONSTANTS[:resource_type],
@@ -536,6 +430,30 @@ module Constants
     'cacheValidatedWithOriginServer' => true
   }
 
+  SOURCE_LOCATION_MESSAGE = {
+    'file' => 'source/file',
+    'function' => 'my_function',
+    'line' => 18
+  }
+
+  OPERATION_MESSAGE = {
+    'id' => 'op_id',
+    'producer' => 'my/app',
+    'last' => true
+  }
+
+  LOG_ENTRY_SUBFIELDS_PARAMS = {
+    # payload key, destination key, payload value
+    DEFAULT_HTTP_REQUEST_KEY => ['httpRequest', HTTP_REQUEST_MESSAGE],
+    DEFAULT_SOURCE_LOCATION_KEY => ['sourceLocation', SOURCE_LOCATION_MESSAGE],
+    DEFAULT_OPERATION_KEY => ['operation', OPERATION_MESSAGE]
+  }
+
+  CUSTOM_LABELS_MESSAGE = {
+    'customKey' => 'value'
+  }
+  CONFLICTING_LABEL_KEY = "#{COMPUTE_CONSTANTS[:service]}/resource_name"
+
   # Tags and their sanitized and encoded version.
   VALID_TAGS = {
     'test' => 'test',
@@ -559,57 +477,4 @@ module Constants
     '' => '_'
   }
   ALL_TAGS = VALID_TAGS.merge(INVALID_TAGS)
-
-  # Stub value for Monitored resources from Metadata Agent.
-  MONITORED_RESOURCE_STUBS = {
-    # Implicit GCE instance.
-    IMPLICIT_MONITORED_RESOURCE_UNIQUE_KEY => {
-      'unique_id' => IMPLICIT_MONITORED_RESOURCE_UNIQUE_KEY,
-      'monitored_resource' => '{' \
-        "\"type\": \"#{COMPUTE_CONSTANTS[:resource_type]}\"," \
-        '"labels": {' \
-          "\"zone\": \"#{ZONE}\"," \
-          "\"instance_id\": \"#{VM_ID}\"" \
-        '}' \
-      '}'
-    },
-    # Docker container stderr / stdout logs.
-    DOCKER_CONSTANTS[:resource_type] => {
-      'unique_id' => "container.#{DOCKER_CONTAINER_ID}",
-      'monitored_resource' => '{' \
-        "\"type\": \"#{DOCKER_CONSTANTS[:resource_type]}\"," \
-        '"labels": {' \
-          "\"location\": \"#{ZONE2}\"," \
-          "\"container_id\": \"#{DOCKER_CONTAINER_ID}\"" \
-        '}' \
-      '}'
-    },
-    # Docker container application logs.
-    "#{DOCKER_CONSTANTS[:resource_type]}_application" => {
-      'unique_id' => "containerName.#{DOCKER_CONTAINER_NAME}",
-      'monitored_resource' => '{' \
-        "\"type\": \"#{DOCKER_CONSTANTS[:resource_type]}\"," \
-        '"labels": {' \
-          "\"location\": \"#{ZONE}\"," \
-          "\"container_id\": \"#{DOCKER_CONTAINER_ID}\"" \
-        '}' \
-      '}'
-    },
-    # GKE container application logs.
-    "#{CONTAINER_CONSTANTS[:resource_type]}_application" => {
-      'unique_id' => "gke_containerName.#{CONTAINER_NAMESPACE_ID}" \
-                     ".#{CONTAINER_POD_NAME}.#{CONTAINER_CONTAINER_NAME}",
-      'monitored_resource' => '{' \
-        "\"type\": \"#{CONTAINER_CONSTANTS[:resource_type]}\"," \
-        '"labels": {' \
-          "\"cluster_name\": \"#{CONTAINER_CLUSTER_NAME}\"," \
-          "\"container_name\": \"#{CONTAINER_CONTAINER_NAME}\"," \
-          "\"instance_id\": \"#{VM_ID}\"," \
-          "\"namespace_id\": \"#{CONTAINER_NAMESPACE_ID}\"," \
-          "\"pod_id\": \"#{CONTAINER_POD_ID}\"," \
-          "\"zone\": \"#{ZONE}\"" \
-        '}' \
-      '}'
-    }
-  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.5.pre.1
+  version: 0.6.5
 platform: ruby
 authors:
 - Todd Derr
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: excon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.57.1
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -263,9 +249,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8