Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
  • Loading branch information
marcalff committed Oct 29, 2023
1 parent 1c36b8a commit 9c19c79
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 10 deletions.
7 changes: 4 additions & 3 deletions exporters/otlp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,10 @@ if(WITH_OTLP_GRPC)
list(APPEND OPENTELEMETRY_OTLP_TARGETS
opentelemetry_exporter_otlp_grpc_client)

add_library(opentelemetry_exporter_otlp_grpc
src/otlp_grpc_exporter.cc src/otlp_grpc_exporter_factory.cc
src/otlp_grpc_exporter_options.cc)
add_library(
opentelemetry_exporter_otlp_grpc
src/otlp_grpc_exporter.cc src/otlp_grpc_exporter_factory.cc
src/otlp_grpc_exporter_options.cc)

set_target_properties(opentelemetry_exporter_otlp_grpc
PROPERTIES EXPORT_NAME otlp_grpc_exporter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include <memory>

#include "opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_client_options.h"

#include "opentelemetry/exporters/otlp/protobuf_include_prefix.h"

Expand Down
3 changes: 2 additions & 1 deletion exporters/otlp/src/otlp_grpc_log_record_exporter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter()
: OtlpGrpcLogRecordExporter(OtlpGrpcLogRecordExporterOptions())
{}

OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter(const OtlpGrpcLogRecordExporterOptions &options)
OtlpGrpcLogRecordExporter::OtlpGrpcLogRecordExporter(
const OtlpGrpcLogRecordExporterOptions &options)
: options_(options), log_service_stub_(OtlpGrpcClient::MakeLogsServiceStub(options))
{}

Expand Down
6 changes: 3 additions & 3 deletions exporters/otlp/src/otlp_grpc_metric_exporter_options.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ namespace otlp

OtlpGrpcMetricExporterOptions::OtlpGrpcMetricExporterOptions()
{
endpoint = GetOtlpDefaultGrpcMetricsEndpoint();
use_ssl_credentials = !GetOtlpDefaultGrpcMetricsIsInsecure(); /* negation intended. */
ssl_credentials_cacert_path = GetOtlpDefaultMetricsSslCertificatePath();
endpoint = GetOtlpDefaultGrpcMetricsEndpoint();
use_ssl_credentials = !GetOtlpDefaultGrpcMetricsIsInsecure(); /* negation intended. */
ssl_credentials_cacert_path = GetOtlpDefaultMetricsSslCertificatePath();
ssl_credentials_cacert_as_string = GetOtlpDefaultMetricsSslCertificateString();

#ifdef ENABLE_OTLP_GRPC_SSL_MTLS_PREVIEW
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include <gtest/gtest.h>

#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_factory.h"
#include "opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter_options.h"

/*
Make sure OtlpGrpcLogRecordExporterFactory does not require,
Expand Down
3 changes: 2 additions & 1 deletion exporters/otlp/test/otlp_grpc_log_record_exporter_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ class OtlpGrpcLogRecordExporterTestPeer : public ::testing::Test
}

// Get the options associated with the given exporter.
const OtlpGrpcLogRecordExporterOptions &GetOptions(std::unique_ptr<OtlpGrpcLogRecordExporter> &exporter)
const OtlpGrpcLogRecordExporterOptions &GetOptions(
std::unique_ptr<OtlpGrpcLogRecordExporter> &exporter)
{
return exporter->options_;
}
Expand Down

0 comments on commit 9c19c79

Please sign in to comment.