fluent-plugin-application-insights 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfa9d92dcee9f67b521133f83b7381e1a73d6b35
-  data.tar.gz: c8a69e7f304425e4f915dd17e8ad979399333af9
+  metadata.gz: 16cd7a0fed351fcf6f1c5c9030454658ea2bb1e6
+  data.tar.gz: '08af822420fb65b336283d29cd4fb23800aa3b10'
 SHA512:
-  metadata.gz: 6794875d0ae52ea3f9d97da680958902c20dd187471312d6332b889148c7c00f0c20102b5f6e75ba4532a0ab282e12c95bfb188410abc4de70fcb8816c3566a8
-  data.tar.gz: ed67f84b150d180cbb43e6301c93b9031a004f4515184203575f3678190f98967be764ba44ee0bef15e7e24a97ce1591b46ba5fcdac27035a9c20a80e4a02df4
+  metadata.gz: 73ff2242c21c5be630d7a10e15e406e9f517856261be253fa055fcd02dc66674b0f4d42882676d0612f17fef820612fccc5a22f2507675b6e68122c047b64071
+  data.tar.gz: e0933edfcbd3ff4f4c56185a166f506ddf47e7e74d107acb3f72051484f18546f2c943c8f0242e42b6af05232d1e4b3b04b536147a79d06522baab8f89f75f38

data/fluent-plugin-application-insights.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-application-insights"
-  spec.version = "0.2.0"
+  spec.version = "0.2.1"
   spec.authors = ["Microsoft Corporation"]
   spec.email   = ["ctdiagcore@microsoft.com"]
 

data/lib/fluent/plugin/out_application_insights.rb

@@ -123,9 +123,13 @@ module Fluent::Plugin
 
           envelope = Channel::Contracts::Envelope.new
           Channel::Contracts::Envelope.json_mappings.each do |attr, name|
-            envelope.send(:"#{attr}=", record[name]) if record[name]
+            property = record.delete(name)
+            envelope.send(:"#{attr}=", property) if property
           end
 
+          # There could be extra properties added during the fluentd pipeline. Merge the extra properties so they are not lost.
+          merge_extra_properties_standard_schema record, envelope
+
           @tc.channel.queue.push(envelope)
         else
           log.warn "Unknown telemetry type #{base_type}. Event will be treated as as non standard schema event."
@@ -147,6 +151,14 @@ module Fluent::Plugin
       end
     end
 
+    def merge_extra_properties_standard_schema(record, envelope)
+      return if record.empty?
+
+      envelope.data["baseData"]["properties"] ||= {}
+      envelope.data["baseData"]["properties"].merge!(record)
+      stringify_properties(envelope.data["baseData"]["properties"])
+    end
+
     def process_non_standard_schema_log(record, time)
       time = record.delete(@time_property) || time
       context = get_context_non_standard_schema(record)

data/test/plugin/test_out_application_insights.rb

@@ -83,6 +83,15 @@ class ApplicationInsightsOutputTest < Test::Unit::TestCase
       assert_true logs.all?{ |log| log.include?("Unknown telemetry type unknown") }
     end
 
+    test 'extra properties are not lost after processing' do
+      time = event_time("2011-01-02 13:14:15 UTC")
+      @d.run(default_tag: 'test', shutdown: false) do
+        @d.feed(time, {"name" => "telemetry name", "data" => { "baseType" => "RequestData", "baseData" => {} }, "kubernetes" => { "pod_name" => "frontend" }})
+      end
+
+      envelope = @d.instance.tc.channel.queue[0]
+      assert_equal({ "kubernetes" => "{\"pod_name\":\"frontend\"}" }, envelope.data["baseData"]["properties"])
+    end
   end
 
   sub_test_case 'set context on standard schema event' do
@@ -149,8 +158,12 @@ class ApplicationInsightsOutputTest < Test::Unit::TestCase
       envelope = d.instance.tc.channel.queue[0]
       assert_not_nil envelope.tags
       assert_equal "frontend", envelope.tags["ai.cloud.role"]
-      # Extra property that is not part of Envelope (kubernetes_container_name, other_prop) is ignored
-      assert_nil envelope.data["baseData"]["properties"]
+
+      extra_properties = {
+        "kubernetes_container_name" => "frontend",
+        "other_prop" => "prop value"
+      }
+      assert_equal extra_properties, envelope.data["baseData"]["properties"]
     end
 
     test 'context tag source is nested property path' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-application-insights
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: This is the fluentd output plugin for Azure Application Insights.