Skip to content

fix: Move the logs-sdk and metrics-sdk requires #1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BrianHawley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Move the logs-sdk and metrics-sdk requires #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-test-helpers', path: '../test_helpers'
gem 'opentelemetry-test-helpers', path: '../test_helpers', require: false
end
2 changes: 1 addition & 1 deletion common/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ eval_gemfile '../contrib/Gemfile.shared'

group :development, :test do
# Use the opentelemetry-api gem from source
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-api', path: '../api', require: false
gem 'pry'
end
12 changes: 6 additions & 6 deletions exporter/jaeger/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
10 changes: 5 additions & 5 deletions exporter/otlp-common/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
14 changes: 7 additions & 7 deletions exporter/otlp-grpc/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-exporter-otlp-common', path: '../otlp-common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-exporter-otlp-common', path: '../otlp-common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
14 changes: 7 additions & 7 deletions exporter/otlp-http/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-exporter-otlp-common', path: '../otlp-common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-exporter-otlp-common', path: '../otlp-common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
16 changes: 8 additions & 8 deletions exporter/otlp-logs/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ source 'https://rubygems.org'
gemspec

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-logs-api', path: '../../logs_api'
gem 'opentelemetry-logs-sdk', path: '../../logs_sdk'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-logs-api', path: '../../logs_api', require: false
gem 'opentelemetry-logs-sdk', path: '../../logs_sdk', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end

group :test do
Expand Down
16 changes: 8 additions & 8 deletions exporter/otlp-metrics/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ source 'https://rubygems.org'
gemspec

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-metrics-api', path: '../../metrics_api'
gem 'opentelemetry-metrics-sdk', path: '../../metrics_sdk'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-metrics-api', path: '../../metrics_api', require: false
gem 'opentelemetry-metrics-sdk', path: '../../metrics_sdk', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
12 changes: 6 additions & 6 deletions exporter/otlp/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ source 'https://rubygems.org'
gemspec

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
12 changes: 6 additions & 6 deletions exporter/zipkin/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../../test_helpers'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
gem 'opentelemetry-semantic_conventions', path: '../../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../../test_helpers', require: false
end
10 changes: 5 additions & 5 deletions logs_sdk/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-exporter-otlp-logs', path: '../exporter/otlp-logs'
gem 'opentelemetry-logs-api', path: '../logs_api'
gem 'opentelemetry-sdk', path: '../sdk'
gem 'opentelemetry-test-helpers', path: '../test_helpers'
gem 'opentelemetry-api', path: '../api', require: false
gem 'opentelemetry-exporter-otlp-logs', path: '../exporter/otlp-logs', require: false
gem 'opentelemetry-logs-api', path: '../logs_api', require: false
gem 'opentelemetry-sdk', path: '../sdk', require: false
gem 'opentelemetry-test-helpers', path: '../test_helpers', require: false
end
2 changes: 0 additions & 2 deletions logs_sdk/lib/opentelemetry-logs-sdk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry/sdk'
require 'opentelemetry-logs-api'
require 'opentelemetry/sdk/logs'
3 changes: 3 additions & 0 deletions logs_sdk/lib/opentelemetry/sdk/logs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry/sdk'
require 'opentelemetry-logs-api'

require_relative 'logs/version'
require_relative 'logs/configurator_patch'
require_relative 'logs/logger'
Expand Down
2 changes: 1 addition & 1 deletion metrics_api/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-api', path: '../api', require: false
gem 'pry'
gem 'pry-byebug' unless RUBY_ENGINE == 'jruby'
end
14 changes: 7 additions & 7 deletions metrics_sdk/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-common', path: '../common'
gem 'opentelemetry-exporter-otlp-metrics', path: '../exporter/otlp-metrics' unless RUBY_ENGINE == 'jruby'
gem 'opentelemetry-metrics-api', path: '../metrics_api'
gem 'opentelemetry-registry', path: '../registry'
gem 'opentelemetry-sdk', path: '../sdk'
gem 'opentelemetry-test-helpers', path: '../test_helpers'
gem 'opentelemetry-api', path: '../api', require: false
gem 'opentelemetry-common', path: '../common', require: false
gem 'opentelemetry-exporter-otlp-metrics', path: '../exporter/otlp-metrics', require: false unless RUBY_ENGINE == 'jruby'
gem 'opentelemetry-metrics-api', path: '../metrics_api', require: false
gem 'opentelemetry-registry', path: '../registry', require: false
gem 'opentelemetry-sdk', path: '../sdk', require: false
gem 'opentelemetry-test-helpers', path: '../test_helpers', require: false
gem 'pry'
gem 'pry-byebug' unless RUBY_ENGINE == 'jruby'
end
2 changes: 0 additions & 2 deletions metrics_sdk/lib/opentelemetry-metrics-sdk.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry/sdk'
require 'opentelemetry-metrics-api'
require 'opentelemetry/sdk/metrics'
4 changes: 4 additions & 0 deletions metrics_sdk/lib/opentelemetry/sdk/metrics.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
#
# SPDX-License-Identifier: Apache-2.0

require 'opentelemetry/sdk'
require 'opentelemetry-metrics-api'

module OpenTelemetry
module SDK
# The Metrics module contains the OpenTelemetry metrics reference
Expand All @@ -13,6 +16,7 @@ module Metrics
end
end

require 'opentelemetry/sdk/metrics/version'
require 'opentelemetry/sdk/metrics/aggregation'
require 'opentelemetry/sdk/metrics/configurator_patch'
require 'opentelemetry/sdk/metrics/export'
Expand Down
2 changes: 1 addition & 1 deletion propagator/b3/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-api', path: '../../api', require: false
end
8 changes: 4 additions & 4 deletions propagator/jaeger/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ gemspec
eval_gemfile '../../contrib/Gemfile.shared'

group :test do
gem 'opentelemetry-api', path: '../../api'
gem 'opentelemetry-common', path: '../../common'
gem 'opentelemetry-registry', path: '../../registry'
gem 'opentelemetry-sdk', path: '../../sdk'
gem 'opentelemetry-api', path: '../../api', require: false
gem 'opentelemetry-common', path: '../../common', require: false
gem 'opentelemetry-registry', path: '../../registry', require: false
gem 'opentelemetry-sdk', path: '../../sdk', require: false
end
2 changes: 1 addition & 1 deletion registry/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-api', path: '../api', require: false
end
12 changes: 6 additions & 6 deletions sdk/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-common', path: '../common'
gem 'opentelemetry-exporter-zipkin', path: '../exporter/zipkin'
gem 'opentelemetry-registry', path: '../registry'
gem 'opentelemetry-semantic_conventions', path: '../semantic_conventions'
gem 'opentelemetry-test-helpers', path: '../test_helpers'
gem 'opentelemetry-api', path: '../api', require: false
gem 'opentelemetry-common', path: '../common', require: false
gem 'opentelemetry-exporter-zipkin', path: '../exporter/zipkin', require: false
gem 'opentelemetry-registry', path: '../registry', require: false
gem 'opentelemetry-semantic_conventions', path: '../semantic_conventions', require: false
gem 'opentelemetry-test-helpers', path: '../test_helpers', require: false
end
10 changes: 5 additions & 5 deletions sdk_experimental/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-common', path: '../common'
gem 'opentelemetry-registry', path: '../registry'
gem 'opentelemetry-sdk', path: '../sdk'
gem 'opentelemetry-test-helpers', path: '../test_helpers'
gem 'opentelemetry-api', path: '../api', require: false
gem 'opentelemetry-common', path: '../common', require: false
gem 'opentelemetry-registry', path: '../registry', require: false
gem 'opentelemetry-sdk', path: '../sdk', require: false
gem 'opentelemetry-test-helpers', path: '../test_helpers', require: false
gem 'pry'
gem 'pry-byebug' unless RUBY_ENGINE == 'jruby'
end
2 changes: 1 addition & 1 deletion semantic_conventions/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ eval_gemfile '../contrib/Gemfile.shared'

group :development, :test do
gem 'mutex_m' if RUBY_VERSION >= '3.4'
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-api', path: '../api', require: false
gem 'pry'
end
8 changes: 4 additions & 4 deletions test_helpers/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ gemspec
eval_gemfile '../contrib/Gemfile.shared'

group :test, :development do
gem 'opentelemetry-api', path: '../api'
gem 'opentelemetry-common', path: '../common'
gem 'opentelemetry-registry', path: '../registry'
gem 'opentelemetry-sdk', path: '../sdk'
gem 'opentelemetry-api', path: '../api', require: false
gem 'opentelemetry-common', path: '../common', require: false
gem 'opentelemetry-registry', path: '../registry', require: false
gem 'opentelemetry-sdk', path: '../sdk', require: false
end