maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[deploy] Bug Fix: Use strings with colons for all Datadog tags (#7442)

Browse source
This commit is contained in:
Molly Struve 2020-04-22 12:24:57 -05:00 • committed by GitHub
parent 16560d9ef1
commit 73120a67c9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/labor/mailchimp_bot.rb
View file

@ -182,7 +182,7 @@ class MailchimpBot
def report_error(exception)
Rails.logger.error(exception)
DatadogStatsClient.increment("mailchimp.errors", tags: [action: "failed", user_id: user.id, source: "gibbon-gem"])
DatadogStatsClient.increment("mailchimp.errors", tags: ["action:failed", "user_id:#{user.id}", "source:gibbon-gem"])
end
def target_md5_email

2
app/services/authentication/authenticator.rb
View file

@ -58,7 +58,7 @@ module Authentication
if log_to_datadog
# Notify DataDog if a new identity was successfully created.
DatadogStatsClient.increment("identity.created", tags: [provider: id_provider])
DatadogStatsClient.increment("identity.created", tags: ["provider:#{id_provider}"])
end
# Return the successfully-authed used from the transaction.

2
app/services/search/client.rb
View file

@ -49,7 +49,7 @@ module Search
def record_error(error_message, class_name)
Honeycomb.add_field("elasticsearch.result", "error")
Honeycomb.add_field("elasticsearch.error", class_name)
DatadogStatsClient.increment("elasticsearch.errors", tags: ["error:#{class_name}"], message: error_message)
DatadogStatsClient.increment("elasticsearch.errors", tags: ["error:#{class_name}", "message:#{error_message}"])
end
def target

14
app/workers/metrics/record_daily_usage_worker.rb
View file

@ -6,27 +6,27 @@ module Metrics
def perform
# Articles published in the past 24 hours with at least 15 "score" (positive/negative reactions)
articles_min_15_score_past_24h = Article.published.where("score >= ? AND published_at > ?", 15, 1.day.ago).size
DatadogStatsClient.count("articles.min_15_score_past_24h", articles_min_15_score_past_24h, tags: { resource: "articles" })
DatadogStatsClient.count("articles.min_15_score_past_24h", articles_min_15_score_past_24h, tags: ["resource:articles"])
# Articles published in the past 24 hours with at least 15 "score" (positive/negative reactions)
articles_min_15_comment_score_past_24h = Article.published.where("comment_score >= ? AND published_at > ?", 15, 1.day.ago).size
DatadogStatsClient.count("articles.min_15_comment_score_past_24h", articles_min_15_comment_score_past_24h, tags: { resource: "articles" })
DatadogStatsClient.count("articles.min_15_comment_score_past_24h", articles_min_15_comment_score_past_24h, tags: ["resource:articles"])
# Articles published in the past 24 which were that user's first article
first_articles_past_24h = Article.where(nth_published_by_author: 1).where("published_at > ?", 1.day.ago).size
DatadogStatsClient.count("articles.first_past_24h", first_articles_past_24h, tags: { resource: "articles" })
DatadogStatsClient.count("articles.first_past_24h", first_articles_past_24h, tags: ["resource:articles"])
# Users who signed up in the past 24 hours who have made at least 1 comment so far
new_users_min_1_comment_past_24h = User.where("comments_count >= ? AND created_at > ?", 1, 24.hours.ago).size
DatadogStatsClient.count("users.new_min_1_comment_past_24h", new_users_min_1_comment_past_24h, tags: { resource: "users" })
DatadogStatsClient.count("users.new_min_1_comment_past_24h", new_users_min_1_comment_past_24h, tags: ["resource:users"])
# Total negative reactions in the past 24 hours
nagative_reactions_past_24h = Reaction.where("points < 0").where("created_at > ?", 1.day.ago).size
DatadogStatsClient.count("reactions.negative_past_24h", nagative_reactions_past_24h, tags: { resource: "reactions" })
DatadogStatsClient.count("reactions.negative_past_24h", nagative_reactions_past_24h, tags: ["resource:reactions"])
# Total abuse (etc.) reports in the past 24 hours
reports_past_24_hours = FeedbackMessage.where(category: ["spam", "other", "rude or vulgar", "harassment"]).where("created_at > ?", 1.day.ago).size
DatadogStatsClient.count("feedback_messages.reports_past_24_hours", reports_past_24_hours, tags: { resource: "feedback_messages" })
DatadogStatsClient.count("feedback_messages.reports_past_24_hours", reports_past_24_hours, tags: ["resource:feedback_messages"])
# Counts of total days active (1-7) in the past week, e.g. 5000 users visited once this week, 3500 visited twice, etc.
get_days_active_past_week_counts
@ -51,7 +51,7 @@ module Metrics
distinct_user_values = user_ids_by_day.flatten.group_by(&:itself).transform_values(&:count).values
distinct_counts = distinct_user_values.group_by(&:itself).transform_values(&:count)
distinct_counts.each_key do |key|
DatadogStatsClient.count("users.active_days_past_week", distinct_counts[key], tags: { resource: "users", group: group, day_count: key })
DatadogStatsClient.count("users.active_days_past_week", distinct_counts[key], tags: ["resource:users", "group:#{group}", "day_count:#{key}"])
end
end
end

4
app/workers/metrics/record_data_counts_worker.rb
View file

@ -13,7 +13,7 @@ module Metrics
end
Rails.logger.info("db_table_size", table_info: { table_name: model.table_name, table_size: db_count })
DatadogStatsClient.gauge("postgres.db_table_size", db_count, tags: { table_name: model.table_name })
DatadogStatsClient.gauge("postgres.db_table_size", db_count, tags: ["table_name:#{model.table_name}"])
next unless model.const_defined?(:SEARCH_CLASS)
@ -22,7 +22,7 @@ module Metrics
else
model::SEARCH_CLASS.document_count
end
DatadogStatsClient.gauge("elasticsearch.document_count", document_count, tags: { table_name: model.table_name })
DatadogStatsClient.gauge("elasticsearch.document_count", document_count, tags: ["table_name:#{model.table_name}"])
end
end
end

4
spec/services/authentication/authenticator_spec.rb
View file

@ -84,7 +84,7 @@ RSpec.describe Authentication::Authenticator, type: :service do
service.call
expect(DatadogStatsClient).to have_received(:increment).with(
"identity.created", tags: [provider: "github"]
"identity.created", tags: ["provider:github"]
)
end
@ -288,7 +288,7 @@ RSpec.describe Authentication::Authenticator, type: :service do
service.call
expect(DatadogStatsClient).to have_received(:increment).with(
"identity.created", tags: [provider: "twitter"]
"identity.created", tags: ["provider:twitter"]
)
end
end

12
spec/workers/metrics/record_daily_usage_worker_spec.rb
View file

@ -20,37 +20,37 @@ RSpec.describe Metrics::RecordDailyUsageWorker, type: :worker do
it "logs articles with at least 15 score" do
expect(
DatadogStatsClient,
).to have_received(:count).with("articles.min_15_score_past_24h", 2, Hash).at_least(1)
).to have_received(:count).with("articles.min_15_score_past_24h", 2, tags: Array).at_least(1)
end
it "logs articles with at least comment 15 score" do
expect(
DatadogStatsClient,
).to have_received(:count).with("articles.min_15_comment_score_past_24h", 1, Hash).at_least(1)
).to have_received(:count).with("articles.min_15_comment_score_past_24h", 1, tags: Array).at_least(1)
end
it "records first articles" do
expect(
DatadogStatsClient,
).to have_received(:count).with("articles.first_past_24h", 1, Hash).at_least(1)
).to have_received(:count).with("articles.first_past_24h", 1, tags: Array).at_least(1)
end
it "records new users with at least one comment" do
expect(
DatadogStatsClient,
).to have_received(:count).with("users.new_min_1_comment_past_24h", 2, Hash).at_least(1)
).to have_received(:count).with("users.new_min_1_comment_past_24h", 2, tags: Array).at_least(1)
end
it "records negative reactions" do
expect(
DatadogStatsClient,
).to have_received(:count).with("reactions.negative_past_24h", 1, Hash).at_least(1)
).to have_received(:count).with("reactions.negative_past_24h", 1, tags: Array).at_least(1)
end
it "records report feedback_messages" do
expect(
DatadogStatsClient,
).to have_received(:count).with("feedback_messages.reports_past_24_hours", 1, Hash).at_least(1)
).to have_received(:count).with("feedback_messages.reports_past_24_hours", 1, tags: Array).at_least(1)
end
end
end

4
spec/workers/metrics/record_data_counts_worker_spec.rb
View file

@ -36,7 +36,7 @@ RSpec.describe Metrics::RecordDataCountsWorker, type: :worker do
expect(
DatadogStatsClient,
).to have_received(:gauge).with("postgres.db_table_size", 0, Hash).at_least(1)
).to have_received(:gauge).with("postgres.db_table_size", 0, tags: Array).at_least(1)
end
it "logs index counts in Datadog" do
@ -45,7 +45,7 @@ RSpec.describe Metrics::RecordDataCountsWorker, type: :worker do
expect(
DatadogStatsClient,
).to have_received(:gauge).with("elasticsearch.document_count", 0, Hash).at_least(1)
).to have_received(:gauge).with("elasticsearch.document_count", 0, tags: Array).at_least(1)
end
end
end