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

Main to dev merge conflicts #2963

Merged
merged 5 commits into from
Nov 19, 2024
Merged

Main to dev merge conflicts #2963

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9bf538
Merge pull request #2769 from newrelic/dev
kaylareopelle Jul 24, 2024
0d135b1
Merge pull request #2828 from newrelic/dev
fallwith Aug 22, 2024
0e1e4ab
Merge pull request #2867 from newrelic/dev
kaylareopelle Sep 30, 2024
da5529b
Release 9.15.0 (#2928)
github-actions[bot] Oct 31, 2024
0bc0c3a
Merge branch 'main' into main-to-dev-merge-conflicts
kaylareopelle Nov 19, 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
22 changes: 12 additions & 10 deletions newrelic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,20 +131,22 @@ common: &default_settings
# MyCompany module namespace:
#
# module MyCompany
# class Image
# def render_png
# # code to render a PNG
# end
# end
# class User
# def self.notify
# # code to notify users
# end
# end
# class Image
# def render_png
# # code to render a PNG
# end
# end
#
# class User
# def self.notify
# # code to notify users
# end
# end
# end
#
# Given that source code, the newrelic.yml config file might request
# instrumentation for both of these methods like so:
#
# automatic_custom_instrumentation_method_list:
# - MyCompany::Image#render_png
# - MyCompany::User.notify
Expand Down
Loading