Skip to content
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

Jump to bottom

Remove UUID from attrs sent_to metrics. #21630

Merged
merged 9 commits into from
Jun 4, 2024
Merged

Remove UUID from attrs sent_to metrics. #21630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de29799
Remove UUID from attrs sent_to metrics.
NoelleAd May 14, 2024
90faa34
pushing with some linting issues for visibility.
NoelleAd May 14, 2024
edc7dd3
Change config implementation.
NoelleAd May 14, 2024
78f11e2
Remove UUID from spec
NoelleAd May 14, 2024
2cdf487
remove uuid from update_appellant job
NoelleAd May 14, 2024
5b75566
diable rubocop for open_telemetry init
NoelleAd May 15, 2024
1230599
OTEL fixes
NoelleAd May 15, 2024
a6b8653
rescue, errors
NoelleAd May 16, 2024
826cc3e
Merge branch 'feature/appeals-45972' into NoelleAd/hotfix/MetricServi…
mikefinneran Jun 4, 2024
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
3 changes: 3 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ gem "moment_timezone-rails"
gem "multiverse"
gem "newrelic_rpm"
gem "nokogiri", ">= 1.11.0.rc4"
gem "opentelemetry-exporter-otlp"
gem "opentelemetry-instrumentation-all"
gem "opentelemetry-sdk"
gem "paper_trail", "~> 12.0"
# Used to speed up reporting
gem "parallel"
Expand Down
192 changes: 192 additions & 0 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1598,6 +1598,9 @@ GEM
rchardet (~> 1.8)
globalid (1.1.0)
activesupport (>= 5.0)
google-protobuf (3.25.3)
googleapis-common-protos-types (1.14.0)
google-protobuf (~> 3.18)
govdelivery-tms (2.8.4)
activesupport
faraday
Expand Down Expand Up @@ -1732,6 +1735,191 @@ GEM
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
opentelemetry-api (1.1.0)
opentelemetry-common (0.19.7)
opentelemetry-api (~> 1.0)
opentelemetry-exporter-otlp (0.24.2)
google-protobuf (~> 3.19)
googleapis-common-protos-types (~> 1.3)
opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.19.6)
opentelemetry-sdk (~> 1.2)
opentelemetry-semantic_conventions
opentelemetry-instrumentation-action_pack (0.5.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-rack (~> 0.21)
opentelemetry-instrumentation-action_view (0.4.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-active_support (~> 0.1)
opentelemetry-instrumentation-base (~> 0.20)
opentelemetry-instrumentation-active_job (0.4.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-active_model_serializers (0.19.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-active_record (0.5.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
ruby2_keywords
opentelemetry-instrumentation-active_support (0.3.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-all (0.33.0)
opentelemetry-instrumentation-active_model_serializers (~> 0.19.0)
opentelemetry-instrumentation-aws_sdk (~> 0.3.0)
opentelemetry-instrumentation-bunny (~> 0.19.0)
opentelemetry-instrumentation-concurrent_ruby (~> 0.20.0)
opentelemetry-instrumentation-dalli (~> 0.22.0)
opentelemetry-instrumentation-delayed_job (~> 0.19.0)
opentelemetry-instrumentation-ethon (~> 0.20.0)
opentelemetry-instrumentation-excon (~> 0.20.0)
opentelemetry-instrumentation-faraday (~> 0.22.0)
opentelemetry-instrumentation-graphql (~> 0.24.0)
opentelemetry-instrumentation-http (~> 0.21.0)
opentelemetry-instrumentation-http_client (~> 0.21.0)
opentelemetry-instrumentation-koala (~> 0.19.0)
opentelemetry-instrumentation-lmdb (~> 0.21.0)
opentelemetry-instrumentation-mongo (~> 0.21.0)
opentelemetry-instrumentation-mysql2 (~> 0.22.0)
opentelemetry-instrumentation-net_http (~> 0.21.0)
opentelemetry-instrumentation-pg (~> 0.23.0)
opentelemetry-instrumentation-que (~> 0.5.0)
opentelemetry-instrumentation-racecar (~> 0.1.0)
opentelemetry-instrumentation-rack (~> 0.22.0)
opentelemetry-instrumentation-rails (~> 0.25.0)
opentelemetry-instrumentation-rake (~> 0.1.0)
opentelemetry-instrumentation-rdkafka (~> 0.2.0)
opentelemetry-instrumentation-redis (~> 0.24.0)
opentelemetry-instrumentation-resque (~> 0.3.0)
opentelemetry-instrumentation-restclient (~> 0.21.0)
opentelemetry-instrumentation-ruby_kafka (~> 0.19.0)
opentelemetry-instrumentation-sidekiq (~> 0.22.0)
opentelemetry-instrumentation-sinatra (~> 0.21.0)
opentelemetry-instrumentation-trilogy (~> 0.52.0)
opentelemetry-instrumentation-aws_sdk (0.3.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-base (0.21.1)
opentelemetry-api (~> 1.0)
opentelemetry-registry (~> 0.1)
opentelemetry-instrumentation-bunny (0.19.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-concurrent_ruby (0.20.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-dalli (0.22.2)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-delayed_job (0.19.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-ethon (0.20.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-excon (0.20.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-faraday (0.22.0)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-graphql (0.24.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-http (0.21.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-http_client (0.21.0)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-koala (0.19.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-lmdb (0.21.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-mongo (0.21.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-mysql2 (0.22.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-net_http (0.21.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-pg (0.23.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-que (0.5.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-racecar (0.1.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-rack (0.22.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-rails (0.25.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-action_pack (~> 0.5.0)
opentelemetry-instrumentation-action_view (~> 0.4.0)
opentelemetry-instrumentation-active_job (~> 0.4.0)
opentelemetry-instrumentation-active_record (~> 0.5.0)
opentelemetry-instrumentation-active_support (~> 0.3.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-rake (0.1.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-rdkafka (0.2.3)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-redis (0.24.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-resque (0.3.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-restclient (0.21.0)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-ruby_kafka (0.19.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-sidekiq (0.22.1)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-sinatra (0.21.5)
opentelemetry-api (~> 1.0)
opentelemetry-common (~> 0.19.3)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-instrumentation-rack (~> 0.21)
opentelemetry-instrumentation-trilogy (0.52.0)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.21.0)
opentelemetry-semantic_conventions (>= 1.8.0)
opentelemetry-registry (0.2.0)
opentelemetry-api (~> 1.1)
opentelemetry-sdk (1.2.1)
opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.19.3)
opentelemetry-registry (~> 0.2)
opentelemetry-semantic_conventions
opentelemetry-semantic_conventions (1.10.0)
opentelemetry-api (~> 1.0)
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
Expand Down Expand Up @@ -1888,6 +2076,7 @@ GEM
ruby-plsql (0.8.0)
ruby-prof (1.4.1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
ruby_dep (1.5.0)
ruby_parser (3.20.3)
sexp_processor (~> 4.16)
Expand Down Expand Up @@ -2065,6 +2254,9 @@ DEPENDENCIES
multiverse
newrelic_rpm
nokogiri (>= 1.11.0.rc4)
opentelemetry-exporter-otlp
opentelemetry-instrumentation-all
opentelemetry-sdk
paper_trail (~> 12.0)
parallel
paranoia (~> 2.2)
Expand Down
3 changes: 1 addition & 2 deletions app/services/metrics_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ def self.record(description, service: nil, name: "unknown", caller: nil)
app_name: app,
attrs: {
service: service,
endpoint: name,
uuid: uuid
endpoint: name
}
}
MetricsService.emit_gauge(sent_to_info)
Expand Down
32 changes: 32 additions & 0 deletions config/initializers/open_telemetry.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# frozen_string_literal: true

# rubocop:disable Layout/LineLength

DT_API_URL = ENV["DT_API_URL"]
DT_API_TOKEN = ENV["DT_API_TOKEN"]

OpenTelemetry::SDK.configure do |config|
config.service_name = "caseflow"
config.service_version = "1.0.1"
# automatic instrumentation
config.use_all
["dt_metadata_e617c525669e072eebe3d0f08212e8f2.properties", "/var/lib/dynatrace/enrichment/dt_metadata.properties", "/var/lib/dynatrace/enrichment/dt_host_metadata.properties"].each do |name|
begin
config.resource = OpenTelemetry::SDK::Resources::Resource.create(Hash[*File.read(name.start_with?("/var") ? name : File.read(name)).split(/[=\n]+/)])
rescue StandardError => error
Rails.logger.error(error.full_message)
raise error.full_message
end
end
config.add_span_processor(
OpenTelemetry::SDK::Trace::Export::BatchSpanProcessor.new(
OpenTelemetry::Exporter::OTLP::Exporter.new(
endpoint: DT_API_URL + "/v1/traces",
headers: {
"Authorization": "Api-Token " + DT_API_TOKEN
}
)
)
)
end
# rubocop:enable Layout/LineLength
2 changes: 1 addition & 1 deletion spec/jobs/update_appellant_representation_job_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
)
expect(MetricsService).to receive(:emit_gauge).with(
app_name: "queue_job",
attrs: { endpoint: "AppellantNotification.appeal_mapper", service: "queue_job", uuid: anything },
attrs: { endpoint: "AppellantNotification.appeal_mapper", service: "queue_job" },
metric_group: "service",
metric_name: "request_latency",
metric_value: anything
Expand Down
6 changes: 2 additions & 4 deletions spec/services/metrics_service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
app_name: "other",
attrs: {
service: service,
endpoint: name,
uuid: anything
endpoint: name
}
)
expect(MetricsService).to receive(:increment_counter).with(
Expand Down Expand Up @@ -72,8 +71,7 @@
app_name: "other",
attrs: {
service: service,
endpoint: name,
uuid: anything
endpoint: name
}
},
start: anything,
Expand Down
Loading