Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

agents: share channel between OTLP exporters #242

Closed
wants to merge 1 commit into from
Closed

agents: share channel between OTLP exporters #242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 33 additions & 18 deletions agents/grpc/src/grpc_agent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@
#include "absl/log/initialize.h"
#include "opentelemetry/sdk/metrics/data/metric_data.h"
#include "opentelemetry/sdk/metrics/export/metric_producer.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_client.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_client_factory.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_exporter.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h"
#include "opentelemetry/exporters/otlp/otlp_metric_utils.h"
#include "opentelemetry/trace/semantic_conventions.h"

Expand All @@ -29,12 +34,17 @@ using opentelemetry::sdk::metrics::ScopeMetrics;
using opentelemetry::sdk::resource::Resource;
using opentelemetry::sdk::resource::ResourceAttributes;
using opentelemetry::sdk::trace::Recordable;
using opentelemetry::v1::exporter::otlp::OtlpGrpcClient;
using opentelemetry::v1::exporter::otlp::OtlpGrpcClientFactory;
using opentelemetry::v1::exporter::otlp::OtlpGrpcClientOptions;
using opentelemetry::v1::exporter::otlp::OtlpGrpcExporter;
using opentelemetry::v1::exporter::otlp::OtlpGrpcExporterFactory;
using opentelemetry::v1::exporter::otlp::OtlpGrpcExporterOptions;
using opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporter;
using opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporterFactory;
using opentelemetry::v1::exporter::otlp::OtlpGrpcLogRecordExporterOptions;
using opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporter;
using opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporterFactory;
using opentelemetry::v1::exporter::otlp::OtlpGrpcMetricExporterOptions;
using opentelemetry::v1::exporter::otlp::OtlpMetricUtils;
using opentelemetry::v1::trace::SemanticConventions::kProcessOwner;
Expand Down Expand Up @@ -1020,6 +1030,24 @@ int GrpcAgent::config(const json& config) {
it->get<std::string>() : console_id_ + ".grpc.nodesource.io:443";
Debug("GrpcAgent configured. Endpoint: %s. Insecure: %d\n",
endpoint.c_str(), static_cast<unsigned>(insecure));


OtlpGrpcClientOptions opts;
opts.endpoint = endpoint;
opts.metadata = {{"nsolid-agent-id", agent_id_},
{"nsolid-saas", saas_}};
if (!insecure) {
opts.use_ssl_credentials = true;
if (!custom_certs_.empty()) {
opts.ssl_credentials_cacert_as_string = custom_certs_;
} else {
opts.ssl_credentials_cacert_as_string = cacert_;
}
}

std::shared_ptr<OtlpGrpcClient> client = OtlpGrpcClientFactory::Create(opts);
nsolid_service_stub_ = GrpcClient::MakeNSolidServiceStub(opts);

{
OtlpGrpcExporterOptions options;
options.endpoint = endpoint;
Expand All @@ -1034,7 +1062,7 @@ int GrpcAgent::config(const json& config) {
}
}

trace_exporter_ = std::make_unique<OtlpGrpcExporter>(options);
trace_exporter_ = std::make_unique<OtlpGrpcExporter>(options, client);
}
{
OtlpGrpcMetricExporterOptions options;
Expand All @@ -1050,7 +1078,8 @@ int GrpcAgent::config(const json& config) {
}
}

metrics_exporter_ = std::make_unique<OtlpGrpcMetricExporter>(options);
metrics_exporter_ =
std::make_unique<OtlpGrpcMetricExporter>(options, client);
}
{
OtlpGrpcLogRecordExporterOptions options;
Expand All @@ -1066,24 +1095,10 @@ int GrpcAgent::config(const json& config) {
}
}

log_exporter_ = std::make_unique<OtlpGrpcLogRecordExporter>(options);
log_exporter_ =
std::make_unique<OtlpGrpcLogRecordExporter>(options, client);
}
{
OtlpGrpcClientOptions options;
options.endpoint = endpoint;
options.metadata = {{"nsolid-agent-id", agent_id_},
{"nsolid-saas", saas_}};
if (!insecure) {
options.use_ssl_credentials = true;
if (!custom_certs_.empty()) {
options.ssl_credentials_cacert_as_string = custom_certs_;
} else {
options.ssl_credentials_cacert_as_string = cacert_;
}
}

nsolid_service_stub_ = GrpcClient::MakeNSolidServiceStub(options);
}
reset_command_stream();
}
}
Expand Down
Loading