fluent-plugin-opentelemetry 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa3bba6bc0556816b7f7fba2e7be82ffc2d629e484778042c7aab5113df8f514
-  data.tar.gz: f6bf4718017e97e2976ba2f2d74dc60fd85b2c7806087300a1e61788578ad528
+  metadata.gz: 7e88abfcc25a1079994f2801f2b32665bb39bb32408cff6efb91125ef9b60149
+  data.tar.gz: 2b64e708b7ea494e4c35e4218c4f33e2ca15f04ac55672d95dc9d7456435303c
 SHA512:
-  metadata.gz: 5a5b6d29a34477e583bcde8d81a174df7e8b55ec20ee93b7bf054882626621c2e800b610bd5025a0a8a96b80f6d29d4067a4f958f5f250e398ac2cf368e1439d
-  data.tar.gz: 8f514226a7c08fe6b890bae1a8004ec5f3cc58b267883339219937baa7f7c4aaade44fab72b791bcbcf246e83b5fdcf06544420371beb2b2521e3b6c437d9ae9
+  metadata.gz: 26fde29bef629246d797440d306b863ed6ed8cd57d0871f6c66b52b0c3109b453e6d836cb5b99d5b545d778cbb9f4893fdc37166499baf61e92de5bf478f60c5
+  data.tar.gz: 1510198977d2f3b71a58a7a85e9a948b40716bf036c84968b8bb5c1507d63553fd1a06dbc70633d788d110dbc510ef898710eaaf2727d76adfd8baba9b5c9e81

data/.rubocop.yml

@@ -1,3 +1,7 @@
+plugins:
+  - rubocop-performance
+  - rubocop-fluentd
+
 AllCops:
   Exclude:
     - 'lib/opentelemetry/**/*'
@@ -6,6 +10,15 @@ AllCops:
   SuggestExtensions: false
   TargetRubyVersion: 3.2
 
+# rubocop-fluentd
+Lint/FluentdPluginLogScope:
+  Enabled: true
+Lint/FluentdPluginConfigParamDefaultTime:
+  Enabled: true
+Performance/FluentdPluginLogStringInterpolation:
+  Enabled: true
+
+# rubocop
 Gemspec/DevelopmentDependencies:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.3.0] - 2025-07-23
+
+- in_opentelemetry: add ${type} placeholder support in tag parameter (#8)
+- in_opentelemetry: use String for record keys (#6)
+
 ## [0.2.0] - 2025-06-26
 
 - Make gRPC sending and receiving optional (#4)

data/README.md

@@ -34,6 +34,33 @@ To receive data, this plugin requires `<http>` or `<grpc>` section, or both.
 |-----------|--------|----------------------|----------|
 | tag       | string | The tag of the event | required |
 
+`tag` parameter supports `${type}` placeholder and it will be expanded with data type.
+
+* log data
+  * `${type}` will be replaced to `logs`
+* metric data
+  * `${type}` will be replaced to `metrics`
+* trace data
+  * `${type}` will be replaced to `traces`
+
+This can be used to change the output destination for each message type.
+
+Example:
+
+```
+<source>
+  @type opentelemetry
+
+  # Expand to opentelemetry.logs, opentelemetry.metrics, opentelemetry.traces according to received data.
+  tag opentelemetry.${type}
+
+  <http>
+    bind 127.0.0.1
+    port 4318
+  </http>
+</source>
+```
+
 #### `<http>` section
 
 This requires to receive data via HTTP/HTTPS.

data/lib/fluent/plugin/in_opentelemetry.rb

@@ -43,6 +43,8 @@ module Fluent::Plugin
     def configure(conf)
       super
 
+      expand_tag_placeholders(@tag)
+
       if @grpc_config && !defined?(GRPC)
         raise Fluent::ConfigError, "To use gRPC feature, please install grpc gem such as 'fluent-gem install grpc'."
       end
@@ -59,13 +61,13 @@ module Fluent::Plugin
         http_handler = Opentelemetry::HttpInputHandler.new
         http_server_create_http_server(:in_opentelemetry_http_server, addr: @http_config.bind, port: @http_config.port, logger: log) do |serv|
           serv.post("/v1/logs") do |req|
-            http_handler.logs(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_LOGS, message: record }) }
+            http_handler.logs(req) { |record| router.emit(tag_for(Opentelemetry::RECORD_TYPE_LOGS), Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_LOGS, "message" => record }) }
           end
           serv.post("/v1/metrics") do |req|
-            http_handler.metrics(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_METRICS, message: record }) }
+            http_handler.metrics(req) { |record| router.emit(tag_for(Opentelemetry::RECORD_TYPE_METRICS), Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_METRICS, "message" => record }) }
           end
           serv.post("/v1/traces") do |req|
-            http_handler.traces(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_TRACES, message: record }) }
+            http_handler.traces(req) { |record| router.emit(tag_for(Opentelemetry::RECORD_TYPE_TRACES), Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_TRACES, "message" => record }) }
           end
         end
       end
@@ -75,17 +77,31 @@ module Fluent::Plugin
           grpc_handler = Opentelemetry::GrpcInputHandler.new(@grpc_config, log)
           grpc_handler.run(
             logs: lambda { |record|
-              router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_LOGS, message: record })
+              router.emit(tag_for(Opentelemetry::RECORD_TYPE_LOGS), Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_LOGS, "message" => record })
             },
             metrics: lambda { |record|
-              router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_METRICS, message: record })
+              router.emit(tag_for(Opentelemetry::RECORD_TYPE_METRICS), Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_METRICS, "message" => record })
             },
             traces: lambda { |record|
-              router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_TRACES, message: record })
+              router.emit(tag_for(Opentelemetry::RECORD_TYPE_TRACES), Fluent::EventTime.now, { "type" => Opentelemetry::RECORD_TYPE_TRACES, "message" => record })
             }
           )
         end
       end
     end
+
+    private
+
+    def expand_tag_placeholders(tag)
+      @expand_tag_placeholders ||= {
+        Opentelemetry::RECORD_TYPE_LOGS => tag.gsub(Opentelemetry::PLACEHOLDER_TYPE, Opentelemetry::PLACEHOLDER_TYPE_LOGS),
+        Opentelemetry::RECORD_TYPE_METRICS => tag.gsub(Opentelemetry::PLACEHOLDER_TYPE, Opentelemetry::PLACEHOLDER_TYPE_METRICS),
+        Opentelemetry::RECORD_TYPE_TRACES => tag.gsub(Opentelemetry::PLACEHOLDER_TYPE, Opentelemetry::PLACEHOLDER_TYPE_TRACES)
+      }
+    end
+
+    def tag_for(type)
+      @expand_tag_placeholders[type]
+    end
   end
 end

data/lib/fluent/plugin/opentelemetry/constant.rb

@@ -16,6 +16,11 @@ module Fluent::Plugin::Opentelemetry
   RECORD_TYPE_METRICS = "opentelemetry_metrics"
   RECORD_TYPE_TRACES = "opentelemetry_traces"
 
+  PLACEHOLDER_TYPE = "${type}"
+  PLACEHOLDER_TYPE_LOGS = "logs"
+  PLACEHOLDER_TYPE_METRICS = "metrics"
+  PLACEHOLDER_TYPE_TRACES = "traces"
+
   TLS_VERSIONS_MAP =
     begin
       map = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-opentelemetry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Shizuo Fujita
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.0
 specification_version: 4
 summary: Fluentd input/output plugin to forward OpenTelemetry Protocol data.
 test_files: []