Fix

Author: Watson1978

lib/fluent/plugin/out_otlp.rb

@@ -45,10 +45,6 @@ class RetryableResponse < StandardError; end
     def configure(conf)
       super
 
-      OtlpOutput.const_set(:HTTP_LOGS_ENDPOINT, "#{@http_config.endpoint}/v1/logs".freeze)
-      OtlpOutput.const_set(:HTTP_METRICS_ENDPOINT, "#{@http_config.endpoint}/v1/metrics".freeze)
-      OtlpOutput.const_set(:HTTP_TRACES_ENDPOINT, "#{@http_config.endpoint}/v1/traces".freeze)
-
       @tls_settings = {}
       if @transport_config.protocol == :tls
         @tls_settings[:client_cert] = @transport_config.cert_path
@@ -86,20 +82,32 @@ def write(chunk)
 
     private
 
+    def http_logs_endpoint
+      "#{@http_config.endpoint}/v1/logs"
+    end
+
+    def http_metrics_endpoint
+      "#{@http_config.endpoint}/v1/metrics"
+    end
+
+    def http_traces_endpoint
+      "#{@http_config.endpoint}/v1/traces"
+    end
+
     def create_connection(chunk)
       record = JSON.parse(chunk.read)
       msg = record["message"]
 
       begin
         case record["type"]
         when Otlp::RECORD_TYPE_LOGS
-          uri = HTTP_LOGS_ENDPOINT
+          uri = http_logs_endpoint
           body = Otlp::Request::Logs.new(msg).encode
         when Otlp::RECORD_TYPE_METRICS
-          uri = HTTP_METRICS_ENDPOINT
+          uri = http_metrics_endpoint
           body = Otlp::Request::Metrics.new(msg).encode
         when Otlp::RECORD_TYPE_TRACES
-          uri = HTTP_TRACES_ENDPOINT
+          uri = http_traces_endpoint
           body = Otlp::Request::Traces.new(msg).encode
         end
       rescue Google::Protobuf::ParseError => e

test/fluent/plugin/test_out_otlp.rb

@@ -8,6 +8,8 @@
 require "webrick"
 
 class Fluent::Plugin::OtlpOutputTest < Test::Unit::TestCase
+  class ServerRequest < Struct.new(:request_method, :path, :header, :body); end
+
   DEFAULT_LOGGER = ::WEBrick::Log.new($stdout, ::WEBrick::BasicLog::FATAL)
 
   def config
@@ -29,18 +31,15 @@ def server_config
   def run_http_server
     server = ::WEBrick::HTTPServer.new(server_config)
     server.mount_proc("/v1/metrics") do |req, res|
-      @server_request = req
-      @server_request_body = req.body
+      @@server_request = ServerRequest.new(req.request_method.dup, req.path.dup, req.header.dup, req.body.dup)
       res.status = 200
     end
     server.mount_proc("/v1/traces") do |req, res|
-      @server_request = req
-      @server_request_body = req.body
+      @@server_request = ServerRequest.new(req.request_method.dup, req.path.dup, req.header.dup, req.body.dup)
       res.status = 200
     end
     server.mount_proc("/v1/logs") do |req, res|
-      @server_request = req
-      @server_request_body = req.body
+      @@server_request = ServerRequest.new(req.request_method.dup, req.path.dup, req.header.dup, req.body.dup)
       res.status = 200
     end
     server.start
@@ -55,16 +54,14 @@ def run_http_server
   def setup
     Fluent::Test.setup
 
-    @server_request = nil
-    @server_request_body = nil
-    @http_server_thread ||= Thread.new do
+    @@server_request = nil
+    @@http_server_thread ||= Thread.new do
       run_http_server
     end
   end
 
   def teardown
-    @server_request = nil
-    @server_request_body = nil
+    @@server_request = nil
   end
 
   def create_driver(conf = config)
@@ -84,10 +81,10 @@ def test_send_logs
       d.feed(event)
     end
 
-    assert_equal("/v1/logs", @server_request.path)
-    assert_equal("POST", @server_request.request_method)
-    assert_equal(["application/x-protobuf"], @server_request.header["content-type"])
-    assert_equal(TestData::ProtocolBuffers::LOGS, @server_request_body)
+    assert_equal("/v1/logs", @@server_request.path)
+    assert_equal("POST", @@server_request.request_method)
+    assert_equal(["application/x-protobuf"], @@server_request.header["content-type"])
+    assert_equal(TestData::ProtocolBuffers::LOGS, @@server_request.body)
   end
 
   def test_send_metrics
@@ -98,10 +95,10 @@ def test_send_metrics
       d.feed(event)
     end
 
-    assert_equal("/v1/metrics", @server_request.path)
-    assert_equal("POST", @server_request.request_method)
-    assert_equal(["application/x-protobuf"], @server_request.header["content-type"])
-    assert_equal(TestData::ProtocolBuffers::METRICS, @server_request_body)
+    assert_equal("/v1/metrics", @@server_request.path)
+    assert_equal("POST", @@server_request.request_method)
+    assert_equal(["application/x-protobuf"], @@server_request.header["content-type"])
+    assert_equal(TestData::ProtocolBuffers::METRICS, @@server_request.body)
   end
 
   def test_send_traces
@@ -112,10 +109,10 @@ def test_send_traces
       d.feed(event)
     end
 
-    assert_equal("/v1/traces", @server_request.path)
-    assert_equal("POST", @server_request.request_method)
-    assert_equal(["application/x-protobuf"], @server_request.header["content-type"])
-    assert_equal(TestData::ProtocolBuffers::TRACES, @server_request_body)
+    assert_equal("/v1/traces", @@server_request.path)
+    assert_equal("POST", @@server_request.request_method)
+    assert_equal(["application/x-protobuf"], @@server_request.header["content-type"])
+    assert_equal(TestData::ProtocolBuffers::TRACES, @@server_request.body)
   end
 
   def test_send_compressed_message
@@ -126,11 +123,11 @@ def test_send_compressed_message
       d.feed(event)
     end
 
-    assert_equal("/v1/logs", @server_request.path)
-    assert_equal("POST", @server_request.request_method)
-    assert_equal(["application/x-protobuf"], @server_request.header["content-type"])
-    assert_equal(["gzip"], @server_request.header["content-encoding"])
-    assert_equal(TestData::ProtocolBuffers::LOGS, decompress(@server_request_body).force_encoding(Encoding::ASCII_8BIT))
+    assert_equal("/v1/logs", @@server_request.path)
+    assert_equal("POST", @@server_request.request_method)
+    assert_equal(["application/x-protobuf"], @@server_request.header["content-type"])
+    assert_equal(["gzip"], @@server_request.header["content-encoding"])
+    assert_equal(TestData::ProtocolBuffers::LOGS, decompress(@@server_request.body).force_encoding(Encoding::ASCII_8BIT))
   end
 
   def decompress(data)