Skip to content

Commit

Permalink
Develop -> Staging 7.5.2 (#308)
Browse files Browse the repository at this point in the history
* Backmerge main -> 7.4.2  (#295)

* [7.4.7-rc.589] Staging Release

* do cocoapods, then swift pm

* push SPM change for 7.4.7

* Branching from the main for beta tests (#133)

* Branching from the main for beta tests

* This should fix the tvOS beta not being found

* Added tvOS app tests

* Added a step to the app unit tests to add a secret api key

* Fixed some typos

* [7.4.7] Production Release (#159)

* [create-pull-request] automated change

* Fix auto-prod PR to include Cocoapod spec update

---------

Co-authored-by: cdillard-NewRelic <[email protected]>
Co-authored-by: Chris Dillard <[email protected]>

* push log reporting back to working state

* Add entity.guid back into NRLogger payload.

* [7.4.8-rc.710] Staging Release

* Include Prod Podspec Job by default in productionDeploy

* Verbose logging to Loggin endpoint

* log sessionId on logs endpoint success

* ws fix

* push WIP for /connect config parse

* Code dynamic enable/disable of LogReporting based on connect response

* Remote logging config

* [create-pull-request] automated change

* Initial pass at handling 409 to reconnect and fetch new config

* Send Support Metric kNRMAConfigurationUpdated when Logging Config is updated

* Impl setLogEntityGuid

* feat: Remote Logging with manual set entityGuid and ingestKey feature complete.

* NR-220019: App Token auth

* NR-220019: Adds GHA for Bespoke Branch Based Build (#198)

* Add 100 logs test, fix levelToString for "level" attribute on log messages.

* NR-228761: Implement uploadQueue for log data, NRLoggerTests

* Logs fix

* Use correct endpoints for logging

* [7.4.9-rc.824] Staging Release

* Fixing a merge mistake

* [7.4.9-rc.827] Staging Release

* [create-pull-request] automated change

* NR-223195: Support metric for success and failure remote logging

* NR-227297: logErrorObject impl, NR-227300: logAttributes impl

* [7.4.10-rc.860] Staging Release

* [7.4.10-rc.863] Staging Release

* NR-251740 - DT headers to dataTaskWithRequest call

When adding support for the New Event System, headers were improperly added just to the mutable request, which first was not even used to create the NSURLSessionTask. The headers were added to the mutableRequest after the task was created, meaning that it was not part of the task.

* [7.4.10-rc.867] Staging Release

* [create-pull-request] automated change

* Log attributes

* [7.4.11-rc.909] Staging Release

* bump runSymbolTool v to 7.4.11

* [7.4.11-rc.917] Staging Release

* [create-pull-request] automated change (#235)

Co-authored-by: cdillard-NewRelic <[email protected]>

* Staging 7.4.12 (#252)

* NR-256157: Remove Sample flag from traceState header for dist tracing (#229)

* [iOS] NR-266202: Adjust CryptoKit sha1 -> sha1256 (#240)

* [iOS] NR-266202: Adjust CryptoKit sha1 -> sha1256

* NR-266202: update xample

* NR-261761: NSSecureCoding (#249)

* 7.4.12 version bump, Dsym-upload-Tools: A  couple missed things for dsym-upload-tools, targeting 7.4.12 for fixing this (#251)

* dsym-upload-tools-update-agent-v

* Bump iOS agent project o 7.4.12, Bump dsym-upload-tools to 7.4.12

* fix to 7.4.12

* [7.4.12-rc.971] Staging Release

* [create-pull-request] automated change

* [7.5.0-rc.1036] Staging Release

* [create-pull-request] automated change

* Use macos-13 and xcode 14.3 for now w prod

* rem codecov in prod for now

* [create-pull-request] automated change

* Bump main branch swift package tools to 5.9 (#294)

* bump v to 7.5.2

---------

Co-authored-by: cdillard-NewRelic <[email protected]>
Co-authored-by: mbruin-NR <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mike Bruin <[email protected]>
Co-authored-by: mbruin-NR <[email protected]>
Co-authored-by: smalsam-newr <[email protected]>
Co-authored-by: smalsam-newr <[email protected]>
Co-authored-by: Steve Malsam <[email protected]>

* NR-303754 moved the retrieving of the payload to before dispatch_async and tried to be more safe in places (#287)

* NRMASAM sessionAttributeJSONString fix (#285)

* Fix up case that "level": null is received from config (#296)

* bump swift package tools to 5.9 (#293)

* bump fastlane rexml to fix depandabot (#299)

* NR-305349 - NRMAAnalytics lazy initialization (#297)

* NR-305349 - NRMAAnalytics lazy initialization

Check if NRMAAnalytics is already initialized before blindly re-initializing it again.

* Start a new session after background

When coming out of the background, we want to be able to start a new session, with a new session start time. This enables that.

* NR-285004 adding a readme for the example app (#303)

* NR-285004 adding a readme for the example app

* Added a link to the example app readme in the real readme

* Update README.md

* NR-304960: Investigating the harvestNow Impl I see how it could cause app hang, this change causes harvestNow to work the same way as general app harvest. (#290)

* NR-307059 trying to make tests less flakey (#304)

* NR-307059 trying to make tests less flakey

* Added comments for the new public NRLogger.h function

* Returning an error from the get data function

* Logging the error if there is one

* NR-313973: Add Instrumentation Insights to /log (#307)

* NR-313973: Add Instrumentation Insights to /log

* NR-313973: fix

* NR-313973: adjust NRLogerTests

---------

Co-authored-by: Chris Dillard <[email protected]>
Co-authored-by: cdillard-NewRelic <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: mbruin-NR <[email protected]>
Co-authored-by: smalsam-newr <[email protected]>
Co-authored-by: smalsam-newr <[email protected]>
Co-authored-by: Steve Malsam <[email protected]>
  • Loading branch information
8 people authored Sep 24, 2024
1 parent 9a96333 commit e4bda15
Show file tree
Hide file tree
Showing 24 changed files with 277 additions and 168 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
name : TestIOS
# runs-on: will be set to macos-latest when running on actual GHA.
# *** runs-on: ubuntu-latest is used when running via act on mac os. ***
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@master
with:
submodules: true

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install lcov
run: |
Expand All @@ -40,11 +40,6 @@ jobs:
- name: Run tests on iOS (using fastlane)
run: bundle exec fastlane runIOSTests

- uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.xml

testTVOS:
name : TestTVOS
# runs-on: will be set to macos-latest when running on actual GHA.
Expand All @@ -57,7 +52,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install lcov
run: brew install lcov
Expand All @@ -83,7 +78,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install lcov
run: brew install lcov
Expand All @@ -101,7 +96,7 @@ jobs:
name: DeployS3
# runs-on: will be set to macos-latest when running on actual GHA.
# *** runs-on: ubuntu-latest is used when running via act on mac os. ***
runs-on: macos-latest
runs-on: macos-13
needs: [testIOS, testTVOS, testWatchOS]
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
outputs:
Expand All @@ -113,7 +108,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install the Apple certificate and provisioning profile
env:
Expand Down
76 changes: 38 additions & 38 deletions Agent.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6117,9 +6117,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = RQZ9D969HD;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -6172,9 +6172,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -6249,10 +6249,10 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -6324,10 +6324,10 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -6368,12 +6368,12 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
"DEVELOPMENT_TEAM[sdk=macosx*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6397,7 +6397,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
Expand Down Expand Up @@ -6428,11 +6428,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.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -6454,7 +6454,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
Expand All @@ -6479,9 +6479,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = RQZ9D969HD;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand Down Expand Up @@ -6538,9 +6538,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand Down Expand Up @@ -6589,9 +6589,9 @@
CLANG_ENABLE_CODE_COVERAGE = YES;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/UnitTests/",
"${SRCROOT}/**",
Expand Down Expand Up @@ -6628,9 +6628,9 @@
CLANG_ENABLE_CODE_COVERAGE = YES;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/UnitTests/",
"${SRCROOT}/**",
Expand Down Expand Up @@ -6668,12 +6668,12 @@
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
"DEVELOPMENT_TEAM[sdk=appletvos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6695,7 +6695,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
Expand All @@ -6721,11 +6721,11 @@
CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6746,7 +6746,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
Expand All @@ -6772,9 +6772,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand Down Expand Up @@ -6834,9 +6834,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand Down Expand Up @@ -6892,12 +6892,12 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=watchos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -6920,7 +6920,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "";
Expand Down Expand Up @@ -6950,12 +6950,12 @@
CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=watchos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -6977,7 +6977,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "";
Expand Down
1 change: 1 addition & 0 deletions Agent/Analytics/NRMAAnalytics.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

- (void) sessionWillEnd;
- (void) newSession;
- (void) newSessionWithStartTime:(long long) sessionStartTime;

//value is either a NSString or NSNumber;
- (BOOL) setSessionAttribute:(NSString*)name value:(id)value;
Expand Down
Loading

0 comments on commit e4bda15

Please sign in to comment.