From eb1cc71b6e5750fb39fbb8c1abd4b576f601e6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 9 Jun 2020 12:03:59 +0800 Subject: [PATCH] Clean up removed configurations. (#4884) --- docs/en/setup/backend/trace-sampling.md | 5 +---- .../library-util/src/test/resources/application.yml | 8 -------- .../trace/provider/TraceServiceModuleConfig.java | 12 ------------ 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/docs/en/setup/backend/trace-sampling.md b/docs/en/setup/backend/trace-sampling.md index f0ce701d9..facb0ae11 100644 --- a/docs/en/setup/backend/trace-sampling.md +++ b/docs/en/setup/backend/trace-sampling.md @@ -13,10 +13,7 @@ In **receiver-trace** receiver, you will find `sampleRate` setting. ```yaml receiver-trace: default: - bufferPath: ../trace-buffer/ # Path to trace buffer files, suggest to use absolute path - bufferOffsetMaxFileSize: 100 # Unit is MB - bufferDataMaxFileSize: 500 # Unit is MB - bufferFileCleanWhenRestart: false + ... sampleRate: ${SW_TRACE_SAMPLE_RATE:1000} # The sample rate precision is 1/10000. 10000 means 100% sample in default. ``` diff --git a/oap-server/server-library/library-util/src/test/resources/application.yml b/oap-server/server-library/library-util/src/test/resources/application.yml index cc0346155..17c968b15 100755 --- a/oap-server/server-library/library-util/src/test/resources/application.yml +++ b/oap-server/server-library/library-util/src/test/resources/application.yml @@ -67,10 +67,6 @@ receiver-register: receiver-trace: default: - bufferPath: ${RECEIVER_BUFFER_PATH:../trace-buffer/} # Path to trace buffer files, suggest to use absolute path - bufferOffsetMaxFileSize: ${RECEIVER_BUFFER_OFFSET_MAX_FILE_SIZE:100} # Unit is MB - bufferDataMaxFileSize: ${RECEIVER_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB - bufferFileCleanWhenRestart: ${RECEIVER_BUFFER_FILE_CLEAN_WHEN_RESTART:false} receiver-jvm: default: @@ -80,10 +76,6 @@ receiver-profile: service-mesh: default: - bufferPath: ${SERVICE_MESH_BUFFER_PATH:../mesh-buffer/} # Path to trace buffer files, suggest to use absolute path - bufferOffsetMaxFileSize: ${SERVICE_MESH_OFFSET_MAX_FILE_SIZE:100} # Unit is MB - bufferDataMaxFileSize: ${SERVICE_MESH_BUFFER_DATA_MAX_FILE_SIZE:500} # Unit is MB - bufferFileCleanWhenRestart: ${SERVICE_MESH_BUFFER_FILE_CLEAN_WHEN_RESTART:false} istio-telemetry: default: diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java index f1e07b0cc..50c207c71 100755 --- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java +++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/TraceServiceModuleConfig.java @@ -25,18 +25,6 @@ import lombok.Setter; import org.apache.skywalking.oap.server.library.module.ModuleConfig; public class TraceServiceModuleConfig extends ModuleConfig { - @Setter - @Getter - private String bufferPath; - @Setter - @Getter - private int bufferOffsetMaxFileSize; - @Setter - @Getter - private int bufferDataMaxFileSize; - @Setter - @Getter - private boolean bufferFileCleanWhenRestart; /** * The sample rate precision is 1/10000. 10000 means 100% sample in default. */