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.

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

Remove some unused IAST/CI Visibility classes #2000

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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,284 changes: 0 additions & 1,284 deletions features/dd-sdk-android-trace/api/dd-sdk-android-trace.api

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

1,046 changes: 1 addition & 1,045 deletions features/dd-sdk-android-trace/src/main/java/com/datadog/trace/api/Config.java

Large diffs are not rendered by default.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package com.datadog.trace.api;

import static com.datadog.trace.api.ConfigDefaults.DEFAULT_APPSEC_ENABLED;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_CIVISIBILITY_ENABLED;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_IAST_ENABLED;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_INTEGRATIONS_ENABLED;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_MEASURE_METHODS;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_RESOLVER_RESET_INTERVAL;
Expand All @@ -17,11 +14,8 @@
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_METHODS;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_TRACE_OTEL_ENABLED;
import static com.datadog.trace.api.ConfigDefaults.DEFAULT_USM_ENABLED;
import static com.datadog.trace.api.config.AppSecConfig.APPSEC_ENABLED;
import static com.datadog.trace.api.config.CiVisibilityConfig.CIVISIBILITY_ENABLED;
import static com.datadog.trace.api.config.GeneralConfig.INTERNAL_EXIT_ON_FAILURE;
import static com.datadog.trace.api.config.GeneralConfig.TELEMETRY_ENABLED;
import static com.datadog.trace.api.config.IastConfig.IAST_ENABLED;
import static com.datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED;
import static com.datadog.trace.api.config.ProfilingConfig.PROFILING_DIRECT_ALLOCATION_ENABLED_DEFAULT;
import static com.datadog.trace.api.config.ProfilingConfig.PROFILING_ENABLED;
Expand Down Expand Up @@ -89,9 +83,6 @@ public class InstrumenterConfig {
private final boolean traceOtelEnabled;
private final boolean logs128bTraceIdEnabled;
private final boolean profilingEnabled;
private final boolean ciVisibilityEnabled;
private final ProductActivation appSecActivation;
private final ProductActivation iastActivation;
private final boolean usmEnabled;
private final boolean telemetryEnabled;

Expand Down Expand Up @@ -148,21 +139,10 @@ private InstrumenterConfig() {
profilingEnabled = configProvider.getBoolean(PROFILING_ENABLED, PROFILING_ENABLED_DEFAULT);

if (!Platform.isNativeImageBuilder()) {
ciVisibilityEnabled =
configProvider.getBoolean(CIVISIBILITY_ENABLED, DEFAULT_CIVISIBILITY_ENABLED);
appSecActivation =
ProductActivation.fromString(
configProvider.getStringNotEmpty(APPSEC_ENABLED, DEFAULT_APPSEC_ENABLED));
iastActivation =
ProductActivation.fromString(
configProvider.getStringNotEmpty(IAST_ENABLED, DEFAULT_IAST_ENABLED));
usmEnabled = configProvider.getBoolean(USM_ENABLED, DEFAULT_USM_ENABLED);
telemetryEnabled = configProvider.getBoolean(TELEMETRY_ENABLED, DEFAULT_TELEMETRY_ENABLED);
} else {
// disable these features in native-image
ciVisibilityEnabled = false;
appSecActivation = ProductActivation.FULLY_DISABLED;
iastActivation = ProductActivation.FULLY_DISABLED;
telemetryEnabled = false;
usmEnabled = false;
}
Expand Down Expand Up @@ -251,18 +231,6 @@ public boolean isProfilingEnabled() {
return profilingEnabled;
}

public boolean isCiVisibilityEnabled() {
return ciVisibilityEnabled;
}

public ProductActivation getAppSecActivation() {
return appSecActivation;
}

public ProductActivation getIastActivation() {
return iastActivation;
}

public boolean isUsmEnabled() {
return usmEnabled;
}
Expand Down Expand Up @@ -431,12 +399,6 @@ public String toString() {
+ logs128bTraceIdEnabled
+ ", profilingEnabled="
+ profilingEnabled
+ ", ciVisibilityEnabled="
+ ciVisibilityEnabled
+ ", appSecActivation="
+ appSecActivation
+ ", iastActivation="
+ iastActivation
+ ", usmEnabled="
+ usmEnabled
+ ", telemetryEnabled="
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading