Skip to content

Commit 32c460c

Browse files
wnny-indeawnny-indea
authored
Merge branch 'publish' into noop-logs-profiling-session-replay
2 parents f22eebf + baebb59 commit 32c460c

13 files changed

Lines changed: 80 additions & 68 deletions

File tree

‎features/dd-sdk-android-flags-openfeature/build.gradle.kts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,10 @@ androidLibraryConfig()
8080
junitConfig()
8181
javadocConfig()
8282
dependencyUpdateConfig()
83-
publishingConfig(
84-
"OpenFeature Provider integration for the Datadog Feature Flags " +
85-
"library for Android applications."
86-
)
83+
/*
84+
// publishingConfig(
85+
// "OpenFeature Provider integration for the Datadog Feature Flags " +
86+
// "library for Android applications."
87+
// )
88+
*/
8789
detektCustomConfig()

‎features/dd-sdk-android-flags/build.gradle.kts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,10 @@ androidLibraryConfig()
9191
junitConfig()
9292
javadocConfig()
9393
dependencyUpdateConfig()
94-
publishingConfig(
95-
"The Feature Flags integration feature to use with the Datadog monitoring " +
96-
"library for Android applications."
97-
)
94+
/*
95+
// publishingConfig(
96+
// "The Feature Flags integration feature to use with the Datadog monitoring " +
97+
// "library for Android applications."
98+
// )
99+
*/
98100
detektCustomConfig()

‎sample/automotive/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ android {
5959

6060
dependencies {
6161
// Datadog Libraries
62-
implementation(project(":features:dd-sdk-android-logs"))
62+
// implementation(project(":features:dd-sdk-android-logs"))
6363
implementation(project(":features:dd-sdk-android-rum"))
6464

6565
implementation(libs.kotlin)

‎sample/automotive/src/main/java/com/datadog/sample/automotive/SharedLogger.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
package com.datadog.sample.automotive
88

9-
import com.datadog.android.log.Logger
9+
// import com.datadog.android.log.Logger
1010

1111
@Suppress("UndocumentedPublicClass")
1212
object SharedLogger {

‎sample/benchmark/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@ dependencies {
104104
implementation(libs.coroutinesCore)
105105
implementation(libs.bundles.ktorClient)
106106
implementation(libs.kotlinxSerializationJson)
107-
implementation(project(":features:dd-sdk-android-logs"))
107+
// implementation(project(":features:dd-sdk-android-logs"))
108108
implementation(project(":features:dd-sdk-android-rum"))
109109
implementation(project(":features:dd-sdk-android-trace"))
110110
implementation(project(":features:dd-sdk-android-trace-otel"))
111111
implementation(project(":features:dd-sdk-android-ndk"))
112112
implementation(project(":features:dd-sdk-android-webview"))
113-
implementation(project(":features:dd-sdk-android-session-replay"))
114-
implementation(project(":features:dd-sdk-android-session-replay-material"))
115-
implementation(project(":features:dd-sdk-android-session-replay-compose"))
113+
// implementation(project(":features:dd-sdk-android-session-replay"))
114+
// implementation(project(":features:dd-sdk-android-session-replay-material"))
115+
// implementation(project(":features:dd-sdk-android-session-replay-compose"))
116116
implementation(project(":integrations:dd-sdk-android-compose"))
117117
implementation(project(":integrations:dd-sdk-android-glide"))
118118
implementation(project(":integrations:dd-sdk-android-okhttp"))

‎sample/kotlin/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ dependencies {
185185
implementation(project(":integrations:dd-sdk-android-trace-coroutines"))
186186
implementation(project(":integrations:dd-sdk-android-rum-coroutines"))
187187
implementation(project(":integrations:dd-sdk-android-rx"))
188-
implementation(project(":integrations:dd-sdk-android-timber"))
188+
// implementation(project(":integrations:dd-sdk-android-timber"))
189189
implementation(project(":integrations:dd-sdk-android-coil"))
190190
implementation(project(":integrations:dd-sdk-android-coil3"))
191191
implementation(project(":integrations:dd-sdk-android-glide"))
@@ -214,7 +214,7 @@ dependencies {
214214
coreLibraryDesugaring(libs.androidDesugaringSdk)
215215

216216
// Sample Vendor Library
217-
implementation(project(":sample:vendor-lib"))
217+
// implementation(project(":sample:vendor-lib"))
218218

219219
implementation(libs.kotlin)
220220

‎sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ import com.datadog.android.core.configuration.BackPressureStrategy
1919
import com.datadog.android.core.configuration.BatchSize
2020
import com.datadog.android.core.configuration.Configuration
2121
import com.datadog.android.core.configuration.UploadFrequency
22-
import com.datadog.android.flags.Flags
23-
import com.datadog.android.flags.FlagsClient
24-
import com.datadog.android.flags.FlagsConfiguration
25-
import com.datadog.android.flags.openfeature.asOpenFeatureProvider
22+
// import com.datadog.android.flags.Flags
23+
// import com.datadog.android.flags.FlagsClient
24+
// import com.datadog.android.flags.FlagsConfiguration
25+
// import com.datadog.android.flags.openfeature.asOpenFeatureProvider
2626
import com.datadog.android.insights.enableRumDebugWidget
27-
import com.datadog.android.log.Logger
28-
import com.datadog.android.log.Logs
29-
import com.datadog.android.log.LogsConfiguration
27+
// import com.datadog.android.log.Logger
28+
// import com.datadog.android.log.Logs
29+
// import com.datadog.android.log.LogsConfiguration
3030
import com.datadog.android.ndk.NdkCrashReports
3131
import com.datadog.android.okhttp.DatadogEventListener
3232
import com.datadog.android.okhttp.DatadogInterceptor
@@ -47,15 +47,15 @@ import com.datadog.android.sample.picture.CoilImageLoader
4747
import com.datadog.android.sample.picture.FrescoImageLoader
4848
import com.datadog.android.sample.picture.PicassoImageLoader
4949
import com.datadog.android.sample.user.UserFragment
50-
import com.datadog.android.sessionreplay.ImagePrivacy
51-
import com.datadog.android.sessionreplay.SessionReplay
52-
import com.datadog.android.sessionreplay.SessionReplayConfiguration
53-
import com.datadog.android.sessionreplay.SessionReplayPrivacy
54-
import com.datadog.android.sessionreplay.SystemRequirementsConfiguration
55-
import com.datadog.android.sessionreplay.TextAndInputPrivacy
56-
import com.datadog.android.sessionreplay.TouchPrivacy
57-
import com.datadog.android.sessionreplay.compose.ComposeExtensionSupport
58-
import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
50+
// import com.datadog.android.sessionreplay.ImagePrivacy
51+
// import com.datadog.android.sessionreplay.SessionReplay
52+
// import com.datadog.android.sessionreplay.SessionReplayConfiguration
53+
// import com.datadog.android.sessionreplay.SessionReplayPrivacy
54+
// import com.datadog.android.sessionreplay.SystemRequirementsConfiguration
55+
// import com.datadog.android.sessionreplay.TextAndInputPrivacy
56+
// import com.datadog.android.sessionreplay.TouchPrivacy
57+
// import com.datadog.android.sessionreplay.compose.ComposeExtensionSupport
58+
// import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
5959
import com.datadog.android.timber.DatadogTree
6060
import com.datadog.android.trace.DatadogTracing
6161
import com.datadog.android.trace.GlobalDatadogTracer
@@ -180,7 +180,7 @@ class SampleApplication : Application() {
180180

181181
Rum.enable(createRumConfiguration())
182182

183-
initializeFlags()
183+
// initializeFlags()
184184

185185
GlobalRumMonitor.get().debug = true
186186

@@ -237,6 +237,7 @@ class SampleApplication : Application() {
237237
)
238238
}
239239

240+
/*
240241
private fun initializeFlags() {
241242
val flagsConfig = FlagsConfiguration.Builder().build()
242243
Flags.enable(flagsConfig)
@@ -247,7 +248,9 @@ class SampleApplication : Application() {
247248
OpenFeatureAPI.setProviderAndWait(provider)
248249
}
249250
}
251+
*/
250252

253+
/*
251254
private fun initializeLogs() {
252255
val logsConfig = LogsConfiguration.Builder().apply {
253256
if (BuildConfig.DD_OVERRIDE_LOGS_URL.isNotBlank()) {
@@ -256,6 +259,7 @@ class SampleApplication : Application() {
256259
}.build()
257260
Logs.enable(logsConfig)
258261
}
262+
*/
259263

260264
/*
261265
private fun initializeSessionReplay() {
@@ -385,6 +389,7 @@ class SampleApplication : Application() {
385389
}
386390

387391
@Suppress("TooGenericExceptionCaught", "CheckInternal")
392+
/*
388393
private fun initializeTimber() {
389394
val logger = Logger.Builder()
390395
.setName("timber")
@@ -394,6 +399,7 @@ class SampleApplication : Application() {
394399
395400
Timber.plant(DatadogTree(logger))
396401
}
402+
*/
397403

398404
companion object {
399405
private const val USE_FGM_PCT = 10

‎sample/tv/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ dependencies {
7474

7575
implementation(project(":dd-sdk-android-core"))
7676
implementation(project(":features:dd-sdk-android-rum"))
77-
implementation(project(":features:dd-sdk-android-logs"))
78-
implementation(project(":features:dd-sdk-android-session-replay"))
79-
implementation(project(":features:dd-sdk-android-session-replay-material"))
77+
// implementation(project(":features:dd-sdk-android-logs"))
78+
// implementation(project(":features:dd-sdk-android-session-replay"))
79+
// implementation(project(":features:dd-sdk-android-session-replay-material"))
8080
implementation(project(":integrations:dd-sdk-android-okhttp"))
81-
implementation(project(":integrations:dd-sdk-android-timber"))
81+
// implementation(project(":integrations:dd-sdk-android-timber"))
8282
implementation(project(":integrations:dd-sdk-android-tv"))
8383

8484
implementation(libs.kotlin)

‎sample/tv/src/main/java/com/datadog/android/tv/sample/TvSampleApplication.kt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import com.datadog.android.core.configuration.BatchSize
1414
import com.datadog.android.core.configuration.Configuration
1515
import com.datadog.android.core.configuration.UploadFrequency
1616
import com.datadog.android.core.sampling.RateBasedSampler
17-
import com.datadog.android.log.Logger
18-
import com.datadog.android.log.Logs
19-
import com.datadog.android.log.LogsConfiguration
17+
// import com.datadog.android.log.Logger
18+
// import com.datadog.android.log.Logs
19+
// import com.datadog.android.log.LogsConfiguration
2020
import com.datadog.android.okhttp.DatadogEventListener
2121
import com.datadog.android.okhttp.DatadogInterceptor
2222
import com.datadog.android.okhttp.trace.TracingInterceptor
@@ -25,13 +25,13 @@ import com.datadog.android.rum.GlobalRumMonitor
2525
import com.datadog.android.rum.Rum
2626
import com.datadog.android.rum.RumConfiguration
2727
import com.datadog.android.rum.tracking.ActivityViewTrackingStrategy
28-
import com.datadog.android.sessionreplay.ImagePrivacy
29-
import com.datadog.android.sessionreplay.SessionReplay
30-
import com.datadog.android.sessionreplay.SessionReplayConfiguration
31-
import com.datadog.android.sessionreplay.SystemRequirementsConfiguration
32-
import com.datadog.android.sessionreplay.TextAndInputPrivacy
33-
import com.datadog.android.sessionreplay.TouchPrivacy
34-
import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
28+
// import com.datadog.android.sessionreplay.ImagePrivacy
29+
// import com.datadog.android.sessionreplay.SessionReplay
30+
// import com.datadog.android.sessionreplay.SessionReplayConfiguration
31+
// import com.datadog.android.sessionreplay.SystemRequirementsConfiguration
32+
// import com.datadog.android.sessionreplay.TextAndInputPrivacy
33+
// import com.datadog.android.sessionreplay.TouchPrivacy
34+
// import com.datadog.android.sessionreplay.material.MaterialExtensionSupport
3535
import com.datadog.android.timber.DatadogTree
3636
import com.datadog.android.tv.sample.net.OkHttpDownloader
3737
import okhttp3.OkHttpClient
@@ -64,11 +64,11 @@ class TvSampleApplication : Application() {
6464
val rumConfig = createRumConfiguration()
6565
Rum.enable(rumConfig)
6666

67-
val logsConfig = LogsConfiguration.Builder().build()
68-
Logs.enable(logsConfig)
67+
// val logsConfig = LogsConfiguration.Builder().build()
68+
// Logs.enable(logsConfig)
6969

70-
val sessionReplayConfig = createSessionReplayConfiguration()
71-
SessionReplay.enable(sessionReplayConfig)
70+
// val sessionReplayConfig = createSessionReplayConfiguration()
71+
// SessionReplay.enable(sessionReplayConfig)
7272

7373
GlobalRumMonitor.get().debug = true
7474
}

‎sample/vendor-lib/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ android {
7070

7171
dependencies {
7272

73-
implementation(project(":features:dd-sdk-android-logs"))
73+
// implementation(project(":features:dd-sdk-android-logs"))
7474
implementation(project(":features:dd-sdk-android-trace"))
7575
implementation(project(":features:dd-sdk-android-trace-otel"))
7676
implementation(project(":integrations:dd-sdk-android-okhttp"))

0 commit comments

Comments
 (0)