Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some detekt issues #2043

Merged
merged 1 commit into from
May 21, 2024
Merged

Fix some detekt issues #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...src/main/kotlin/com/datadog/android/trace/opentelemetry/internal/DatadogContextStorage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
package com.datadog.android.trace.opentelemetry.internal

import com.datadog.android.trace.opentelemetry.OtelContext
import io.opentelemetry.context.Context
import io.opentelemetry.context.ContextStorage
import io.opentelemetry.context.Scope
Expand Down
2 changes: 1 addition & 1 deletion ...ndroid/trace/opentelemetry/OtelContext.kt → ...ace/opentelemetry/internal/OtelContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.trace.opentelemetry
package com.datadog.android.trace.opentelemetry.internal

import com.datadog.opentelemetry.trace.OtelSpan
import io.opentelemetry.api.trace.Span
Expand Down
2 changes: 1 addition & 1 deletion .../android/trace/opentelemetry/OtelScope.kt → ...trace/opentelemetry/internal/OtelScope.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.trace.opentelemetry
package com.datadog.android.trace.opentelemetry.internal

import com.datadog.trace.bootstrap.instrumentation.api.AgentScope
import io.opentelemetry.context.Scope
Expand Down
1 change: 0 additions & 1 deletion ...test/kotlin/com/datadog/android/trace/opentelemetry/internal/DatadogContextStorageTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

package com.datadog.android.trace.opentelemetry.internal

import com.datadog.android.trace.opentelemetry.OtelContext
import io.opentelemetry.context.Context
import io.opentelemetry.context.ContextStorage
import io.opentelemetry.context.Scope
Expand Down
2 changes: 1 addition & 1 deletion ...id/trace/opentelemetry/OtelContextTest.kt → ...opentelemetry/internal/OtelContextTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.trace.opentelemetry
package com.datadog.android.trace.opentelemetry.internal

import com.datadog.android.utils.forge.Configurator
import com.datadog.opentelemetry.trace.OtelSpan
Expand Down
2 changes: 1 addition & 1 deletion ...roid/trace/opentelemetry/OtelScopeTest.kt → ...e/opentelemetry/internal/OtelScopeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.trace.opentelemetry
package com.datadog.android.trace.opentelemetry.internal

import com.datadog.trace.bootstrap.instrumentation.api.AgentScope
import io.opentelemetry.context.Scope
Expand Down
2 changes: 2 additions & 0 deletions features/dd-sdk-android-trace/src/main/kotlin/com/datadog/android/trace/AndroidTracer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ import com.datadog.android.api.feature.Feature
import com.datadog.android.api.feature.FeatureSdkCore
import com.datadog.android.log.LogAttributes
import com.datadog.android.trace.internal.TracingFeature
import com.datadog.android.trace.internal.addActiveTraceToContext
import com.datadog.android.trace.internal.data.NoOpWriter
import com.datadog.android.trace.internal.handlers.AndroidSpanLogsHandler
import com.datadog.android.trace.internal.removeActiveTraceFromContext
import com.datadog.legacy.trace.api.Config
import com.datadog.legacy.trace.common.writer.Writer
import com.datadog.legacy.trace.context.ScopeListener
Expand Down
2 changes: 1 addition & 1 deletion ...atadog/android/trace/FeatureSdkCoreExt.kt → ...droid/trace/internal/FeatureSdkCoreExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.trace
package com.datadog.android.trace.internal

import com.datadog.android.api.feature.Feature
import com.datadog.android.api.feature.FeatureSdkCore
Expand Down
2 changes: 1 addition & 1 deletion ...-android-trace/src/main/kotlin/com/datadog/android/trace/internal/data/OtelTraceWriter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ internal class OtelTraceWriter(
if (trace == null) return
sdkCore.getFeature(Feature.TRACING_FEATURE_NAME)
?.withWriteContext { datadogContext, eventBatchWriter ->
// TODO: RUM-4092 Add the capability in the serializer to handle multiple spans in one payload
// TODO RUM-4092 Add the capability in the serializer to handle multiple spans in one payload
trace.forEach { span ->
@Suppress("ThreadSafety") // called in the worker context
writeSpan(datadogContext, eventBatchWriter, span)
Expand Down
2 changes: 1 addition & 1 deletion ...og/android/trace/FeatureSdkCoreExtTest.kt → ...d/trace/internal/FeatureSdkCoreExtTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.trace
package com.datadog.android.trace.internal

import com.datadog.android.api.feature.Feature
import com.datadog.android.api.feature.FeatureSdkCore
Expand Down