Rename plugin name

Signed-off-by: Shizuo Fujita <[email protected]>

Author: Watson1978

Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-# Specify your gem's dependencies in fluent-plugin-otlp.gemspec
+# Specify your gem's dependencies in fluent-plugin-opentelemetry.gemspec
 gemspec
 
 gem "grpc-tools"

README.md

@@ -1,4 +1,4 @@
-# Fluent::Plugin::Otlp
+# fluent-plugin-opentelemetry
 
 [Fluentd](https://fluentd.org/) input/output plugin to forward [OpenTelemetry Protocol](https://github.com/open-telemetry/opentelemetry-proto) data.
 
@@ -7,13 +7,13 @@
 ### RubyGems
 
 ```sh
-gem install fluent-plugin-otlp
+gem install fluent-plugin-opentelemetry
 ```
 
 ### Bundler
 
 ```ruby
-gem "fluent-plugin-otlp"
+gem "fluent-plugin-opentelemetry"
 ```
 
 And then execute:
@@ -63,8 +63,8 @@ Refer [Config: Transport Section](https://docs.fluentd.org/configuration/transpo
 
 ```
 <source>
-  @type otlp
-  tag otlp
+  @type opentelemetry
+  tag opentelemetry
 
   <http>
     bind 0.0.0.0
@@ -137,8 +137,8 @@ Refer [Config: Buffer Section](https://docs.fluentd.org/configuration/buffer-sec
 #### Example
 
 ```
-<match otlp.**>
-  @type otlp
+<match opentelemetry.**>
+  @type opentelemetry
 
   <http>
     endpoint "https://127.0.0.1:4318"

example/fluentd/Dockerfile

@@ -7,7 +7,7 @@ RUN apt-get update && \
     make \
     gcc \
     git
-RUN git clone https://github.com/fluent-plugins-nursery/fluent-plugin-otlp.git && \
-    cd fluent-plugin-otlp && \
-    gem build fluent-plugin-otlp.gemspec && \
-    gem install fluent-plugin-otlp-*.gem
+RUN git clone https://github.com/fluent-plugins-nursery/fluent-plugin-opentelemetry.git && \
+    cd fluent-plugin-opentelemetry && \
+    gem build fluent-plugin-opentelemetry.gemspec && \
+    gem install fluent-plugin-opentelemetry-*.gem

fluent-plugin-otlp.gemspec fluent-plugin-opentelemetry.gemspecfluent-plugin-otlp.gemspec renamed to fluent-plugin-opentelemetry.gemspec

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.name = "fluent-plugin-otlp"
+  spec.name = "fluent-plugin-opentelemetry"
   spec.version = "0.1.0"
   spec.authors = ["Shizuo Fujita"]
   spec.email = ["[email protected]"]
 
   spec.summary = "Fluentd input/output plugin to forward OpenTelemetry Protocol data."
   spec.description = "Fluentd input/output plugin to forward OpenTelemetry Protocol data."
-  spec.homepage = "https://github.com/fluent-plugins-nursery/fluent-plugin-otlp"
+  spec.homepage = "https://github.com/fluent-plugins-nursery/fluent-plugin-opentelemetry"
   spec.license = "Apache-2.0"
   spec.required_ruby_version = ">= 3.2.0"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/fluent-plugins-nursery/fluent-plugin-otlp"
+  spec.metadata["source_code_uri"] = "https://github.com/fluent-plugins-nursery/fluent-plugin-opentelemetry"
   spec.metadata["rubygems_mfa_required"] = "true"
 
   # Specify which files should be added to the gem when it is released.

lib/fluent/plugin/in_otlp.rb lib/fluent/plugin/in_opentelemetry.rblib/fluent/plugin/in_otlp.rb renamed to lib/fluent/plugin/in_opentelemetry.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 require "fluent/plugin/input"
-require "fluent/plugin/otlp/constant"
-require "fluent/plugin/otlp/request"
-require "fluent/plugin/otlp/response"
-require "fluent/plugin/otlp/service_handler"
+require "fluent/plugin/opentelemetry/constant"
+require "fluent/plugin/opentelemetry/request"
+require "fluent/plugin/opentelemetry/response"
+require "fluent/plugin/opentelemetry/service_handler"
 require "fluent/plugin_helper/http_server"
 require "fluent/plugin_helper/thread"
 
@@ -28,8 +28,8 @@ def headers
 end
 
 module Fluent::Plugin
-  class OtlpInput < Input
-    Fluent::Plugin.register_input("otlp", self)
+  class OpentelemetryInput < Input
+    Fluent::Plugin.register_input("opentelemetry", self)
 
     helpers :thread, :http_server
 
@@ -67,31 +67,31 @@ def start
 
       if @http_config
         http_handler = HttpHandler.new
-        http_server_create_http_server(:in_otlp_http_server, addr: @http_config.bind, port: @http_config.port, logger: log) do |serv|
+        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: Otlp::RECORD_TYPE_LOGS, message: record }) }
+            http_handler.logs(req) { |record| router.emit(@tag, 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: Otlp::RECORD_TYPE_METRICS, message: record }) }
+            http_handler.metrics(req) { |record| router.emit(@tag, 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: Otlp::RECORD_TYPE_TRACES, message: record }) }
+            http_handler.traces(req) { |record| router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_TRACES, message: record }) }
           end
         end
       end
 
       if @grpc_config
-        thread_create(:in_otlp_grpc_server) do
+        thread_create(:in_opentelemetry_grpc_server) do
           grpc_handler = GrpcHandler.new(@grpc_config, log)
           grpc_handler.run(
             logs: lambda { |record|
-              router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_LOGS, message: record })
+              router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_LOGS, message: record })
             },
             metrics: lambda { |record|
-              router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_METRICS, message: record })
+              router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_METRICS, message: record })
             },
             traces: lambda { |record|
-              router.emit(@tag, Fluent::EventTime.now, { type: Otlp::RECORD_TYPE_TRACES, message: record })
+              router.emit(@tag, Fluent::EventTime.now, { type: Opentelemetry::RECORD_TYPE_TRACES, message: record })
             }
           )
         end
@@ -100,15 +100,15 @@ def start
 
     class HttpHandler
       def logs(req, &block)
-        common(req, Otlp::Request::Logs, Otlp::Response::Logs, &block)
+        common(req, Opentelemetry::Request::Logs, Opentelemetry::Response::Logs, &block)
       end
 
       def metrics(req, &block)
-        common(req, Otlp::Request::Metrics, Otlp::Response::Metrics, &block)
+        common(req, Opentelemetry::Request::Metrics, Opentelemetry::Response::Metrics, &block)
       end
 
       def traces(req, &block)
-        common(req, Otlp::Request::Traces, Otlp::Response::Traces, &block)
+        common(req, Opentelemetry::Request::Traces, Opentelemetry::Response::Traces, &block)
       end
 
       private
@@ -120,7 +120,7 @@ def common(req, request_class, response_class)
         return response_bad_request(content_type) unless valid_content_encoding?(content_encoding)
 
         body = req.body
-        body = Zlib::GzipReader.new(StringIO.new(body)).read if content_encoding == Otlp::CONTENT_ENCODING_GZIP
+        body = Zlib::GzipReader.new(StringIO.new(body)).read if content_encoding == Opentelemetry::CONTENT_ENCODING_GZIP
 
         begin
           record = request_class.new(body).record
@@ -132,12 +132,12 @@ def common(req, request_class, response_class)
         yield record
 
         res = response_class.new
-        response(200, content_type, res.body(type: Otlp::Response.type(content_type)))
+        response(200, content_type, res.body(type: Opentelemetry::Response.type(content_type)))
       end
 
       def valid_content_type?(content_type)
         case content_type
-        when Otlp::CONTENT_TYPE_PROTOBUF, Otlp::CONTENT_TYPE_JSON
+        when Opentelemetry::CONTENT_TYPE_PROTOBUF, Opentelemetry::CONTENT_TYPE_JSON
           true
         else
           false
@@ -147,15 +147,15 @@ def valid_content_type?(content_type)
       def valid_content_encoding?(content_encoding)
         return true if content_encoding.nil?
 
-        content_encoding == Otlp::CONTENT_ENCODING_GZIP
+        content_encoding == Opentelemetry::CONTENT_ENCODING_GZIP
       end
 
       def response(code, content_type, body)
-        [code, { Otlp::CONTENT_TYPE => content_type }, body]
+        [code, { Opentelemetry::CONTENT_TYPE => content_type }, body]
       end
 
       def response_unsupported_media_type
-        response(415, Otlp::CONTENT_TYPE_PAIN, "415 unsupported media type, supported: [application/json, application/x-protobuf]")
+        response(415, Opentelemetry::CONTENT_TYPE_PAIN, "415 unsupported media type, supported: [application/json, application/x-protobuf]")
       end
 
       def response_bad_request(content_type)
@@ -183,24 +183,24 @@ def run(logs:, metrics:, traces:)
         server = GRPC::RpcServer.new(interceptors: [ExceptionInterceptor.new])
         server.add_http2_port("#{@grpc_config.bind}:#{@grpc_config.port}", :this_port_is_insecure)
 
-        logs_handler = Otlp::ServiceHandler::Logs.new
+        logs_handler = Opentelemetry::ServiceHandler::Logs.new
         logs_handler.callback = lambda { |request|
           logs.call(request.to_json)
-          Otlp::Response::Logs.build
+          Opentelemetry::Response::Logs.build
         }
         server.handle(logs_handler)
 
-        metrics_handler = Otlp::ServiceHandler::Metrics.new
+        metrics_handler = Opentelemetry::ServiceHandler::Metrics.new
         metrics_handler.callback = lambda { |request|
           metrics.call(request.to_json)
-          Otlp::Response::Metrics.build
+          Opentelemetry::Response::Metrics.build
         }
         server.handle(metrics_handler)
 
-        traces_handler = Otlp::ServiceHandler::Traces.new
+        traces_handler = Opentelemetry::ServiceHandler::Traces.new
         traces_handler.callback = lambda { |request|
           traces.call(request.to_json)
-          Otlp::Response::Traces.build
+          Opentelemetry::Response::Traces.build
         }
         server.handle(traces_handler)
 

lib/fluent/plugin/otlp/constant.rb …/fluent/plugin/opentelemetry/constant.rblib/fluent/plugin/otlp/constant.rb renamed to lib/fluent/plugin/opentelemetry/constant.rb lib/fluent/plugin/otlp/constant.rb renamed to lib/fluent/plugin/opentelemetry/constant.rb

@@ -3,7 +3,7 @@
 require "fluent/plugin"
 require "openssl"
 
-module Fluent::Plugin::Otlp
+module Fluent::Plugin::Opentelemetry
   CONTENT_TYPE = "Content-Type"
   CONTENT_TYPE_PAIN = "text/plain"
   CONTENT_TYPE_PROTOBUF = "application/x-protobuf"
@@ -12,9 +12,9 @@ module Fluent::Plugin::Otlp
   CONTENT_ENCODING = "Content-Encoding"
   CONTENT_ENCODING_GZIP = "gzip"
 
-  RECORD_TYPE_LOGS = "otlp_logs"
-  RECORD_TYPE_METRICS = "otlp_metrics"
-  RECORD_TYPE_TRACES = "otlp_traces"
+  RECORD_TYPE_LOGS = "opentelemetry_logs"
+  RECORD_TYPE_METRICS = "opentelemetry_metrics"
+  RECORD_TYPE_TRACES = "opentelemetry_traces"
 
   TLS_VERSIONS_MAP =
     begin

lib/fluent/plugin/otlp/request.rb …b/fluent/plugin/opentelemetry/request.rblib/fluent/plugin/otlp/request.rb renamed to lib/fluent/plugin/opentelemetry/request.rb lib/fluent/plugin/otlp/request.rb renamed to lib/fluent/plugin/opentelemetry/request.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require "fluent/plugin/otlp/constant"
+require "fluent/plugin/opentelemetry/constant"
 require "opentelemetry/proto/collector/logs/v1/logs_service_pb"
 require "opentelemetry/proto/collector/metrics/v1/metrics_service_pb"
 require "opentelemetry/proto/collector/trace/v1/trace_service_pb"
 
 require "google/protobuf"
 
-class Fluent::Plugin::Otlp::Request
+class Fluent::Plugin::Opentelemetry::Request
   class Logs
     def initialize(body)
       @request =

lib/fluent/plugin/otlp/response.rb …/fluent/plugin/opentelemetry/response.rblib/fluent/plugin/otlp/response.rb renamed to lib/fluent/plugin/opentelemetry/response.rb lib/fluent/plugin/otlp/response.rb renamed to lib/fluent/plugin/opentelemetry/response.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require "fluent/plugin/otlp/constant"
+require "fluent/plugin/opentelemetry/constant"
 require "opentelemetry/proto/collector/logs/v1/logs_service_pb"
 require "opentelemetry/proto/collector/metrics/v1/metrics_service_pb"
 require "opentelemetry/proto/collector/trace/v1/trace_service_pb"
 
 require "google/protobuf"
 
-module Fluent::Plugin::Otlp::Response
+module Fluent::Plugin::Opentelemetry::Response
   def self.type(content_type)
     case content_type
-    when Fluent::Plugin::Otlp::CONTENT_TYPE_PROTOBUF
+    when Fluent::Plugin::Opentelemetry::CONTENT_TYPE_PROTOBUF
       :protobuf
-    when Fluent::Plugin::Otlp::CONTENT_TYPE_JSON
+    when Fluent::Plugin::Opentelemetry::CONTENT_TYPE_JSON
       :json
     else
       raise "unknown content-type: #{content_type}"

lib/fluent/plugin/otlp/service_handler.rb …/plugin/opentelemetry/service_handler.rblib/fluent/plugin/otlp/service_handler.rb renamed to lib/fluent/plugin/opentelemetry/service_handler.rb lib/fluent/plugin/otlp/service_handler.rb renamed to lib/fluent/plugin/opentelemetry/service_handler.rb

@@ -4,7 +4,7 @@
 require "opentelemetry/proto/collector/metrics/v1/metrics_service_services_pb"
 require "opentelemetry/proto/collector/trace/v1/trace_service_services_pb"
 
-class Fluent::Plugin::Otlp::ServiceHandler
+class Fluent::Plugin::Opentelemetry::ServiceHandler
   class Logs < Opentelemetry::Proto::Collector::Logs::V1::LogsService::Service
     def callback=(block)
       @callback = block

lib/fluent/plugin/otlp/service_stub.rb …ent/plugin/opentelemetry/service_stub.rblib/fluent/plugin/otlp/service_stub.rb renamed to lib/fluent/plugin/opentelemetry/service_stub.rb lib/fluent/plugin/otlp/service_stub.rb renamed to lib/fluent/plugin/opentelemetry/service_stub.rb

@@ -9,7 +9,7 @@
 
 require "grpc"
 
-class Fluent::Plugin::Otlp::ServiceStub
+class Fluent::Plugin::Opentelemetry::ServiceStub
   class Logs
     def initialize(host, creds, **kw)
       @stub = Opentelemetry::Proto::Collector::Logs::V1::LogsService::Stub.new(host, creds, **kw)