This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push: new 39eae22b94 Fix imports (#11436) 39eae22b94 is described below commit 39eae22b9402d3d2597d82e6e0056158887ce9fb Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com> AuthorDate: Fri Oct 20 09:49:57 2023 +0800 Fix imports (#11436) --- .../storage/EBPFProcessProfilingScheduleDispatcher.java | 14 ++++++++++---- .../profiling/ebpf/storage/EBPFProfilingDataRecord.java | 2 +- .../server/core/source/EBPFProcessProfilingSchedule.java | 6 +++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProcessProfilingScheduleDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProcessProfilingScheduleDispatcher.java index c19f1326bd..047aaf5304 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProcessProfilingScheduleDispatcher.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProcessProfilingScheduleDispatcher.java @@ -18,8 +18,8 @@ package org.apache.skywalking.oap.server.core.profiling.ebpf.storage; +import com.google.common.base.Charsets; import com.google.common.hash.Hashing; -import com.linecorp.armeria.internal.shaded.guava.base.Charsets; import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher; import org.apache.skywalking.oap.server.core.analysis.TimeBucket; import org.apache.skywalking.oap.server.core.analysis.worker.MetricsStreamProcessor; @@ -34,9 +34,15 @@ public class EBPFProcessProfilingScheduleDispatcher implements SourceDispatcher< traffic.setStartTime(source.getStartTime()); traffic.setEndTime(source.getCurrentTime()); traffic.setTimeBucket(TimeBucket.getMinuteTimeBucket(source.getCurrentTime())); - traffic.setScheduleId(Hashing.sha256().newHasher() - .putString(String.format("%s_%s_%d", source.getTaskId(), source.getProcessId(), source.getStartTime()), Charsets.UTF_8) - .hash().toString()); + traffic.setScheduleId( + Hashing + .sha256() + .newHasher() + .putString( + String.format("%s_%s_%d", source.getTaskId(), source.getProcessId(), source.getStartTime()), + Charsets.UTF_8 + ) + .hash().toString()); MetricsStreamProcessor.getInstance().in(traffic); } } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java index b40aa23488..41885e3a7c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/profiling/ebpf/storage/EBPFProfilingDataRecord.java @@ -18,8 +18,8 @@ package org.apache.skywalking.oap.server.core.profiling.ebpf.storage; +import com.google.common.base.Charsets; import com.google.common.hash.Hashing; -import com.linecorp.armeria.internal.shaded.guava.base.Charsets; import lombok.Data; import org.apache.skywalking.oap.server.core.analysis.Stream; import org.apache.skywalking.oap.server.core.analysis.record.Record; diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EBPFProcessProfilingSchedule.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EBPFProcessProfilingSchedule.java index bcae3f6e4c..10aa5f09bc 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EBPFProcessProfilingSchedule.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EBPFProcessProfilingSchedule.java @@ -18,8 +18,8 @@ package org.apache.skywalking.oap.server.core.source; +import com.google.common.base.Charsets; import com.google.common.hash.Hashing; -import com.linecorp.armeria.internal.shaded.guava.base.Charsets; import lombok.Getter; import lombok.Setter; @@ -41,8 +41,8 @@ public class EBPFProcessProfilingSchedule extends Source { public String getEntityId() { if (entityId == null) { entityId = Hashing.sha256().newHasher() - .putString(String.format("%s_%s_%d", taskId, processId, startTime), Charsets.UTF_8) - .hash().toString(); + .putString(String.format("%s_%s_%d", taskId, processId, startTime), Charsets.UTF_8) + .hash().toString(); } return entityId; }