add config check

Author: Watson1978

.rubocop.yml

@@ -38,6 +38,13 @@ Style/ClassVars:
 Style/FetchEnvVar:
   Enabled: false
 
+Style/NumericLiterals:
+  Enabled: false
+
+Style/MixinUsage:
+  Exclude:
+    - 'test/helper.rb'
+
 Style/PercentLiteralDelimiters:
   Enabled: false
 

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-04-15 08:39:58 UTC using RuboCop version 1.75.2.
+# on 2025-04-16 04:41:33 UTC using RuboCop version 1.75.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -54,25 +54,6 @@ Style/IfUnlessModifier:
   Exclude:
     - 'lib/fluent/plugin/out_otlp.rb'
 
-# Offense count: 1
-Style/MixinUsage:
-  Exclude:
-    - 'test/helper.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Strict, AllowedNumbers, AllowedPatterns.
-Style/NumericLiterals:
-  MinDigits: 6
-
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
-# AllowedMethods: present?, blank?, presence, try, try!
-Style/SafeNavigation:
-  Exclude:
-    - 'lib/fluent/plugin/out_otlp.rb'
-
 # Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, AllowedMethods.

lib/fluent/plugin/in_otlp.rb

@@ -35,17 +35,67 @@ class OtlpInput < Input
     desc "The tag of the event."
     config_param :tag, :string
 
-    config_section :http, required: false, multi: false, init: true, param_name: :http_config do
+    config_section :http, required: false, multi: false, init: false, param_name: :http_config do
       desc "The address to bind to."
       config_param :bind, :string, default: "0.0.0.0"
       desc "The port to listen to."
       config_param :port, :integer, default: 4318
     end
 
+
+    config_section :grpc, required: false, multi: false, init: false, param_name: :grpc_config do
+      desc "The address to bind to."
+      config_param :bind, :string, default: "0.0.0.0"
+      desc "The port to listen to."
+      config_param :port, :integer, default: 4317
+    end
+
     config_section :transport, required: false, multi: false, init: true, param_name: :transport_config do
       config_argument :protocol, :enum, list: [:tls], default: nil
     end
 
+    def configure(conf)
+      super
+
+      unless [@http_config, @grpc_config].any?
+        raise Fluent::ConfigError, "Please configure either <http> or <grpc> section, or both."
+      end
+    end
+
+    def start
+      super
+
+      if @http_config
+        http_handler = HttpHandler.new
+        http_server_create_http_server(:in_otlp_http_server_helper, 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: Otlp::RECORD_TYPE_LOGS, message: record }) }
+          end
+          serv.post("/v1/metrics") do |req|
+            http_handler.metrics(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_METRICS, message: record }) }
+          end
+          serv.post("/v1/traces") do |req|
+            http_handler.traces(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_TRACES, message: record }) }
+          end
+        end
+      end
+
+      if @grpc_config
+        grpc_handler = GrpcHandler.new
+        grpc_handler.run(
+          logs: lambda { |record|
+            router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_LOGS, message: record })
+          },
+          metrics: lambda { |record|
+            router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_METRICS, message: record })
+          },
+          traces: lambda { |record|
+            router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_TRACES, message: record })
+          }
+        )
+      end
+    end
+
     class HttpHandler
       def logs(req, &block)
         common(req, Otlp::Request::Logs, Otlp::Response::Logs, &block)
@@ -152,35 +202,5 @@ def run(logs:, metrics:, traces:)
         end
       end
     end
-
-    def start
-      super
-
-      http_handler = HttpHandler.new
-      http_server_create_http_server(:in_otlp_http_server_helper, 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: Otlp::RECORD_TYPE_LOGS, message: record }) }
-        end
-        serv.post("/v1/metrics") do |req|
-          http_handler.metrics(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_METRICS, message: record }) }
-        end
-        serv.post("/v1/traces") do |req|
-          http_handler.traces(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_TRACES, message: record }) }
-        end
-      end
-
-      grpc_handler = GrpcHandler.new
-      grpc_handler.run(
-        logs: lambda { |record|
-          router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_LOGS, message: record })
-        },
-        metrics: lambda { |record|
-          router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_METRICS, message: record })
-        },
-        traces: lambda { |record|
-          router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_TRACES, message: record })
-        }
-      )
-    end
   end
 end

lib/fluent/plugin/out_otlp.rb

@@ -52,6 +52,10 @@ class RetryableResponse < StandardError; end
     def configure(conf)
       super
 
+      unless [@http_config, @grpc_config].one?
+        raise Fluent::ConfigError, "Please configure either <http> or <grpc> section."
+      end
+
       @http_handler = HttpHandler.new(@http_config, @transport_config, log) if @http_config
       @grpc_handler = GrpcHandler.new(@grpc_config, @transport_config, log) if @grpc_config
     end
@@ -65,14 +69,10 @@ def format(tag, time, record)
     end
 
     def write(chunk)
-      if @http_handler
-        @http_handler.export(chunk)
-
-        return
-      end
-
       if @grpc_handler
         @grpc_handler.export(chunk)
+      else
+        @http_handler.export(chunk)
       end
     end