diff --git a/instrumentation/all/Gemfile b/instrumentation/all/Gemfile index 4b2ef1e396..4e664ef1c5 100644 --- a/instrumentation/all/Gemfile +++ b/instrumentation/all/Gemfile @@ -29,7 +29,7 @@ group :test do .sort .each { |dir| gem "opentelemetry-helpers-#{dir}", path: "../../helpers/#{dir}" } - excluded_instrumentations = %w[. .. all grpc] + excluded_instrumentations = %w[. .. all] Dir.entries('../') .select { |entry| File.directory?(File.join('../', entry)) } .reject { |entry| excluded_instrumentations.include?(entry) } diff --git a/instrumentation/all/lib/opentelemetry/instrumentation/all.rb b/instrumentation/all/lib/opentelemetry/instrumentation/all.rb index 6139287c54..76d8bfab85 100644 --- a/instrumentation/all/lib/opentelemetry/instrumentation/all.rb +++ b/instrumentation/all/lib/opentelemetry/instrumentation/all.rb @@ -28,6 +28,7 @@ require 'opentelemetry-instrumentation-faraday' require 'opentelemetry-instrumentation-grape' require 'opentelemetry-instrumentation-graphql' +require 'opentelemetry-instrumentation-grpc' require 'opentelemetry-instrumentation-http_client' require 'opentelemetry-instrumentation-mongo' require 'opentelemetry-instrumentation-mysql2' diff --git a/instrumentation/all/opentelemetry-instrumentation-all.gemspec b/instrumentation/all/opentelemetry-instrumentation-all.gemspec index 9ab3bcda8b..a293e539a6 100644 --- a/instrumentation/all/opentelemetry-instrumentation-all.gemspec +++ b/instrumentation/all/opentelemetry-instrumentation-all.gemspec @@ -38,6 +38,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'opentelemetry-instrumentation-faraday', '~> 0.26.0' spec.add_dependency 'opentelemetry-instrumentation-grape', '~> 0.3.0' spec.add_dependency 'opentelemetry-instrumentation-graphql', '~> 0.29.0' + spec.add_dependency 'opentelemetry-instrumentation-grpc', '~> 0.2.0' spec.add_dependency 'opentelemetry-instrumentation-gruf', '~> 0.3.0' spec.add_dependency 'opentelemetry-instrumentation-http', '~> 0.24.0' spec.add_dependency 'opentelemetry-instrumentation-http_client', '~> 0.23.0' diff --git a/instrumentation/grpc/lib/opentelemetry/instrumentation/grpc.rb b/instrumentation/grpc/lib/opentelemetry/instrumentation/grpc.rb index e47e42bfa6..53346c3108 100644 --- a/instrumentation/grpc/lib/opentelemetry/instrumentation/grpc.rb +++ b/instrumentation/grpc/lib/opentelemetry/instrumentation/grpc.rb @@ -18,4 +18,3 @@ class Error < StandardError; end require_relative 'grpc/instrumentation' require_relative 'grpc/version' -require_relative 'grpc/interceptors/client_tracer' diff --git a/instrumentation/grpc/test/opentelemetry/instrumentation/grpc/interceptors/client_tracer_test.rb b/instrumentation/grpc/test/opentelemetry/instrumentation/grpc/interceptors/client_tracer_test.rb index 537c5e38fe..c80fb37bbd 100644 --- a/instrumentation/grpc/test/opentelemetry/instrumentation/grpc/interceptors/client_tracer_test.rb +++ b/instrumentation/grpc/test/opentelemetry/instrumentation/grpc/interceptors/client_tracer_test.rb @@ -6,6 +6,7 @@ require_relative '../../../../test_helper' require_relative '../../../../support/grpc_server_runner' +require_relative '../../../../../lib/opentelemetry/instrumentation/grpc/interceptors/client_tracer' describe OpenTelemetry::Instrumentation::Grpc::Interceptors::ClientTracer do let(:instrumentation) { OpenTelemetry::Instrumentation::Grpc::Instrumentation.instance } diff --git a/instrumentation/grpc/test/support/proto/ping_services_pb.rb b/instrumentation/grpc/test/support/proto/ping_services_pb.rb index 0a6062c264..2d2ce86ddf 100644 --- a/instrumentation/grpc/test/support/proto/ping_services_pb.rb +++ b/instrumentation/grpc/test/support/proto/ping_services_pb.rb @@ -1,7 +1,6 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # Source: test/support/proto/ping.proto for package 'support.proto' -require 'grpc' require_relative 'ping_pb' module Support