Add event environment to extended reporting api, rename errorEnvironm…

…ent to eventEnvironment
appmetrica · Dec 22, 2023 · c4c53eb · c4c53eb
1 parent e398348
commit c4c53eb
Show file tree

Hide file tree

Showing 59 changed files with 485 additions and 349 deletions.
diff --git a/.mapping.json b/.mapping.json
@@ -439,15 +439,14 @@
   "AppMetricaCore/Sources/Model/Event/AMACustomEventParameters.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMACustomEventParameters.m",
   "AppMetricaCore/Sources/Model/Event/AMADummyAppEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyAppEnvironmentComposer.h",
   "AppMetricaCore/Sources/Model/Event/AMADummyAppEnvironmentComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyAppEnvironmentComposer.m",
-  "AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.h",
-  "AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.m",
+  "AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.h",
+  "AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.m",
   "AppMetricaCore/Sources/Model/Event/AMADummyLocationComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyLocationComposer.h",
   "AppMetricaCore/Sources/Model/Event/AMADummyLocationComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMADummyLocationComposer.m",
   "AppMetricaCore/Sources/Model/Event/AMAEncryptedFileStorageFactory.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEncryptedFileStorageFactory.h",
   "AppMetricaCore/Sources/Model/Event/AMAEncryptedFileStorageFactory.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEncryptedFileStorageFactory.m",
   "AppMetricaCore/Sources/Model/Event/AMAEnvironmentContainer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEnvironmentContainer.h",
   "AppMetricaCore/Sources/Model/Event/AMAEnvironmentContainer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEnvironmentContainer.m",
-  "AppMetricaCore/Sources/Model/Event/AMAErrorEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAErrorEnvironmentComposer.h",
   "AppMetricaCore/Sources/Model/Event/AMAEvent.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEvent.h",
   "AppMetricaCore/Sources/Model/Event/AMAEvent.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEvent.m",
   "AppMetricaCore/Sources/Model/Event/AMAEventBuilder.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventBuilder.h",
@@ -459,6 +458,7 @@
   "AppMetricaCore/Sources/Model/Event/AMAEventComposerProvider.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventComposerProvider.h",
   "AppMetricaCore/Sources/Model/Event/AMAEventComposerProvider.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventComposerProvider.m",
   "AppMetricaCore/Sources/Model/Event/AMAEventEncryptionType.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventEncryptionType.h",
+  "AppMetricaCore/Sources/Model/Event/AMAEventEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventEnvironmentComposer.h",
   "AppMetricaCore/Sources/Model/Event/AMAEventNumbersFiller.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventNumbersFiller.h",
   "AppMetricaCore/Sources/Model/Event/AMAEventNumbersFiller.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventNumbersFiller.m",
   "AppMetricaCore/Sources/Model/Event/AMAEventTypeResolver.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAEventTypeResolver.h",
@@ -469,8 +469,8 @@
   "AppMetricaCore/Sources/Model/Event/AMAExtrasContainer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAExtrasContainer.m",
   "AppMetricaCore/Sources/Model/Event/AMAFilledAppEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledAppEnvironmentComposer.h",
   "AppMetricaCore/Sources/Model/Event/AMAFilledAppEnvironmentComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledAppEnvironmentComposer.m",
-  "AppMetricaCore/Sources/Model/Event/AMAFilledErrorEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledErrorEnvironmentComposer.h",
-  "AppMetricaCore/Sources/Model/Event/AMAFilledErrorEnvironmentComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledErrorEnvironmentComposer.m",
+  "AppMetricaCore/Sources/Model/Event/AMAFilledEventEnvironmentComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledEventEnvironmentComposer.h",
+  "AppMetricaCore/Sources/Model/Event/AMAFilledEventEnvironmentComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledEventEnvironmentComposer.m",
   "AppMetricaCore/Sources/Model/Event/AMAFilledExtrasComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledExtrasComposer.h",
   "AppMetricaCore/Sources/Model/Event/AMAFilledExtrasComposer.m":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledExtrasComposer.m",
   "AppMetricaCore/Sources/Model/Event/AMAFilledLocationComposer.h":"mobile/metrika/ios/appmetrica-sdk/public/AppMetricaCore/Sources/Model/Event/AMAFilledLocationComposer.h",

diff --git a/AppMetricaCore/Sources/AMAAppMetrica.m b/AppMetricaCore/Sources/AMAAppMetrica.m
@@ -209,13 +209,15 @@ + (BOOL)isReporterCreatedForAPIKey:(NSString *)apiKey
 + (void)reportEventWithType:(NSUInteger)eventType
                        name:(nullable NSString *)name
                       value:(nullable NSString *)value
-                environment:(nullable NSDictionary *)environment
+           eventEnvironment:(NSDictionary *)eventEnvironment
+             appEnvironment:(NSDictionary *)appEnvironment
                   onFailure:(nullable void (^)(NSError *error))onFailure
 {
     [self reportEventWithType:eventType
                          name:name
                         value:value
-                  environment:environment
+             eventEnvironment:eventEnvironment
+               appEnvironment:appEnvironment
                        extras:nil
                     onFailure:onFailure];
 }
@@ -231,33 +233,36 @@ + (void)reportEventWithParameters:(AMACustomEventParameters *)parameters
 + (void)reportEventWithType:(NSUInteger)eventType
                        name:(nullable NSString *)name
                       value:(nullable NSString *)value
-                environment:(nullable NSDictionary *)environment
+           eventEnvironment:(NSDictionary *)eventEnvironment
+             appEnvironment:(NSDictionary *)appEnvironment
                      extras:(nullable NSDictionary<NSString *, NSData *> *)extras
                   onFailure:(nullable void (^)(NSError *error))onFailure
 {
     if ([self isAppMetricaStartedWithLogging:onFailure]) {
         [[self sharedImpl] reportEventWithType:eventType
                                           name:name
                                          value:value
-                                   environment:environment
+                              eventEnvironment:eventEnvironment
+                                appEnvironment:appEnvironment
                                         extras:extras
                                      onFailure:onFailure];
     }
 }
 
 + (void)reportBinaryEventWithType:(NSUInteger)eventType
-                             data:(NSData *)data
-                          gZipped:(BOOL)gZipped
-                      environment:(nullable NSDictionary *)environment
-                           extras:(nullable NSDictionary<NSString *, NSData *> *)extras
-                        onFailure:(nullable void (^)(NSError *error))onFailure
+                            data:(NSData *)data
+                         gZipped:(BOOL)gZipped
+                eventEnvironment:(nullable NSDictionary *)eventEnvironment
+                  appEnvironment:(nullable NSDictionary *)appEnvironment
+                          extras:(nullable NSDictionary<NSString *, NSData *> *)extras
+                       onFailure:(nullable void (^)(NSError *error))onFailure
 {
-
     if ([self isAppMetricaStartedWithLogging:onFailure]) {
         [[self sharedImpl] reportBinaryEventWithType:eventType
                                                 data:data
                                              gZipped:gZipped
-                                         environment:environment
+                                    eventEnvironment:eventEnvironment
+                                      appEnvironment:appEnvironment
                                               extras:extras
                                            onFailure:onFailure];
     }
@@ -269,7 +274,8 @@ + (void)reportFileEventWithType:(NSUInteger)eventType
                        gZipped:(BOOL)gZipped
                       encrypted:(BOOL)encrypted
                       truncated:(BOOL)truncated
-                    environment:(nullable NSDictionary *)environment
+               eventEnvironment:(NSDictionary *)eventEnvironment
+                 appEnvironment:(NSDictionary *)appEnvironment
                          extras:(nullable NSDictionary<NSString *, NSData *> *)extras
                       onFailure:(nullable void (^)(NSError *error))onFailure
 {
@@ -280,7 +286,8 @@ + (void)reportFileEventWithType:(NSUInteger)eventType
                                            gZipped:gZipped
                                          encrypted:encrypted
                                          truncated:truncated
-                                       environment:environment
+                                  eventEnvironment:eventEnvironment
+                                    appEnvironment:appEnvironment
                                             extras:extras
                                          onFailure:onFailure];
     }

diff --git a/AppMetricaCore/Sources/AMAAppMetricaImpl.h b/AppMetricaCore/Sources/AMAAppMetricaImpl.h
@@ -42,27 +42,34 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)reportEvent:(NSString *)eventName
          parameters:(NSDictionary *)params
           onFailure:(nullable void (^)(NSError *error))onFailure;
+
 - (void)reportEventWithType:(NSUInteger)eventType
                        name:(NSString *)name
                       value:(NSString *)value
-                environment:(nullable NSDictionary *)environment
+           eventEnvironment:(nullable NSDictionary *)eventEnvironment
+             appEnvironment:(nullable NSDictionary *)appEnvironment
                      extras:(nullable NSDictionary<NSString *, NSData *> *)extras
                   onFailure:(nullable void (^)(NSError *))onFailure;
+
 - (void)reportBinaryEventWithType:(NSUInteger)eventType
                              data:(NSData *)data
                           gZipped:(BOOL)gZipped
-                      environment:(nullable NSDictionary *)environment
+                 eventEnvironment:(nullable NSDictionary *)eventEnvironment
+                   appEnvironment:(nullable NSDictionary *)appEnvironment
                            extras:(nullable NSDictionary<NSString *, NSData *> *)extras
                         onFailure:(nullable void (^)(NSError *error))onFailure;
+
 - (void)reportFileEventWithType:(NSUInteger)eventType
                            data:(NSData *)data
                        fileName:(NSString *)fileName
                         gZipped:(BOOL)gZipped
                       encrypted:(BOOL)encrypted
                       truncated:(BOOL)truncated
-                    environment:(nullable NSDictionary *)environment
+               eventEnvironment:(nullable NSDictionary *)eventEnvironment
+                 appEnvironment:(nullable NSDictionary *)appEnvironment
                          extras:(nullable NSDictionary<NSString *, NSData *> *)extras
                       onFailure:(nullable void (^)(NSError *error))onFailure;
+
 - (void)reportEventWithParameters:(AMACustomEventParameters * )parameters
                         onFailure:(nullable void (^)(NSError *error))onFailure;
 

diff --git a/AppMetricaCore/Sources/AMAAppMetricaImpl.m b/AppMetricaCore/Sources/AMAAppMetricaImpl.m
@@ -200,7 +200,8 @@ - (void)reportEvent:(NSString *)eventName parameters:(NSDictionary *)params onFa
 - (void)reportEventWithType:(NSUInteger)eventType
                        name:(NSString *)name
                       value:(NSString *)value
-                environment:(NSDictionary *)environment
+           eventEnvironment:(NSDictionary *)eventEnvironment
+             appEnvironment:(NSDictionary *)appEnvironment
                      extras:(NSDictionary<NSString *, NSData *> *)extras
                   onFailure:(void (^)(NSError *))onFailure
 {
@@ -209,7 +210,8 @@ - (void)reportEventWithType:(NSUInteger)eventType
             [self.reporter reportEventWithType:eventType
                                           name:name
                                          value:value
-                                   environment:environment
+                              eventEnvironment:eventEnvironment
+                                appEnvironment:appEnvironment
                                         extras:extras
                                      onFailure:onFailure];
         } onFailure:onFailure];
@@ -219,7 +221,8 @@ - (void)reportEventWithType:(NSUInteger)eventType
 - (void)reportBinaryEventWithType:(NSUInteger)eventType
                              data:(NSData *)data
                           gZipped:(BOOL)gZipped
-                      environment:(NSDictionary *)environment
+                 eventEnvironment:(NSDictionary *)eventEnvironment
+                   appEnvironment:(NSDictionary *)appEnvironment
                            extras:(NSDictionary<NSString *,NSData *> *)extras
                         onFailure:(void (^)(NSError *))onFailure
 {
@@ -228,7 +231,8 @@ - (void)reportBinaryEventWithType:(NSUInteger)eventType
             [self.reporter reportBinaryEventWithType:eventType
                                                 data:data
                                              gZipped:gZipped
-                                         environment:environment
+                                    eventEnvironment:eventEnvironment
+                                      appEnvironment:appEnvironment
                                               extras:extras
                                            onFailure:onFailure];
         } onFailure:onFailure];
@@ -241,7 +245,8 @@ - (void)reportFileEventWithType:(NSUInteger)eventType
                         gZipped:(BOOL)gZipped
                       encrypted:(BOOL)encrypted
                       truncated:(BOOL)truncated
-                    environment:(NSDictionary *)environment
+               eventEnvironment:(NSDictionary *)eventEnvironment
+                 appEnvironment:(NSDictionary *)appEnvironment
                          extras:(NSDictionary<NSString *,NSData *> *)extras
                       onFailure:(void (^)(NSError *))onFailure
 {
@@ -253,7 +258,8 @@ - (void)reportFileEventWithType:(NSUInteger)eventType
                                            gZipped:gZipped
                                          encrypted:encrypted
                                          truncated:truncated
-                                       environment:environment
+                                  eventEnvironment:eventEnvironment
+                                    appEnvironment:appEnvironment
                                             extras:extras
                                          onFailure:onFailure];
         } onFailure:onFailure];
@@ -1044,7 +1050,7 @@ - (void)clearSessionExtra
 
 + (void)syncSetErrorEnvironmentValue:(NSString *)value forKey:(NSString *)key
 {
-    [[AMAReporterStoragesContainer sharedInstance].errorEnvironment addValue:value forKey:key];
+    [[AMAReporterStoragesContainer sharedInstance].eventEnvironment addValue:value forKey:key];
 }
 
 - (void)setErrorEnvironmentValue:(NSString *)value forKey:(NSString *)key

diff --git a/...tricaCore/Sources/Database/Migration/Scheme/AMAConfigurationDatabaseSchemeMigrationTo19.m b/...tricaCore/Sources/Database/Migration/Scheme/AMAConfigurationDatabaseSchemeMigrationTo19.m
@@ -443,7 +443,7 @@ - (AMAEvent *)eventForResultSet:(AMAFMResultSet *)rs
 
     error = nil;
     NSString *errorEnvironmentString = [rs stringForColumn:@"error_environment"];
-    event.errorEnvironment = [AMAJSONSerialization dictionaryWithJSONString:errorEnvironmentString error:&error];
+    event.eventEnvironment = [AMAJSONSerialization dictionaryWithJSONString:errorEnvironmentString error:&error];
 
     return event;
 }
@@ -452,10 +452,7 @@ - (AMAEvent *)eventForResultSet:(AMAFMResultSet *)rs
 {
     NSString *value = [rs stringForColumn:@"value"];
     switch (eventType) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        case AMAEventTypeCrash:
-#pragma clang diagnostic pop
+        case 3:
         case AMAEventTypeProtobufCrash:
         case AMAEventTypeProtobufANR: {
             NSString *filePath = [value stringByAppendingPathExtension:@"crash"];

diff --git a/AppMetricaCore/Sources/Logging/AMAEventLogger.m b/AppMetricaCore/Sources/Logging/AMAEventLogger.m
@@ -52,8 +52,6 @@ - (NSString *)nameForEventType:(AMAEventType)type
             return @"Error";
         case AMAEventTypeAlive:
             return @"Alive";
-        case AMAEventTypeAccount:
-            return @"Account";
         case AMAEventTypeFirst:
             return @"First";
         case AMAEventTypeOpen:
@@ -70,13 +68,6 @@ - (NSString *)nameForEventType:(AMAEventType)type
             return @"E-Commerce";
         case AMAEventTypeAdRevenue:
             return @"AdRevenue";
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        case AMAEventTypeError:
-            return @"Deprecated Error";
-        case AMAEventTypeCrash:
-            return @"Deprecated Crash";
-#pragma clang diagnostic pop
         default:
             return nil;
     }

diff --git a/AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.h b/AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.h
diff --git a/AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.m b/AppMetricaCore/Sources/Model/Event/AMADummyErrorEnvironmentComposer.m
diff --git a/AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.h b/AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.h
@@ -0,0 +1,7 @@
+
+#import <Foundation/Foundation.h>
+#import "AMAEventEnvironmentComposer.h"
+
+@interface AMADummyEventEnvironmentComposer : NSObject <AMAEventEnvironmentComposer>
+
+@end
diff --git a/AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.m b/AppMetricaCore/Sources/Model/Event/AMADummyEventEnvironmentComposer.m
@@ -0,0 +1,11 @@
+
+#import "AMADummyEventEnvironmentComposer.h"
+
+@implementation AMADummyEventEnvironmentComposer
+
+- (NSDictionary *)compose
+{
+    return nil;
+}
+
+@end
diff --git a/AppMetricaCore/Sources/Model/Event/AMAEvent.h b/AppMetricaCore/Sources/Model/Event/AMAEvent.h
@@ -24,7 +24,7 @@
 @property (nonatomic, assign) NSUInteger type; // AMAEventType
 @property (nonatomic, copy) CLLocation *location;
 @property (nonatomic, assign) AMAOptionalBool locationEnabled;
-@property (nonatomic, copy) NSDictionary *errorEnvironment;
+@property (nonatomic, copy) NSDictionary *eventEnvironment;
 @property (nonatomic, copy) NSDictionary *appEnvironment;
 @property (nonatomic, copy) NSString *profileID;
 @property (nonatomic, assign) NSUInteger bytesTruncated;