You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2024/09/09 10:04:31 UTC

(skywalking) branch test updated (149da1bc6a -> 9461e2fc6a)

This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a change to branch test
in repository https://gitbox.apache.org/repos/asf/skywalking.git


 discard 149da1bc6a Add logs
     new 9461e2fc6a Add logs

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (149da1bc6a)
            \
             N -- N -- N   refs/heads/test (9461e2fc6a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java          | 2 +-
 .../oap/server/receiver/otel/otlp/OpenTelemetryMetricHandler.java       | 2 +-
 .../oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


(skywalking) 01/01: Add logs

Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

kezhenxu94 pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 9461e2fc6a935ecb598041a949e3fdae390cfb0e
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Mon Sep 9 11:08:52 2024 +0800

    Add logs
---
 .../java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java | 1 +
 .../oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java          | 2 +-
 .../oap/server/receiver/otel/otlp/OpenTelemetryMetricHandler.java       | 2 +-
 .../oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java        | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
index e91a98f2ac..6efe77fa52 100644
--- a/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
+++ b/oap-server/analyzer/meter-analyzer/src/main/java/org/apache/skywalking/oap/meter/analyzer/dsl/SampleFamily.java
@@ -83,6 +83,7 @@ public class SampleFamily {
     static SampleFamily build(RunningContext ctx, Sample... samples) {
         Preconditions.checkNotNull(samples);
         Preconditions.checkArgument(samples.length > 0);
+        log.info("Samples size: {}", samples.length);
         samples = Arrays.stream(samples).filter(sample -> !Double.isNaN(sample.getValue())).toArray(Sample[]::new);
         if (samples.length == 0) {
             return EMPTY;
diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
index 35c75b7ace..a8449e1a52 100644
--- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
+++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryLogHandler.java
@@ -108,7 +108,7 @@ public class OpenTelemetryLogHandler
                         doAnalysisQuietly(service, layer, serviceInstance, logRecord);
                     }
                 });
-            responseObserver.onNext(ExportLogsServiceResponse.getDefaultInstance());
+            responseObserver.onNext(ExportLogsServiceResponse.newBuilder().build());
             responseObserver.onCompleted();
         });
     }
diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricHandler.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricHandler.java
index edc7941221..5ecd55b646 100644
--- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricHandler.java
+++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryMetricHandler.java
@@ -57,7 +57,7 @@ public class OpenTelemetryMetricHandler
         final ExportMetricsServiceRequest requests,
         final StreamObserver<ExportMetricsServiceResponse> responseObserver) {
         metricRequestProcessor.processMetricsRequest(requests);
-        responseObserver.onNext(ExportMetricsServiceResponse.getDefaultInstance());
+        responseObserver.onNext(ExportMetricsServiceResponse.newBuilder().build());
         responseObserver.onCompleted();
     }
 
diff --git a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
index f1b687ba50..95e301996d 100644
--- a/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
+++ b/oap-server/server-receiver-plugin/otel-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/otel/otlp/OpenTelemetryTraceHandler.java
@@ -126,7 +126,7 @@ public class OpenTelemetryTraceHandler
             getForwardService().send(result);
         }
 
-        responseObserver.onNext(ExportTraceServiceResponse.getDefaultInstance());
+        responseObserver.onNext(ExportTraceServiceResponse.newBuilder().build());
         responseObserver.onCompleted();
     }