Skip to content

Commit 209f3b1

Browse files
committed
clean up code to use override keyword and range-based for loops
1 parent 1271789 commit 209f3b1

File tree

12 files changed

+13
-15
lines changed

12 files changed

+13
-15
lines changed

api/baggage/include/opentelemetry-matlab/baggage/BaggagePropagatorProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class BaggagePropagatorProxy : public TextMapPropagatorProxy {
2222

2323
// getUniquePtrCopy is used by CompositePropagator, which needs a unique_ptr instance
2424
// Takes the BaggagePropagator object inside the shared_ptr, make a copy, and wrap the copy in a unique_ptr
25-
virtual std::unique_ptr<context_propagation::TextMapPropagator> getUniquePtrCopy() {
25+
virtual std::unique_ptr<context_propagation::TextMapPropagator> getUniquePtrCopy() override {
2626
return std::unique_ptr<context_propagation::TextMapPropagator>(
2727
new baggage_propagation::BaggagePropagator(
2828
*static_cast<baggage_propagation::BaggagePropagator*>(CppPropagator.get())));

api/baggage/src/BaggageProxy.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,8 @@ void BaggageProxy::setEntries(libmexclass::proxy::method::Context& context) {
7777

7878
void BaggageProxy::deleteEntries(libmexclass::proxy::method::Context& context) {
7979
matlab::data::StringArray keys_mda = context.inputs[0];
80-
size_t nkeys = keys_mda.getNumberOfElements();
81-
for (size_t i = 0; i < nkeys; ++i) {
82-
CppBaggage = CppBaggage->Delete(static_cast<std::string>(keys_mda[i]));
80+
for (auto key : keys_mda) {
81+
CppBaggage = CppBaggage->Delete(static_cast<std::string>(key));
8382
}
8483
}
8584

api/context/src/CompositePropagatorProxy.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ CompositePropagatorProxy::CompositePropagatorProxy(const libmexclass::proxy::Fun
1616
std::vector<std::unique_ptr<context_propagation::TextMapPropagator> > propagators;
1717
propagators.reserve(npropagators);
1818

19-
for (size_t i=0; i < npropagators; ++i) {
20-
libmexclass::proxy::ID propagatorid = propagatorid_mda[i];
19+
for (auto propagatorid : propagatorid_mda) {
2120
propagators.push_back(std::static_pointer_cast<TextMapPropagatorProxy>(
2221
libmexclass::proxy::ProxyManager::getProxy(propagatorid))->getUniquePtrCopy());
2322
}

api/trace/include/opentelemetry-matlab/trace/TraceContextPropagatorProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class TraceContextPropagatorProxy : public TextMapPropagatorProxy {
2222

2323
// getUniquePtrCopy is used by CompositePropagator, which needs a unique_ptr instance
2424
// Takes the BaggagePropagator object inside the shared_ptr, make a copy, and wrap the copy in a unique_ptr
25-
virtual std::unique_ptr<context_propagation::TextMapPropagator> getUniquePtrCopy() {
25+
virtual std::unique_ptr<context_propagation::TextMapPropagator> getUniquePtrCopy() override {
2626
return std::unique_ptr<context_propagation::TextMapPropagator>(
2727
new trace_propagation::HttpTraceContext(
2828
*static_cast<trace_propagation::HttpTraceContext*>(CppPropagator.get())));

exporters/otlp/include/opentelemetry-matlab/exporters/otlp/OtlpGrpcSpanExporterProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class OtlpGrpcSpanExporterProxy: public libmexclass::opentelemetry::sdk::SpanExp
1818
public:
1919
OtlpGrpcSpanExporterProxy(const libmexclass::proxy::FunctionArguments& constructor_arguments);
2020

21-
std::unique_ptr<trace_sdk::SpanExporter> getInstance();
21+
std::unique_ptr<trace_sdk::SpanExporter> getInstance() override;
2222

2323
void getDefaultOptionValues(libmexclass::proxy::method::Context& context);
2424

exporters/otlp/include/opentelemetry-matlab/exporters/otlp/OtlpHttpSpanExporterProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class OtlpHttpSpanExporterProxy: public libmexclass::opentelemetry::sdk::SpanExp
1818
public:
1919
OtlpHttpSpanExporterProxy(const libmexclass::proxy::FunctionArguments& constructor_arguments);
2020

21-
std::unique_ptr<trace_sdk::SpanExporter> getInstance();
21+
std::unique_ptr<trace_sdk::SpanExporter> getInstance() override;
2222

2323
void getDefaultOptionValues(libmexclass::proxy::method::Context& context);
2424

sdk/trace/include/opentelemetry-matlab/sdk/trace/AlwaysOffSamplerProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AlwaysOffSamplerProxy : public SamplerProxy {
1616
public:
1717
AlwaysOffSamplerProxy(const libmexclass::proxy::FunctionArguments& constructor_arguments) {}
1818

19-
std::unique_ptr<trace_sdk::Sampler> getInstance() {
19+
std::unique_ptr<trace_sdk::Sampler> getInstance() override {
2020
return trace_sdk::AlwaysOffSamplerFactory::Create();
2121
}
2222
};

sdk/trace/include/opentelemetry-matlab/sdk/trace/AlwaysOnSamplerProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AlwaysOnSamplerProxy : public SamplerProxy {
1616
public:
1717
AlwaysOnSamplerProxy(const libmexclass::proxy::FunctionArguments& constructor_arguments) {}
1818

19-
std::unique_ptr<trace_sdk::Sampler> getInstance() {
19+
std::unique_ptr<trace_sdk::Sampler> getInstance() override {
2020
return trace_sdk::AlwaysOnSamplerFactory::Create();
2121
}
2222
};

sdk/trace/include/opentelemetry-matlab/sdk/trace/BatchSpanProcessorProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class BatchSpanProcessorProxy : public SpanProcessorProxy {
1717
public:
1818
BatchSpanProcessorProxy(const libmexclass::proxy::FunctionArguments& constructor_arguments);
1919

20-
std::unique_ptr<trace_sdk::SpanProcessor> getInstance();
20+
std::unique_ptr<trace_sdk::SpanProcessor> getInstance() override;
2121

2222
void getDefaultOptionValues(libmexclass::proxy::method::Context& context);
2323

sdk/trace/include/opentelemetry-matlab/sdk/trace/ParentBasedSamplerProxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class ParentBasedSamplerProxy : public SamplerProxy {
1414
public:
1515
ParentBasedSamplerProxy(const libmexclass::proxy::FunctionArguments& constructor_arguments);
1616

17-
std::unique_ptr<trace_sdk::Sampler> getInstance();
17+
std::unique_ptr<trace_sdk::Sampler> getInstance() override;
1818

1919
private:
2020
std::shared_ptr<trace_sdk::Sampler> DelegateSampler;

0 commit comments

Comments
 (0)