Skip to content

Commit 04d209c

Browse files
markushimarkushi
committed
Revert local test changes
1 parent 5f14ca0 commit 04d209c

File tree

2 files changed

+137
-157
lines changed

2 files changed

+137
-157
lines changed

‎sentry-samples/sentry-samples-android/src/main/AndroidManifest.xml‎

Lines changed: 137 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,191 +1,191 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools">
3+
xmlns:tools="http://schemas.android.com/tools">
44

5-
<!-- extra recommended permission, we'd be able to check network status-->
6-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
5+
<!-- extra recommended permission, we'd be able to check network status-->
6+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
77

8-
<!-- add extra permission (optional) -->
8+
<!-- add extra permission (optional) -->
99

10-
<!-- Just some random permissions to showcase the permission context sent to Sentry -->
11-
<uses-permission android:name="android.permission.CAMERA"/>
12-
<!-- Needed by leakcanary.NotificationEventListener -->
13-
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
10+
<!-- Just some random permissions to showcase the permission context sent to Sentry -->
11+
<uses-permission android:name="android.permission.CAMERA"/>
12+
<!-- Needed by leakcanary.NotificationEventListener -->
13+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
1414

1515
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1616
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING" />
1717

1818
<!-- if your minSdkVersion < 16, this would make usable on minSdkVersion >= 14-->
19-
<uses-sdk
20-
tools:overrideLibrary="io.sentry.android"/>
19+
<uses-sdk
20+
tools:overrideLibrary="io.sentry.android"/>
2121

2222
<uses-feature
2323
android:name="android.hardware.camera"
2424
android:required="false" />
2525

2626
<application
27-
android:name=".MyApplication"
28-
android:icon="@mipmap/ic_launcher"
29-
android:label="@string/app_name"
30-
android:roundIcon="@mipmap/ic_launcher_round"
31-
android:theme="@style/AppTheme"
32-
android:networkSecurityConfig="@xml/network"
33-
tools:ignore="GoogleAppIndexingWarning, UnusedAttribute">
34-
35-
<service
36-
android:name=".DummyService"
37-
android:exported="true"
38-
android:enabled="true"
39-
android:foregroundServiceType="remoteMessaging"/>
40-
41-
<activity
42-
android:name=".MainActivity"
43-
android:exported="true">
44-
<intent-filter>
45-
<action android:name="android.intent.action.MAIN" />
46-
47-
<category android:name="android.intent.category.LAUNCHER" />
48-
</intent-filter>
49-
</activity>
50-
51-
<activity
52-
android:name=".SecondActivity"
53-
android:exported="false" />
54-
55-
<activity
56-
android:name=".ThirdActivityFragment"
57-
android:exported="false" />
58-
59-
<activity
60-
android:name=".GesturesActivity"
61-
android:exported="false" />
62-
63-
<activity
64-
android:name=".PermissionsActivity"
65-
android:exported="false" />
66-
67-
<activity
68-
android:name=".ProfilingActivity"
69-
android:exported="false" />
70-
71-
<activity
72-
android:name=".CustomTabsActivity"
73-
android:exported="false" />
27+
android:name=".MyApplication"
28+
android:icon="@mipmap/ic_launcher"
29+
android:label="@string/app_name"
30+
android:roundIcon="@mipmap/ic_launcher_round"
31+
android:theme="@style/AppTheme"
32+
android:networkSecurityConfig="@xml/network"
33+
tools:ignore="GoogleAppIndexingWarning, UnusedAttribute">
34+
35+
<service
36+
android:name=".DummyService"
37+
android:exported="true"
38+
android:enabled="true"
39+
android:foregroundServiceType="remoteMessaging"/>
7440

7541
<activity
76-
android:name=".compose.ComposeActivity"
77-
android:exported="false" />
42+
android:name=".MainActivity"
43+
android:exported="true">
44+
<intent-filter>
45+
<action android:name="android.intent.action.MAIN" />
7846

79-
<activity android:name=".FrameDataForSpansActivity"
80-
android:exported="false"/>
47+
<category android:name="android.intent.category.LAUNCHER" />
48+
</intent-filter>
49+
</activity>
8150

82-
<activity
83-
android:name=".CameraXActivity"
84-
android:exported="false" />
51+
<activity
52+
android:name=".SecondActivity"
53+
android:exported="false" />
54+
55+
<activity
56+
android:name=".ThirdActivityFragment"
57+
android:exported="false" />
58+
59+
<activity
60+
android:name=".GesturesActivity"
61+
android:exported="false" />
62+
63+
<activity
64+
android:name=".PermissionsActivity"
65+
android:exported="false" />
66+
67+
<activity
68+
android:name=".ProfilingActivity"
69+
android:exported="false" />
70+
71+
<activity
72+
android:name=".CustomTabsActivity"
73+
android:exported="false" />
74+
75+
<activity
76+
android:name=".compose.ComposeActivity"
77+
android:exported="false" />
78+
79+
<activity android:name=".FrameDataForSpansActivity"
80+
android:exported="false"/>
81+
82+
<activity
83+
android:name=".CameraXActivity"
84+
android:exported="false" />
8585

86-
<!-- NOTE: Replace the test DSN below with YOUR OWN DSN to see the events from this app in your Sentry project/dashboard-->
87-
<meta-data android:name="io.sentry.dsn" android:value="https://8a26495179336af214ba94bafed37efc@o447951.ingest.us.sentry.io/4509161790832641" />
86+
<!-- NOTE: Replace the test DSN below with YOUR OWN DSN to see the events from this app in your Sentry project/dashboard-->
87+
<meta-data android:name="io.sentry.dsn" android:value="https://8a26495179336af214ba94bafed37efc@o447951.ingest.us.sentry.io/4509161790832641" />
8888

89-
<!-- how to enable Sentry's debug mode-->
90-
<meta-data android:name="io.sentry.debug" android:value="${sentryDebug}" />
89+
<!-- how to enable Sentry's debug mode-->
90+
<meta-data android:name="io.sentry.debug" android:value="${sentryDebug}" />
9191

92-
<!-- how to disable verbose logging of the session replay feature-->
93-
<meta-data android:name="io.sentry.session-replay.debug" android:value="false" />
92+
<!-- how to disable verbose logging of the session replay feature-->
93+
<meta-data android:name="io.sentry.session-replay.debug" android:value="false" />
9494

95-
<!-- how to set a custom debug level-->
96-
<!-- <meta-data android:name="io.sentry.debug.level" android:value="info" />-->
95+
<!-- how to set a custom debug level-->
96+
<!-- <meta-data android:name="io.sentry.debug.level" android:value="info" />-->
9797

98-
<!-- To change the time used to watch for ANR. By default it's 5 seconds (5000 below as it's in milliseconds)-->
99-
<!-- <meta-data android:name="io.sentry.anr.timeout-interval-millis" android:value="5000" />-->
98+
<!-- To change the time used to watch for ANR. By default it's 5 seconds (5000 below as it's in milliseconds)-->
99+
<!-- <meta-data android:name="io.sentry.anr.timeout-interval-millis" android:value="5000" />-->
100100

101-
<!-- Raise ANR events even if the debugger is attached-->
102-
<!-- <meta-data android:name="io.sentry.anr.report-debug" android:value="true" />-->
101+
<!-- Raise ANR events even if the debugger is attached-->
102+
<!-- <meta-data android:name="io.sentry.anr.report-debug" android:value="true" />-->
103103

104-
<!-- how to disable ANR-->
105-
<!-- <meta-data android:name="io.sentry.anr.enable" android:value="false" />-->
104+
<!-- how to disable ANR-->
105+
<!-- <meta-data android:name="io.sentry.anr.enable" android:value="false" />-->
106106

107-
<!-- how to disable the auto-init-->
108-
<!-- <meta-data android:name="io.sentry.auto-init" android:value="false" />-->
107+
<!-- how to disable the auto-init-->
108+
<!-- <meta-data android:name="io.sentry.auto-init" android:value="false" />-->
109109

110-
<!-- how to disable the NDK-->
111-
<!-- <meta-data android:name="io.sentry.ndk.enable" android:value="false" />-->
110+
<!-- how to disable the NDK-->
111+
<!-- <meta-data android:name="io.sentry.ndk.enable" android:value="false" />-->
112112

113-
<!-- how to enable the NDK Scope Sync -->
114-
<meta-data android:name="io.sentry.ndk.scope-sync.enable" android:value="true" />
113+
<!-- how to enable the NDK Scope Sync -->
114+
<meta-data android:name="io.sentry.ndk.scope-sync.enable" android:value="true" />
115115

116-
<!-- how to set a custom release-->
117-
<!-- <meta-data android:name="io.sentry.release" android:value="io.sentry.samples.android@1.1.0+2" />-->
116+
<!-- how to set a custom release-->
117+
<!-- <meta-data android:name="io.sentry.release" android:value="io.sentry.samples.android@1.1.0+2" />-->
118118

119-
<!-- how to disable automatic session tracking-->
120-
<!-- <meta-data android:name="io.sentry.auto-session-tracking.enable" android:value="false" />-->
119+
<!-- how to disable automatic session tracking-->
120+
<!-- <meta-data android:name="io.sentry.auto-session-tracking.enable" android:value="false" />-->
121121

122-
<!-- how to set an environment-->
123-
<meta-data android:name="io.sentry.environment" android:value="${sentryEnvironment}" />
122+
<!-- how to set an environment-->
123+
<meta-data android:name="io.sentry.environment" android:value="${sentryEnvironment}" />
124124

125-
<!-- how to change the session tracking interval-->
126-
<meta-data android:name="io.sentry.session-tracking.timeout-interval-millis" android:value="10000" />
125+
<!-- how to change the session tracking interval-->
126+
<meta-data android:name="io.sentry.session-tracking.timeout-interval-millis" android:value="10000" />
127127

128-
<!-- how to enable the performance API by setting a sample-rate (0.0 to 1.0) -->
129-
<!-- a sample-rate of 0.0 will disable the performance API -->
130-
<meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
128+
<!-- how to enable the performance API by setting a sample-rate (0.0 to 1.0) -->
129+
<!-- a sample-rate of 0.0 will disable the performance API -->
130+
<meta-data android:name="io.sentry.traces.sample-rate" android:value="1.0" />
131131

132-
<!-- how to enable profiling when starting transactions -->
133-
<!-- <meta-data android:name="io.sentry.traces.profiling.sample-rate" android:value="1.0" />-->
132+
<!-- how to enable profiling when starting transactions -->
133+
<!-- <meta-data android:name="io.sentry.traces.profiling.sample-rate" android:value="1.0" />-->
134134

135-
<!-- Enable profiling, adjust in production env -->
136-
<meta-data android:name="io.sentry.traces.profiling.session-sample-rate" android:value="0.0" />
137-
<!-- Set profiling lifecycle, can be `manual` or `trace` -->
138-
<meta-data android:name="io.sentry.traces.profiling.lifecycle" android:value="manual" />
139-
<!-- Enable profiling on app start -->
140-
<meta-data android:name="io.sentry.traces.profiling.start-on-app-start" android:value="false" />
135+
<!-- Enable profiling, adjust in production env -->
136+
<meta-data android:name="io.sentry.traces.profiling.session-sample-rate" android:value="0.0" />
137+
<!-- Set profiling lifecycle, can be `manual` or `trace` -->
138+
<meta-data android:name="io.sentry.traces.profiling.lifecycle" android:value="manual" />
139+
<!-- Enable profiling on app start -->
140+
<meta-data android:name="io.sentry.traces.profiling.start-on-app-start" android:value="false" />
141141

142-
<!-- how to disable the Activity auto instrumentation for tracing-->
143-
<!-- <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />-->
142+
<!-- how to disable the Activity auto instrumentation for tracing-->
143+
<!-- <meta-data android:name="io.sentry.traces.activity.enable" android:value="false" />-->
144144

145-
<!-- how to disable the Activity auto instrumentation automatically finished on onActivityPostPaused-->
146-
<!-- <meta-data android:name="io.sentry.traces.activity.auto-finish.enable" android:value="false" />-->
145+
<!-- how to disable the Activity auto instrumentation automatically finished on onActivityPostPaused-->
146+
<!-- <meta-data android:name="io.sentry.traces.activity.auto-finish.enable" android:value="false" />-->
147147

148-
<!-- how to enable the UI auto instrumentation for tracing -->
149-
<meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="true" />
148+
<!-- how to enable the UI auto instrumentation for tracing -->
149+
<meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="true" />
150150

151-
<!-- how to enable the time-to-full-display tracing in Activity auto instrumentation -->
152-
<meta-data android:name="io.sentry.traces.time-to-full-display.enable" android:value="true" />
151+
<!-- how to enable the time-to-full-display tracing in Activity auto instrumentation -->
152+
<meta-data android:name="io.sentry.traces.time-to-full-display.enable" android:value="true" />
153153

154-
<!-- how to enable and set a sampleRate (anything between 0.01 and 1.0), it's disabled by default-->
155-
<!-- <meta-data android:name="io.sentry.sample-rate" android:value="0.5" />-->
154+
<!-- how to enable and set a sampleRate (anything between 0.01 and 1.0), it's disabled by default-->
155+
<!-- <meta-data android:name="io.sentry.sample-rate" android:value="0.5" />-->
156156

157-
<!-- how to disable default sentry uncaught exception-->
158-
<!-- <meta-data android:name="io.sentry.uncaught-exception-handler.enable" android:value="false" />-->
157+
<!-- how to disable default sentry uncaught exception-->
158+
<!-- <meta-data android:name="io.sentry.uncaught-exception-handler.enable" android:value="false" />-->
159159

160-
<!-- how to disable the activity lifecycle breadcrumbs integration-->
161-
<!-- <meta-data android:name="io.sentry.breadcrumbs.activity-lifecycle" android:value="false" />-->
160+
<!-- how to disable the activity lifecycle breadcrumbs integration-->
161+
<!-- <meta-data android:name="io.sentry.breadcrumbs.activity-lifecycle" android:value="false" />-->
162162

163-
<!-- how to disable the app lifecycle breadcrumbs integration-->
164-
<!-- <meta-data android:name="io.sentry.breadcrumbs.app-lifecycle" android:value="false" />-->
163+
<!-- how to disable the app lifecycle breadcrumbs integration-->
164+
<!-- <meta-data android:name="io.sentry.breadcrumbs.app-lifecycle" android:value="false" />-->
165165

166-
<!-- how to disable the system events breadcrumbs integration-->
167-
<!-- <meta-data android:name="io.sentry.breadcrumbs.system-events" android:value="false" />-->
166+
<!-- how to disable the system events breadcrumbs integration-->
167+
<!-- <meta-data android:name="io.sentry.breadcrumbs.system-events" android:value="false" />-->
168168

169-
<!-- how to disable the app components breadcrumbs integration-->
170-
<!-- <meta-data android:name="io.sentry.breadcrumbs.app-components" android:value="false" />-->
169+
<!-- how to disable the app components breadcrumbs integration-->
170+
<!-- <meta-data android:name="io.sentry.breadcrumbs.app-components" android:value="false" />-->
171171

172-
<!-- how to enable the attach screenshot feature-->
173-
<meta-data android:name="io.sentry.attach-screenshot" android:value="true" />
172+
<!-- how to enable the attach screenshot feature-->
173+
<meta-data android:name="io.sentry.attach-screenshot" android:value="true" />
174174

175-
<!-- how many breadcrumbs will be stored-->
176-
<meta-data android:name="io.sentry.max-breadcrumbs" android:value="100"/>
175+
<!-- how many breadcrumbs will be stored-->
176+
<meta-data android:name="io.sentry.max-breadcrumbs" android:value="100"/>
177177

178-
<!-- how to enable the attach view hierarchy feature-->
179-
<meta-data android:name="io.sentry.attach-view-hierarchy" android:value="true" />
178+
<!-- how to enable the attach view hierarchy feature-->
179+
<meta-data android:name="io.sentry.attach-view-hierarchy" android:value="true" />
180180

181-
<!-- how to enable the send default pii-->
182-
<meta-data android:name="io.sentry.send-default-pii" android:value="true" />
181+
<!-- how to enable the send default pii-->
182+
<meta-data android:name="io.sentry.send-default-pii" android:value="true" />
183183

184-
<!-- how to disable sentry -->
185-
<!-- <meta-data android:name="io.sentry.enabled" android:value="false" /> -->
184+
<!-- how to disable sentry -->
185+
<!-- <meta-data android:name="io.sentry.enabled" android:value="false" /> -->
186186

187-
<meta-data android:name="io.sentry.session-replay.screenshot-strategy" android:value="canvas" />
188-
<meta-data android:name="io.sentry.session-replay.session-sample-rate" android:value="0.0" />
189-
<meta-data android:name="io.sentry.session-replay.mask-all-text" android:value="true" />
190-
</application>
187+
<meta-data android:name="io.sentry.session-replay.screenshot-strategy" android:value="canvas" />
188+
<meta-data android:name="io.sentry.session-replay.session-sample-rate" android:value="0.0" />
189+
<meta-data android:name="io.sentry.session-replay.mask-all-text" android:value="true" />
190+
</application>
191191
</manifest>

‎sentry-samples/sentry-samples-android/src/main/java/io/sentry/samples/android/MainActivity.java‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -374,26 +374,6 @@ public void run() {
374374
Sentry.logger().log(SentryLogLevel.INFO, "MainActivity created");
375375
}
376376

377-
@Override
378-
protected void onStart() {
379-
super.onStart();
380-
final ISpan span = Sentry.getSpan();
381-
if (span != null) {
382-
span.startChild("data.load", "MainActivity: 001");
383-
new Thread(
384-
() -> {
385-
try {
386-
Thread.sleep(25000L);
387-
} catch (Exception e) {
388-
// ignored
389-
}
390-
// span.finish();
391-
},
392-
"data.load")
393-
.start();
394-
}
395-
}
396-
397377
private void stackOverflow() {
398378
stackOverflow();
399379
}

0 commit comments

Comments
 (0)