Fix building

Author: stefanDeveloper

src/FluvioWriter.cc

@@ -1,11 +1,12 @@
 #include "FluvioWriter.h"
 #include "fluvio.bif.h"
+#include <zeek/Desc.h>
 
 namespace logging {
 namespace writer {
 
-FluvioWriter::FluvioWriter(WriterFrontend* frontend) : WriterBackend(frontend), client(nullptr), producer(nullptr) {
-    formatter = new threading::formatter::JSON(this, threading::formatter::JSON::TS_EPOCH);
+FluvioWriter::FluvioWriter(zeek::logging::WriterFrontend* frontend) : zeek::logging::WriterBackend(frontend), client(nullptr), producer(nullptr) {
+    formatter = new zeek::threading::formatter::JSON(this, zeek::threading::formatter::JSON::TS_EPOCH);
 }
 
 FluvioWriter::~FluvioWriter() {
@@ -18,7 +19,7 @@ FluvioWriter::~FluvioWriter() {
     }
 }
 
-bool FluvioWriter::DoInit(const WriterInfo& info, int num_fields, const threading::Field* const* fields) {
+bool FluvioWriter::DoInit(const zeek::logging::WriterBackend::WriterInfo& info, int num_fields, const zeek::threading::Field* const* fields) {
     topic_name = info.path;
 
     if (fluvio_c_connect(&client) != 0) {
@@ -35,10 +36,10 @@ bool FluvioWriter::DoInit(const WriterInfo& info, int num_fields, const threadin
     return true;
 }
 
-bool FluvioWriter::DoWrite(int num_fields, const threading::Field* const* fields, threading::Value** vals) {
+bool FluvioWriter::DoWrite(int num_fields, const zeek::threading::Field* const* fields, zeek::threading::Value** vals) {
     if (!producer) return false;
 
-    ODesc desc;
+    zeek::ODesc desc;
     formatter->Describe(&desc, num_fields, fields, vals);
 
     std::string payload = desc.Description();

src/FluvioWriter.h

@@ -1,32 +1,32 @@
 #pragma once
-#include <logging/WriterBackend.h>
-#include <threading/formatters/JSON.h>
+#include <zeek/logging/WriterBackend.h>
+#include <zeek/threading/formatters/JSON.h>
 #include <fluvio.h>
 #include <string>
 
 namespace logging {
 namespace writer {
 
-class FluvioWriter : public WriterBackend {
+class FluvioWriter : public zeek::logging::WriterBackend {
 public:
-    explicit FluvioWriter(WriterFrontend* frontend);
+    explicit FluvioWriter(zeek::logging::WriterFrontend* frontend);
     ~FluvioWriter() override;
 
-    static WriterBackend* Instantiate(WriterFrontend* frontend) {
+    static zeek::logging::WriterBackend* Instantiate(zeek::logging::WriterFrontend* frontend) {
         return new FluvioWriter(frontend);
     }
 
 protected:
-    bool DoInit(const WriterInfo& info, int num_fields, const threading::Field* const* fields) override;
-    bool DoWrite(int num_fields, const threading::Field* const* fields, threading::Value** vals) override;
+    bool DoInit(const zeek::logging::WriterBackend::WriterInfo& info, int num_fields, const zeek::threading::Field* const* fields) override;
+    bool DoWrite(int num_fields, const zeek::threading::Field* const* fields, zeek::threading::Value** vals) override;
     bool DoSetBuf(bool enabled) override;
     bool DoRotate(const char* rotated_path, double open, double close, bool terminating) override;
     bool DoFlush(double network_time) override;
     bool DoFinish(double network_time) override;
     bool DoHeartbeat(double network_time, double current_time) override;
 
 private:
-    threading::formatter::JSON* formatter;
+    zeek::threading::formatter::JSON* formatter;
     fluvio_client_t* client;
     fluvio_topic_producer_t* producer;
     std::string topic_name;

src/Plugin.cc

@@ -6,10 +6,10 @@ namespace Zeek_Fluvio {
 
 Plugin plugin;
 
-plugin::Configuration Plugin::Configure() {
-    AddComponent(new ::logging::Component("FluvioWriter", ::logging::writer::FluvioWriter::Instantiate));
+zeek::plugin::Configuration Plugin::Configure() {
+    AddComponent(new ::zeek::logging::Component("FluvioWriter", ::logging::writer::FluvioWriter::Instantiate));
 
-    plugin::Configuration config;
+    zeek::plugin::Configuration config;
     config.name = "Zeek::Fluvio";
     config.description = "Writes Zeek logs to Fluvio Streams";
     config.version.major = 0;

src/Plugin.h

@@ -1,12 +1,12 @@
 #pragma once
-#include <plugin/Plugin.h>
+#include <zeek/plugin/Plugin.h>
 
 namespace plugin {
 namespace Zeek_Fluvio {
 
-class Plugin : public ::plugin::Plugin {
+class Plugin : public zeek::plugin::Plugin {
 protected:
-    plugin::Configuration Configure() override;
+    zeek::plugin::Configuration Configure() override;
 };
 
 extern Plugin plugin;