Skip to content

New Relic iOS agent 7.5.11 Production #506

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

Merged
cdillard-NewRelic merged 13 commits into from
Oct 7, 2025
Merged

New Relic iOS agent 7.5.11 Production #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
61d0e46
Fix: tvOS path for logging
cdillard-NewRelic Sep 17, 2025
76de9c9
Merge pull request #494 from newrelic/fix-tvOS-paths
cdillard-NewRelic Sep 18, 2025
eddafe9
Merge branch 'main' of github.com:newrelic/newrelic-ios-agent into bu…
cdillard-NewRelic Sep 18, 2025
2c6e516
bump: 7.5.11
cdillard-NewRelic Sep 18, 2025
4097dd1
Merge pull request #495 from newrelic/bump-7511
cdillard-NewRelic Sep 19, 2025
90fd9b1
fix: NRMAMethodProfiler when in UIHostingController
cdillard-NewRelic Sep 23, 2025
c52a2b3
Merge pull request #497 from newrelic/proper-fix-nrmamethodprofiler-lag
cdillard-NewRelic Sep 24, 2025
8dbaaf6
fix: NRMALoggerBridge in NewEventSystem
cdillard-NewRelic Sep 24, 2025
f00c93d
Merge pull request #500 from newrelic/fix-nrmaloggerbridge-crash
cdillard-NewRelic Sep 25, 2025
8860a66
rem:ove app will terminate handling (#502)
cdillard-NewRelic Sep 29, 2025
e057413
NR-472539 changed the distributed tracing not attaching log to debug,…
mbruin-NR Oct 3, 2025
62acee4
Merge pull request #505 from newrelic/staging7512
cdillard-NewRelic Oct 6, 2025
4dea065
[7.5.11-rc.1667] Staging Release
cdillard-NewRelic Oct 6, 2025
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
76 changes: 38 additions & 38 deletions Agent.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6307,9 +6307,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = RQZ9D969HD;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -6362,9 +6362,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -6439,11 +6439,11 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -6518,11 +6518,11 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = YES;
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -6566,12 +6566,12 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
"DEVELOPMENT_TEAM[sdk=macosx*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6595,7 +6595,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.10;
MARKETING_VERSION = 7.5.11;
MODULEMAP_FILE = agent.modulemap;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
Expand Down Expand Up @@ -6626,11 +6626,11 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -6652,7 +6652,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.10;
MARKETING_VERSION = 7.5.11;
MODULEMAP_FILE = agent.modulemap;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
Expand All @@ -6677,9 +6677,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = RQZ9D969HD;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand Down Expand Up @@ -6736,9 +6736,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand Down Expand Up @@ -6788,9 +6788,9 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/UnitTests/",
Expand Down Expand Up @@ -6830,9 +6830,9 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/UnitTests/",
Expand Down Expand Up @@ -6872,12 +6872,12 @@
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
"DEVELOPMENT_TEAM[sdk=appletvos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6899,7 +6899,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.10;
MARKETING_VERSION = 7.5.11;
MODULEMAP_FILE = agent.modulemap;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
Expand All @@ -6925,11 +6925,11 @@
CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6950,7 +6950,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.10;
MARKETING_VERSION = 7.5.11;
MODULEMAP_FILE = agent.modulemap;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
Expand All @@ -6976,9 +6976,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand Down Expand Up @@ -7038,9 +7038,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand Down Expand Up @@ -7096,12 +7096,12 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=watchos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -7124,7 +7124,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 7.5.10;
MARKETING_VERSION = 7.5.11;
MODULEMAP_FILE = agent.modulemap;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "";
Expand Down Expand Up @@ -7154,12 +7154,12 @@
CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.10;
CURRENT_PROJECT_VERSION = 7.5.11;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=watchos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.10;
DYLIB_CURRENT_VERSION = 7.5.11;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -7181,7 +7181,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 7.5.10;
MARKETING_VERSION = 7.5.11;
MODULEMAP_FILE = agent.modulemap;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "";
Expand Down
7 changes: 6 additions & 1 deletion Agent/Analytics/NRMAAnalytics.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ - (NSUInteger) getMaxEventBufferTime {
- (id) initWithSessionStartTimeMS:(long long) sessionStartTime {
self = [super init];
if(self){

// Used in New and Old EventSystem.
if(__has_feature(cxx_exceptions)) {\
Copy link
Member Author

@cdillard-NewRelic cdillard-NewRelic Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed the {\ but I guess it still compiles fine 🤷

Copy link
Contributor

@mbruin-NR mbruin-NR Oct 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

weird 🤷‍♂️

LibLogger::setLogger(std::make_shared<NewRelic::NRMALoggerBridge>(NewRelic::NRMALoggerBridge()));
}

// Handle New Event System NRMAnalytics Constructor
if([NRMAFlags shouldEnableNewEventSystem]){
NSString *filename = [[NewRelicInternalUtils getStorePath] stringByAppendingPathComponent:kNRMA_EventStoreFilename];
Expand Down Expand Up @@ -156,7 +162,6 @@ - (id) initWithSessionStartTimeMS:(long long) sessionStartTime {
}

NSString* documentDirURL = [NewRelicInternalUtils getStorePath];
LibLogger::setLogger(std::make_shared<NewRelic::NRMALoggerBridge>(NewRelic::NRMALoggerBridge()));
_analyticsController = std::make_shared<NewRelic::AnalyticsController>(sessionStartTime,documentDirURL.UTF8String, [NRMAAnalytics eventDupStore], [NRMAAnalytics attributeDupStore]);
//__kNRMA_RA_upgradeFrom and __kNRMA_RA_install are only valid for one session
//and will be set shortly after the initialization of NRMAAnalytics.
Expand Down
Loading
Loading