update skywalking protocol v8.4.0 (#59)

Author: Shikugawa

bazel/repositories.bzl

@@ -11,9 +11,9 @@ def cpp2sky_dependencies():
 def skywalking_data_collect_protocol():
   http_archive(
     name = "skywalking_data_collect_protocol",
-    sha256 = "8158e095b9b37c39e18938fe08bd4fca6f2b8e16763ff21fe8118d79241a6e0b",
-    urls = ["https://github.com/apache/skywalking-data-collect-protocol/archive/v8.3.0.tar.gz"],
-    strip_prefix = "skywalking-data-collect-protocol-8.3.0",
+    sha256 = "edfa970394511213eacc8055b4c13e4e9773e9196122a49e0db68f6162f67dff",
+    urls = ["https://github.com/apache/skywalking-data-collect-protocol/archive/v8.4.0.tar.gz"],
+    strip_prefix = "skywalking-data-collect-protocol-8.4.0",
   )
 
 def com_github_grpc_grpc():

cpp2sky/tracing_context.h

@@ -33,7 +33,7 @@ class TracingSpan {
   /**
    * Generate Apache SkyWalking native span object from current segment span.
    */
-  virtual SpanObject createSpanObject() = 0;
+  virtual skywalking::v3::SpanObject createSpanObject() = 0;
 
   /**
    * Get span ID.
@@ -63,12 +63,12 @@ class TracingSpan {
   /**
    * Get span type.
    */
-  virtual SpanType spanType() const = 0;
+  virtual skywalking::v3::SpanType spanType() const = 0;
 
   /**
    * Get span layer.
    */
-  virtual SpanLayer spanLayer() const = 0;
+  virtual skywalking::v3::SpanLayer spanLayer() const = 0;
 
   /**
    * Get error occurred or not.
@@ -94,7 +94,7 @@ class TracingSpan {
   /**
    * Get logs.
    */
-  virtual const std::vector<Log>& logs() const = 0;
+  virtual const std::vector<skywalking::v3::Log>& logs() const = 0;
 
   /**
    * Get operation name.
@@ -137,12 +137,12 @@ class TracingSpan {
    * have parent span, like root node of span tree. Exit span has opposite
    * meaning, like leaf node of span tree.
    */
-  virtual void setSpanType(SpanType type) = 0;
+  virtual void setSpanType(skywalking::v3::SpanType type) = 0;
 
   /**
    * Set span layer. It supports only HTTP request tracing currently.
    */
-  virtual void setSpanLayer(SpanLayer layer) = 0;
+  virtual void setSpanLayer(skywalking::v3::SpanLayer layer) = 0;
 
   /**
    * If error had caused on this span, This should be called.
@@ -248,7 +248,7 @@ class TracingContext {
   /**
    * Generate Apache SkyWalking native segment object.
    */
-  virtual SegmentObject createSegmentObject() = 0;
+  virtual skywalking::v3::SegmentObject createSegmentObject() = 0;
 
   /**
    * If called, all spans belongs to this segment will be skipped analysis.

docker-compose.dev.yml

@@ -21,7 +21,7 @@ services:
         soft: -1
         hard: -1
   oap:
-    image: apache/skywalking-oap-server:8.1.0-es7
+    image: apache/skywalking-oap-server:8.4.0-es7
     depends_on:
       - elasticsearch
     links:
@@ -43,7 +43,7 @@ services:
       retries: 3
       start_period: 40s
   ui:
-    image: apache/skywalking-ui:8.1.0
+    image: apache/skywalking-ui:8.4.0
     depends_on:
       - oap
     links:

e2e-docker/Dockerfile.tool

@@ -2,7 +2,7 @@ FROM openjdk:8
 
 WORKDIR /tests
 
-ARG COMMIT_HASH=8a48c49b4420df5c9576d2aea178b2ebcb7ecd09
+ARG COMMIT_HASH=8db606f3470cce75c1b013ae498ac93b862b75b7
 
 ADD https://github.com/apache/skywalking-agent-test-tool/archive/${COMMIT_HASH}.tar.gz .
 

requirements.txt

@@ -1,5 +1,6 @@
 asgiref==3.2.10
 aiofiles==0.6.0
+aiohttp==3.7.3
 attrs==19.3.0
 blindspin==2.0.1
 certifi==2020.6.20
@@ -37,10 +38,12 @@ py==1.9.0
 pymongo==3.11.0
 PyMySQL==0.10.0
 pyparsing==2.4.7
+pyramid==1.10.5
 pytest==6.0.1
 pytz==2020.1
 PyYAML==5.3.1
 redis==3.5.3
+requests==2.24.0
 rfc3986==1.4.0
 sanic==20.9.1
 six==1.15.0
@@ -57,5 +60,4 @@ wrapt==1.12.1
 zipp==3.1.0
 zope.event==4.4
 zope.interface==5.1.0
-apache-skywalking==0.4.0
-zope.interface==5.1.0
+apache-skywalking==0.5.0

source/grpc_async_client_impl.cc

@@ -30,7 +30,7 @@ void* toTag(TaggedStream* stream) { return reinterpret_cast<void*>(stream); }
 TaggedStream* deTag(void* stream) { return static_cast<TaggedStream*>(stream); }
 
 TracerStubImpl::TracerStubImpl(std::shared_ptr<grpc::Channel> channel)
-    : stub_(TraceSegmentReportService::NewStub(channel)) {}
+    : stub_(skywalking::v3::TraceSegmentReportService::NewStub(channel)) {}
 
 std::unique_ptr<grpc::ClientAsyncWriter<TracerRequestType>>
 TracerStubImpl::createWriter(grpc::ClientContext* ctx,

source/grpc_async_client_impl.h

@@ -34,8 +34,8 @@
 
 namespace cpp2sky {
 
-using TracerRequestType = SegmentObject;
-using TracerResponseType = Commands;
+using TracerRequestType = skywalking::v3::SegmentObject;
+using TracerResponseType = skywalking::v3::Commands;
 
 class TracerStubImpl final
     : public TracerStub<TracerRequestType, TracerResponseType> {
@@ -48,7 +48,7 @@ class TracerStubImpl final
       grpc::CompletionQueue* cq, void* tag) override;
 
  private:
-  std::unique_ptr<TraceSegmentReportService::Stub> stub_;
+  std::unique_ptr<skywalking::v3::TraceSegmentReportService::Stub> stub_;
 };
 
 class GrpcAsyncSegmentReporterStream;

source/tracer_impl.h

@@ -22,8 +22,8 @@
 
 namespace cpp2sky {
 
-using TracerRequestType = SegmentObject;
-using TracerResponseType = Commands;
+using TracerRequestType = skywalking::v3::SegmentObject;
+using TracerResponseType = skywalking::v3::Commands;
 
 class TracerImpl : public Tracer {
  public:

source/tracing_context_impl.cc

@@ -28,8 +28,8 @@ TracingSpanImpl::TracingSpanImpl(int32_t span_id,
                                  TracingContext& parent_tracing_context)
     : span_id_(span_id), parent_tracing_context_(parent_tracing_context) {}
 
-SpanObject TracingSpanImpl::createSpanObject() {
-  SpanObject obj;
+skywalking::v3::SpanObject TracingSpanImpl::createSpanObject() {
+  skywalking::v3::SpanObject obj;
 
   obj.set_spanid(span_id_);
   obj.set_parentspanid(parent_span_id_);
@@ -49,7 +49,7 @@ SpanObject TracingSpanImpl::createSpanObject() {
     auto* entry = obj.mutable_refs()->Add();
     // TODO(shikugawa): cpp2sky only supports cross process propagation right
     // now. So It is correct to specify this.
-    entry->set_reftype(RefType::CrossProcess);
+    entry->set_reftype(skywalking::v3::RefType::CrossProcess);
     entry->set_traceid(parent_span->traceId());
     entry->set_parenttracesegmentid(parent_span->traceSegmentId());
     entry->set_parentservice(parent_span->service());
@@ -82,7 +82,7 @@ void TracingSpanImpl::addLog(std::string key, std::string value) {
 void TracingSpanImpl::addLog(std::string key, std::string value,
                              TimePoint<SystemTime> current_time) {
   assert(!finished_);
-  Log l;
+  skywalking::v3::Log l;
   l.set_time(current_time.fetch());
   auto* entry = l.add_data();
   entry->set_key(key);
@@ -93,7 +93,7 @@ void TracingSpanImpl::addLog(std::string key, std::string value,
 void TracingSpanImpl::addLog(std::string key, std::string value,
                              TimePoint<SteadyTime> current_time) {
   assert(!finished_);
-  Log l;
+  skywalking::v3::Log l;
   l.set_time(current_time.fetch());
   auto* entry = l.add_data();
   entry->set_key(key);
@@ -175,7 +175,7 @@ TracingContextImpl::TracingContextImpl(const std::string& service_name,
 TracingSpanPtr TracingContextImpl::createExitSpan(TracingSpanPtr parent_span) {
   auto current_span = createSpan();
   current_span->setParentSpanId(parent_span->spanId());
-  current_span->setSpanType(SpanType::Exit);
+  current_span->setSpanType(skywalking::v3::SpanType::Exit);
   return current_span;
 }
 
@@ -186,7 +186,7 @@ TracingSpanPtr TracingContextImpl::createEntrySpan() {
 
   auto current_span = createSpan();
   current_span->setParentSpanId(-1);
-  current_span->setSpanType(SpanType::Entry);
+  current_span->setSpanType(skywalking::v3::SpanType::Entry);
   return current_span;
 }
 
@@ -201,7 +201,7 @@ std::optional<std::string> TracingContextImpl::createSW8HeaderValue(
     }
     target_span = spans_.back();
   }
-  if (target_span->spanType() != SpanType::Exit) {
+  if (target_span->spanType() != skywalking::v3::SpanType::Exit) {
     return std::nullopt;
   }
   return encodeSpan(target_span, target_address);
@@ -232,7 +232,7 @@ TracingSpanPtr TracingContextImpl::createSpan() {
   auto current_span = std::make_shared<TracingSpanImpl>(spans_.size(), *this);
 
   // It supports only HTTP request tracing.
-  current_span->setSpanLayer(SpanLayer::Http);
+  current_span->setSpanLayer(skywalking::v3::SpanLayer::Http);
   if (should_skip_analysis_) {
     current_span->setSkipAnalysis();
   }
@@ -241,8 +241,9 @@ TracingSpanPtr TracingContextImpl::createSpan() {
   return current_span;
 }
 
-SegmentObject TracingContextImpl::createSegmentObject() {
-  SegmentObject obj;
+skywalking::v3::SegmentObject TracingContextImpl::createSegmentObject() {
+  skywalking::v3::SegmentObject obj;
+
   obj.set_traceid(trace_id_);
   obj.set_tracesegmentid(trace_segment_id_);
   obj.set_service(service_);

source/tracing_context_impl.h

@@ -25,24 +25,26 @@ class TracingSpanImpl : public TracingSpan {
  public:
   TracingSpanImpl(int32_t span_id, TracingContext& parent_tracing_context);
 
-  SpanObject createSpanObject() override;
+  skywalking::v3::SpanObject createSpanObject() override;
 
 #pragma region Getters
   int32_t spanId() const override { return span_id_; }
   int32_t parentSpanId() const override { return parent_span_id_; }
   int64_t startTime() const override { return start_time_; }
   int64_t endTime() const override { return end_time_; }
   const std::string& peer() const override { return peer_; }
-  SpanType spanType() const override { return type_; }
-  SpanLayer spanLayer() const override { return layer_; }
+  skywalking::v3::SpanType spanType() const override { return type_; }
+  skywalking::v3::SpanLayer spanLayer() const override { return layer_; }
   bool errorStatus() const override { return is_error_; }
   bool skipAnalysis() const override { return skip_analysis_; }
   int32_t componentId() const override { return component_id_; }
   const std::vector<std::pair<std::string, std::string>>& tags()
       const override {
     return tags_;
   }
-  const std::vector<Log>& logs() const override { return logs_; }
+  const std::vector<skywalking::v3::Log>& logs() const override {
+    return logs_;
+  }
   bool finished() const override { return finished_; }
   std::string operationName() const override { return operation_name_; }
 #pragma endregion
@@ -68,8 +70,10 @@ class TracingSpanImpl : public TracingSpan {
     assert(!finished_);
     peer_ = std::move(remote_address);
   }
-  void setSpanType(SpanType type) override { type_ = type; }
-  void setSpanLayer(SpanLayer layer) override { layer_ = layer; }
+  void setSpanType(skywalking::v3::SpanType type) override { type_ = type; }
+  void setSpanLayer(skywalking::v3::SpanLayer layer) override {
+    layer_ = layer;
+  }
   void setErrorStatus() override { is_error_ = true; }
   void setSkipAnalysis() override { skip_analysis_ = true; }
   void addTag(std::string key, std::string value) override {
@@ -93,15 +97,15 @@ class TracingSpanImpl : public TracingSpan {
   int64_t end_time_ = 0;
   std::string operation_name_;
   std::string peer_;
-  SpanType type_;
-  SpanLayer layer_;
+  skywalking::v3::SpanType type_;
+  skywalking::v3::SpanLayer layer_;
   // ComponentId is predefined by SkyWalking OAP. The range of id is 9000~9999
   // on C++ language SDK. Based on
   // https://github.com/apache/skywalking/blob/master/docs/en/guides/Component-library-settings.md
   int32_t component_id_ = 9000;
   bool is_error_ = false;
   std::vector<std::pair<std::string, std::string>> tags_;
-  std::vector<Log> logs_;
+  std::vector<skywalking::v3::Log> logs_;
   bool skip_analysis_ = false;
   bool finished_ = false;
 
@@ -151,7 +155,7 @@ class TracingContextImpl : public TracingContext {
   std::optional<std::string> createSW8HeaderValue(
       TracingSpanPtr parent_span,
       const std::string_view target_address) override;
-  SegmentObject createSegmentObject() override;
+  skywalking::v3::SegmentObject createSegmentObject() override;
   void setSkipAnalysis() override { should_skip_analysis_ = true; }
   bool skipAnalysis() override { return should_skip_analysis_; }
   bool readyToSend() override;