@dynatrace/react-native-plugin 2.263.2 → 2.265.2

package/README.md

@@ -29,8 +29,8 @@ If you want to start using this plugin and are not a Dynatrace customer yet, hea
 ## Agent Versions
 This agent versions are configured in this plugin:
 
-* iOS Agent: 8.263.2.1005
-* Android Agent: 8.263.1.1002
+* iOS Agent: 8.265.1.1003
+* Android Agent: 8.265.1.1002
 
 ## Quick Setup
 
@@ -1098,6 +1098,11 @@ If you are struggling with a problem, submit a support ticket to Dynatrace (supp
 <br/><br/>
 ## Changelog
 
+2.265.2
+* Updated Android (8.265.1.1002) & iOS Agent (8.265.1.1003)
+* Fixed Metro problem because of dynamic require
+* Fixed enterManualAction/enterAutoAction API
+
 2.263.2
 * Updated Android (8.263.1.1002) & iOS Agent (8.263.2.1005)
 * Fixed execution of tests via Jest 28.x

package/android/build.gradle

@@ -36,7 +36,7 @@ repositories {
 }
 
 dependencies {
-	implementation 'com.dynatrace.agent:agent-android:8.263.1.1002'
+	implementation 'com.dynatrace.agent:agent-android:8.265.1.1002'
     implementation "com.facebook.react:react-native:${safeExtGet('reactNative', '+')}"
 }
   

package/android/src/main/java/com/dynatrace/android/agent/DynatraceRNBridge.java

@@ -101,20 +101,21 @@ public class DynatraceRNBridge extends ReactContextBaseJavaModule {
         }
     }
 
-    private void enterManualActionWithParent(String name, String key, int parentKey, String platform) {
+    @ReactMethod
+    public void enterManualActionWithParent(String name, String key, String parentKey, String platform) {
 		if (this.shouldWorkOnAndroid(platform)) {
 			DTXAction parent = actions.get(parentKey);
 
 			if (parent != null) {
 				actions.put(key, Dynatrace.enterAction(name, parent));
 			} else {
-				enterAction(name, key, platform);
+				enterManualAction(name, key, platform);
 			}
 		}
 	}
 
     @ReactMethod
-    public void leaveAction(String key, String platform) {
+    public void leaveAction(String key, boolean leave, String platform) {
         if (this.shouldWorkOnAndroid(platform)) {
             DTXAction action = getAction(key);
             if (action == null) return;

package/files/plugin.gradle

@@ -1,3 +1,3 @@
 dependencies {
-	classpath 'com.dynatrace.tools.android:gradle-plugin:8.263.1.1002'
+	classpath 'com.dynatrace.tools.android:gradle-plugin:8.265.1.1002'
 }

package/ios/DynatraceRNBridge.m

@@ -79,21 +79,53 @@ RCT_EXPORT_METHOD(enterAction:(NSString *)name key:(nonnull NSString *)key platf
   }
 }
 
-RCT_EXPORT_METHOD(enterActionWithParent:(NSString *)name key:(nonnull NSString *)key parentKey:(nonnull NSString *)parentKey platform: (NSString *) platform)
+RCT_EXPORT_METHOD(enterManualAction:(NSString *)name key:(nonnull NSString *)key platform: (NSString *) platform)
+{
+  if ([self shouldWorkOnIosWithPlatform: platform])
+  {
+    DTXAction *action = [DTXAction enterActionWithName:name];
+    
+    if (action)
+    {
+        [actionDict setObject:action forKey:key];
+    }
+  }
+}
+
+RCT_EXPORT_METHOD(enterManualActionWithParent:(NSString *)name key:(nonnull NSString *)key parentKey:(nonnull NSString *)parentKey platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
-        [self newAction:name key:key parentAction:[self getAction:parentKey]];
+        DTXAction *parentAction = [self getAction:parentKey];
+
+        if (parentAction != nil)
+        {
+            DTXAction *childAction = [DTXAction enterActionWithName:name parentAction:parentAction];
+            
+            if (childAction)
+            {
+                [actionDict setObject:childAction forKey:key];
+            }
+        }
+        else
+        {
+            [self enterManualAction:name key:key platform:platform];
+        }
     }
 }
 
-RCT_EXPORT_METHOD(leaveAction:(nonnull NSString *)key platform: (NSString *) platform)
+RCT_EXPORT_METHOD(leaveAction:(nonnull NSString *)key leave: (BOOL) leave platform: (NSString *) platform)
 {
     if ([self shouldWorkOnIosWithPlatform: platform])
     {
         DTXAction *action = [self getAction:key];
         if (action == nil) return;
         [actionDict removeObjectForKey:key];
+
+        if(leave)
+        {
+            [action leaveAction];
+        }
     }
 }
 

package/ios/lib/Dynatrace.xcframework/Info.plist

@@ -6,18 +6,15 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64_x86_64-simulator</string>
+			<string>tvos-arm64</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>tvos</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
@@ -36,19 +33,22 @@
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>tvos-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>ios</string>
+			<string>tvos</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>tvos-arm64</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>Dynatrace.framework</string>
 			<key>SupportedArchitectures</key>
@@ -56,7 +56,7 @@
 				<string>arm64</string>
 			</array>
 			<key>SupportedPlatform</key>
-			<string>tvos</string>
+			<string>ios</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Headers/Dynatrace.h

@@ -1,5 +1,5 @@
 // Dynatrace.h
-// Version: 8.263.2.1005
+// Version: 8.265.1.1003
 //
 // These materials contain confidential information and
 // trade secrets of Dynatrace Corporation. You shall

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Headers/DynatraceSwiftUI.h

@@ -0,0 +1,31 @@
+// DynatraceSwiftUI.h
+// Version: ${version}
+//
+// These materials contain confidential information and
+// trade secrets of Dynatrace Corporation. You shall
+// maintain the materials as confidential and shall not
+// disclose its contents to any third party except as may
+// be required by law or regulation. Use, disclosure,
+// or reproduction is prohibited without the prior express
+// written permission of Dynatrace LLC.
+//
+// All Dynatrace products listed within the materials are
+// trademarks of Dynatrace Corporation. All other company
+// or product names are trademarks of their respective owners.
+//
+// Copyright 2011-2023 Dynatrace LLC
+
+#import <Foundation/Foundation.h>
+
+@interface DynatraceSwiftUI: NSObject
+/*!
+ @brief Gets invoked automatically by the SwiftUI instrumentor before a SwiftUI view has appeared.
+ */
++ (void)swiftUIViewWillAppear:(NSDictionary* _Nonnull)reportValues viewName:(NSString* _Nonnull)viewName view:(id _Nonnull)view with:(id _Nonnull)lifecycleHolder createAction:(BOOL)createAction;
+
+/*!
+ @brief Gets invoked automatically by the SwiftUI instrumentor when a SwiftUI view has disappeared.
+ */
++ (void)swiftUIViewDidDisappear:(id _Nonnull)view with:(id _Nonnull)lifecycleHolder;
+
+@end

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Headers/Framework.h

@@ -15,4 +15,5 @@ FOUNDATION_EXPORT double Dynatrace_FrameworkVersionNumber;
 FOUNDATION_EXPORT const unsigned char Dynatrace_FrameworkVersionString[];
 
 // In this header, you should import all the public headers of your framework
-#import <Dynatrace/Dynatrace.h>
+#import "Dynatrace.h"
+#import "DynatraceSwiftUI.h"

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Modules/Dynatrace.swiftmodule/arm64-apple-ios.abi.json

@@ -11,6 +11,192 @@
         "declKind": "Import",
         "moduleName": "Dynatrace"
       },
+      {
+        "kind": "TypeDecl",
+        "name": "instrument",
+        "printedName": "instrument",
+        "children": [
+          {
+            "kind": "Constructor",
+            "name": "init",
+            "printedName": "init(with:viewName:createAction:_:)",
+            "children": [
+              {
+                "kind": "TypeNominal",
+                "name": "instrument",
+                "printedName": "Dynatrace.instrument<τ_0_0>",
+                "children": [
+                  {
+                    "kind": "TypeNominal",
+                    "name": "GenericTypeParam",
+                    "printedName": "τ_0_0"
+                  }
+                ],
+                "usr": "s:9Dynatrace10instrumentV"
+              },
+              {
+                "kind": "TypeNominal",
+                "name": "Dictionary",
+                "printedName": "[Swift.String : Swift.String]",
+                "children": [
+                  {
+                    "kind": "TypeNominal",
+                    "name": "String",
+                    "printedName": "Swift.String",
+                    "usr": "s:SS"
+                  },
+                  {
+                    "kind": "TypeNominal",
+                    "name": "String",
+                    "printedName": "Swift.String",
+                    "usr": "s:SS"
+                  }
+                ],
+                "usr": "s:SD"
+              },
+              {
+                "kind": "TypeNominal",
+                "name": "String",
+                "printedName": "Swift.String",
+                "usr": "s:SS"
+              },
+              {
+                "kind": "TypeNominal",
+                "name": "Bool",
+                "printedName": "Swift.Bool",
+                "hasDefaultArg": true,
+                "usr": "s:Sb"
+              },
+              {
+                "kind": "TypeFunc",
+                "name": "Function",
+                "printedName": "() -> τ_0_0",
+                "children": [
+                  {
+                    "kind": "TypeNominal",
+                    "name": "GenericTypeParam",
+                    "printedName": "τ_0_0"
+                  },
+                  {
+                    "kind": "TypeNominal",
+                    "name": "Void",
+                    "printedName": "()"
+                  }
+                ]
+              }
+            ],
+            "declKind": "Constructor",
+            "usr": "s:9Dynatrace10instrumentV4with8viewName12createAction_ACyxGSDyS2SG_SSSbxyctcfc",
+            "mangledName": "$s9Dynatrace10instrumentV4with8viewName12createAction_ACyxGSDyS2SG_SSSbxyctcfc",
+            "moduleName": "Dynatrace",
+            "genericSig": "<τ_0_0 where τ_0_0 : SwiftUI.View>",
+            "sugared_genericSig": "<Content where Content : SwiftUI.View>",
+            "declAttributes": [
+              "AccessControl"
+            ],
+            "init_kind": "Designated"
+          },
+          {
+            "kind": "Var",
+            "name": "body",
+            "printedName": "body",
+            "children": [
+              {
+                "kind": "TypeNominal",
+                "name": "OpaqueTypeArchetype",
+                "printedName": "some SwiftUI.View",
+                "children": [
+                  {
+                    "kind": "TypeNominal",
+                    "name": "View",
+                    "printedName": "SwiftUI.View",
+                    "usr": "s:7SwiftUI4ViewP"
+                  }
+                ]
+              }
+            ],
+            "declKind": "Var",
+            "usr": "s:9Dynatrace10instrumentV4bodyQrvp",
+            "mangledName": "$s9Dynatrace10instrumentV4bodyQrvp",
+            "moduleName": "Dynatrace",
+            "declAttributes": [
+              "Custom",
+              "AccessControl"
+            ],
+            "accessors": [
+              {
+                "kind": "Accessor",
+                "name": "Get",
+                "printedName": "Get()",
+                "children": [
+                  {
+                    "kind": "TypeNominal",
+                    "name": "OpaqueTypeArchetype",
+                    "printedName": "some SwiftUI.View",
+                    "children": [
+                      {
+                        "kind": "TypeNominal",
+                        "name": "View",
+                        "printedName": "SwiftUI.View",
+                        "usr": "s:7SwiftUI4ViewP"
+                      }
+                    ]
+                  }
+                ],
+                "declKind": "Accessor",
+                "usr": "s:9Dynatrace10instrumentV4bodyQrvg",
+                "mangledName": "$s9Dynatrace10instrumentV4bodyQrvg",
+                "moduleName": "Dynatrace",
+                "genericSig": "<τ_0_0 where τ_0_0 : SwiftUI.View>",
+                "sugared_genericSig": "<Content where Content : SwiftUI.View>",
+                "accessorKind": "get"
+              }
+            ]
+          }
+        ],
+        "declKind": "Struct",
+        "usr": "s:9Dynatrace10instrumentV",
+        "mangledName": "$s9Dynatrace10instrumentV",
+        "moduleName": "Dynatrace",
+        "genericSig": "<τ_0_0 where τ_0_0 : SwiftUI.View>",
+        "sugared_genericSig": "<Content where Content : SwiftUI.View>",
+        "intro_iOS": "13.0",
+        "declAttributes": [
+          "AccessControl",
+          "Available"
+        ],
+        "conformances": [
+          {
+            "kind": "Conformance",
+            "name": "View",
+            "printedName": "View",
+            "children": [
+              {
+                "kind": "TypeWitness",
+                "name": "Body",
+                "printedName": "Body",
+                "children": [
+                  {
+                    "kind": "TypeNominal",
+                    "name": "OpaqueTypeArchetype",
+                    "printedName": "some SwiftUI.View",
+                    "children": [
+                      {
+                        "kind": "TypeNominal",
+                        "name": "View",
+                        "printedName": "SwiftUI.View",
+                        "usr": "s:7SwiftUI4ViewP"
+                      }
+                    ]
+                  }
+                ]
+              }
+            ],
+            "usr": "s:7SwiftUI4ViewP",
+            "mangledName": "$s7SwiftUI4ViewP"
+          }
+        ]
+      },
       {
         "kind": "TypeDecl",
         "name": "View",
@@ -67,5 +253,13 @@
     ],
     "json_format_version": 8
   },
-  "ConstValues": []
+  "ConstValues": [
+    {
+      "filePath": "\/opt\/jenkins\/workspace\/eagent_ios-agent_release_8.265.x\/adk\/DynatraceUEM\/Dynatrace\/SwiftUIExtensions.swift",
+      "kind": "BooleanLiteral",
+      "offset": 683,
+      "length": 4,
+      "value": "true"
+    }
+  ]
 }

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Modules/Dynatrace.swiftmodule/arm64-apple-ios.private.swiftinterface

@@ -12,3 +12,11 @@ extension SwiftUI.View {
   public func skippingInstrumentation() -> some SwiftUI.View
   
 }
+@available(iOS 13.0, *)
+public struct instrument<Content> : SwiftUI.View where Content : SwiftUI.View {
+  public init(with values: [Swift.String : Swift.String], viewName: Swift.String, createAction: Swift.Bool = true, @SwiftUI.ViewBuilder _ content: @escaping () -> Content)
+  @_Concurrency.MainActor(unsafe) public var body: some SwiftUI.View {
+    get
+  }
+  public typealias Body = @_opaqueReturnTypeOf("$s9Dynatrace10instrumentV4bodyQrvp", 0) __<Content>
+}

package/ios/lib/Dynatrace.xcframework/ios-arm64/Dynatrace.framework/Modules/Dynatrace.swiftmodule/arm64-apple-ios.swiftinterface

@@ -12,3 +12,11 @@ extension SwiftUI.View {
   public func skippingInstrumentation() -> some SwiftUI.View
   
 }
+@available(iOS 13.0, *)
+public struct instrument<Content> : SwiftUI.View where Content : SwiftUI.View {
+  public init(with values: [Swift.String : Swift.String], viewName: Swift.String, createAction: Swift.Bool = true, @SwiftUI.ViewBuilder _ content: @escaping () -> Content)
+  @_Concurrency.MainActor(unsafe) public var body: some SwiftUI.View {
+    get
+  }
+  public typealias Body = @_opaqueReturnTypeOf("$s9Dynatrace10instrumentV4bodyQrvp", 0) __<Content>
+}

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/Headers/Dynatrace.h

@@ -1,5 +1,5 @@
 // Dynatrace.h
-// Version: 8.263.2.1005
+// Version: 8.265.1.1003
 //
 // These materials contain confidential information and
 // trade secrets of Dynatrace Corporation. You shall

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/Headers/DynatraceSwiftUI.h

@@ -0,0 +1,31 @@
+// DynatraceSwiftUI.h
+// Version: ${version}
+//
+// These materials contain confidential information and
+// trade secrets of Dynatrace Corporation. You shall
+// maintain the materials as confidential and shall not
+// disclose its contents to any third party except as may
+// be required by law or regulation. Use, disclosure,
+// or reproduction is prohibited without the prior express
+// written permission of Dynatrace LLC.
+//
+// All Dynatrace products listed within the materials are
+// trademarks of Dynatrace Corporation. All other company
+// or product names are trademarks of their respective owners.
+//
+// Copyright 2011-2023 Dynatrace LLC
+
+#import <Foundation/Foundation.h>
+
+@interface DynatraceSwiftUI: NSObject
+/*!
+ @brief Gets invoked automatically by the SwiftUI instrumentor before a SwiftUI view has appeared.
+ */
++ (void)swiftUIViewWillAppear:(NSDictionary* _Nonnull)reportValues viewName:(NSString* _Nonnull)viewName view:(id _Nonnull)view with:(id _Nonnull)lifecycleHolder createAction:(BOOL)createAction;
+
+/*!
+ @brief Gets invoked automatically by the SwiftUI instrumentor when a SwiftUI view has disappeared.
+ */
++ (void)swiftUIViewDidDisappear:(id _Nonnull)view with:(id _Nonnull)lifecycleHolder;
+
+@end

package/ios/lib/Dynatrace.xcframework/ios-arm64_x86_64-simulator/Dynatrace.framework/Headers/Framework.h

@@ -15,4 +15,5 @@ FOUNDATION_EXPORT double Dynatrace_FrameworkVersionNumber;
 FOUNDATION_EXPORT const unsigned char Dynatrace_FrameworkVersionString[];
 
 // In this header, you should import all the public headers of your framework
-#import <Dynatrace/Dynatrace.h>
+#import "Dynatrace.h"
+#import "DynatraceSwiftUI.h"