Skip to content

Commit 343d723

Browse files
committed
more clang-tidy cleanup
1 parent b77d095 commit 343d723

11 files changed

+26
-19
lines changed

examples/yaml/custom_sampler.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ class CustomSampler : public opentelemetry::sdk::trace::Sampler
1717
{
1818
public:
1919
CustomSampler(const std::string & /* comment */) {}
20-
~CustomSampler() override = default;
20+
CustomSampler(CustomSampler &&) = delete;
21+
CustomSampler(const CustomSampler &) = delete;
22+
CustomSampler &operator=(CustomSampler &&) = delete;
23+
CustomSampler &operator=(const CustomSampler &other) = delete;
24+
~CustomSampler() override = default;
2125

2226
opentelemetry::sdk::trace::SamplingResult ShouldSample(
2327
const opentelemetry::trace::SpanContext &parent_context,

examples/yaml/custom_sampler_builder.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ class CustomSamplerBuilder : public opentelemetry::sdk::init::ExtensionSamplerBu
1515
public:
1616
static void Register(opentelemetry::sdk::init::Registry *registry);
1717

18-
CustomSamplerBuilder() = default;
19-
~CustomSamplerBuilder() override = default;
20-
2118
std::unique_ptr<opentelemetry::sdk::trace::Sampler> Build(
2219
const opentelemetry::sdk::configuration::ExtensionSamplerConfiguration *model) const override;
2320
};

examples/yaml/custom_span_exporter.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ class CustomSpanExporter : public opentelemetry::sdk::trace::SpanExporter
1616
{
1717
public:
1818
CustomSpanExporter(const std::string & /* comment */) {}
19-
~CustomSpanExporter() override = default;
19+
CustomSpanExporter(CustomSpanExporter &&) = delete;
20+
CustomSpanExporter(const CustomSpanExporter &) = delete;
21+
CustomSpanExporter &operator=(CustomSpanExporter &&) = delete;
22+
CustomSpanExporter &operator=(const CustomSpanExporter &other) = delete;
23+
~CustomSpanExporter() override = default;
2024

2125
std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable() noexcept override;
2226

examples/yaml/custom_span_exporter_builder.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ class CustomSpanExporterBuilder : public opentelemetry::sdk::init::ExtensionSpan
1515
public:
1616
static void Register(opentelemetry::sdk::init::Registry *registry);
1717

18-
CustomSpanExporterBuilder() = default;
19-
~CustomSpanExporterBuilder() override = default;
20-
2118
std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Build(
2219
const opentelemetry::sdk::configuration::ExtensionSpanExporterConfiguration *model)
2320
const override;

examples/yaml/custom_span_processor.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ void CustomSpanProcessor::OnStart(
2323
}
2424

2525
void CustomSpanProcessor::OnEnd(
26-
std::unique_ptr<opentelemetry::sdk::trace::Recordable> && /* span */) noexcept
26+
std::unique_ptr<opentelemetry::sdk::trace::Recordable> &&span) noexcept
2727
{
2828
OTEL_INTERNAL_LOG_ERROR("CustomSpanProcessor::OnEnd(): FIXME");
29+
auto unused = std::move(span);
2930
}
3031

3132
bool CustomSpanProcessor::ForceFlush(std::chrono::microseconds /* timeout */) noexcept

examples/yaml/custom_span_processor.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ class CustomSpanProcessor : public opentelemetry::sdk::trace::SpanProcessor
1515
{
1616
public:
1717
CustomSpanProcessor(const std::string &comment) : m_comment(comment) {}
18-
~CustomSpanProcessor() override = default;
18+
CustomSpanProcessor(CustomSpanProcessor &&) = delete;
19+
CustomSpanProcessor(const CustomSpanProcessor &) = delete;
20+
CustomSpanProcessor &operator=(CustomSpanProcessor &&) = delete;
21+
CustomSpanProcessor &operator=(const CustomSpanProcessor &other) = delete;
22+
~CustomSpanProcessor() override = default;
1923

2024
std::unique_ptr<opentelemetry::sdk::trace::Recordable> MakeRecordable() noexcept override;
2125

examples/yaml/custom_span_processor_builder.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ class CustomSpanProcessorBuilder : public opentelemetry::sdk::init::ExtensionSpa
1515
public:
1616
static void Register(opentelemetry::sdk::init::Registry *registry);
1717

18-
CustomSpanProcessorBuilder() = default;
19-
~CustomSpanProcessorBuilder() override = default;
20-
2118
std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor> Build(
2219
const opentelemetry::sdk::configuration::ExtensionSpanProcessorConfiguration *model)
2320
const override;

examples/yaml/main.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
static bool opt_help = false;
5757
static std::string yaml_file_path = "";
5858

59-
std::unique_ptr<opentelemetry::sdk::init::ConfiguredSdk> sdk;
59+
static std::unique_ptr<opentelemetry::sdk::init::ConfiguredSdk> sdk;
6060

6161
namespace
6262
{
@@ -138,7 +138,7 @@ void CleanupOtel()
138138
}
139139
} // namespace
140140

141-
void usage(FILE *out)
141+
static void usage(FILE *out)
142142
{
143143
static const char *msg =
144144
"Usage: example_yaml [options]\n"
@@ -154,7 +154,7 @@ void usage(FILE *out)
154154
fprintf(out, "%s", msg);
155155
}
156156

157-
int parse_args(int argc, char *argv[])
157+
static int parse_args(int argc, char *argv[])
158158
{
159159
int remaining_argc = argc;
160160
char **remaining_argv = argv;

sdk/test/configuration/yaml_resource_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
#include "opentelemetry/sdk/configuration/string_array_configuration.h"
1515
#include "opentelemetry/sdk/configuration/yaml_configuration_factory.h"
1616

17-
std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(const std::string &yaml)
17+
static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(
18+
const std::string &yaml)
1819
{
1920
static const std::string source("test");
2021
return opentelemetry::sdk::configuration::YamlConfigurationFactory::ParseString(source, yaml);

sdk/test/configuration/yaml_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
#include "opentelemetry/sdk/configuration/tracer_provider_configuration.h"
1313
#include "opentelemetry/sdk/configuration/yaml_configuration_factory.h"
1414

15-
std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(const std::string &yaml)
15+
static std::unique_ptr<opentelemetry::sdk::configuration::Configuration> DoParse(
16+
const std::string &yaml)
1617
{
1718
static const std::string source("test");
1819
return opentelemetry::sdk::configuration::YamlConfigurationFactory::ParseString(source, yaml);

0 commit comments

Comments
 (0)