Skip to content

Commit 28aae45

Browse files
psx95psx95
committed
Replace typedef with type alias
1 parent e02d1c5 commit 28aae45

File tree

12 files changed

+49
-40
lines changed

12 files changed

+49
-40
lines changed

‎sdk/include/opentelemetry/sdk/instrumentationscope/instrumentation_scope.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#pragma once
55

6+
#include <functional>
67
#include <string>
78
#include <type_traits>
89

@@ -158,6 +159,8 @@ class InstrumentationScope
158159
InstrumentationScopeAttributes attributes_;
159160
};
160161

162+
template <class T>
163+
using ScopeConfigurator = std::function<T(const InstrumentationScope &)>;
161164
} // namespace instrumentationscope
162165
} // namespace sdk
163166

‎sdk/include/opentelemetry/sdk/trace/tracer_config.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#pragma once
55

6-
#include <functional>
76
#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
87
#include "opentelemetry/version.h"
98

@@ -12,11 +11,6 @@ namespace sdk
1211
{
1312
namespace trace
1413
{
15-
// Forward declaration to support typedef creation
16-
class TracerConfig;
17-
18-
typedef std::function<TracerConfig(const instrumentationscope::InstrumentationScope &)>
19-
TracerConfigurator;
2014
/**
2115
* TracerConfig defines various configurable aspects of a Tracer's behavior.
2216
*/
@@ -33,14 +27,14 @@ class TracerConfig
3327
static TracerConfig Disabled();
3428
static TracerConfig Enabled();
3529
static TracerConfig Default();
36-
static const TracerConfigurator &DefaultConfigurator();
30+
static const instrumentationscope::ScopeConfigurator<TracerConfig> &DefaultConfigurator();
3731

3832
private:
3933
explicit TracerConfig(const bool disabled = false) : disabled_(disabled) {}
4034
bool disabled_;
4135
static const TracerConfig kDefaultConfig;
4236
static const TracerConfig kDisabledConfig;
43-
static const TracerConfigurator kDefaultTracerConfigurator;
37+
static const instrumentationscope::ScopeConfigurator<TracerConfig> kDefaultTracerConfigurator;
4438
};
4539
} // namespace trace
4640
} // namespace sdk

‎sdk/include/opentelemetry/sdk/trace/tracer_context.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ class TracerContext
4747
std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
4848
std::unique_ptr<IdGenerator> id_generator =
4949
std::unique_ptr<IdGenerator>(new RandomIdGenerator()),
50-
std::unique_ptr<TracerConfigurator> tracer_configurator =
51-
std::make_unique<TracerConfigurator>(TracerConfig::DefaultConfigurator())) noexcept;
50+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator =
51+
std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
52+
TracerConfig::DefaultConfigurator())) noexcept;
5253

5354
virtual ~TracerContext() = default;
5455

@@ -82,7 +83,7 @@ class TracerContext
8283
*/
8384
const opentelemetry::sdk::resource::Resource &GetResource() const noexcept;
8485

85-
TracerConfigurator &GetTracerConfigurator() const noexcept;
86+
instrumentationscope::ScopeConfigurator<TracerConfig> &GetTracerConfigurator() const noexcept;
8687

8788
/**
8889
* Obtain the Id Generator associated with this tracer context.
@@ -107,7 +108,7 @@ class TracerContext
107108
std::unique_ptr<Sampler> sampler_;
108109
std::unique_ptr<IdGenerator> id_generator_;
109110
std::unique_ptr<SpanProcessor> processor_;
110-
std::unique_ptr<TracerConfigurator> tracer_configurator_;
111+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator_;
111112
};
112113

113114
} // namespace trace

‎sdk/include/opentelemetry/sdk/trace/tracer_context_factory.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class OPENTELEMETRY_EXPORT TracerContextFactory
6363
const opentelemetry::sdk::resource::Resource &resource,
6464
std::unique_ptr<Sampler> sampler,
6565
std::unique_ptr<IdGenerator> id_generator,
66-
std::unique_ptr<TracerConfigurator> tracer_configurator);
66+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator);
6767
};
6868

6969
} // namespace trace

‎sdk/include/opentelemetry/sdk/trace/tracer_provider.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::T
5151
std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
5252
std::unique_ptr<IdGenerator> id_generator =
5353
std::unique_ptr<IdGenerator>(new RandomIdGenerator()),
54-
std::unique_ptr<TracerConfigurator> tracer_configurator =
55-
std::make_unique<TracerConfigurator>(TracerConfig::DefaultConfigurator())) noexcept;
54+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator =
55+
std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
56+
TracerConfig::DefaultConfigurator())) noexcept;
5657

5758
explicit TracerProvider(
5859
std::vector<std::unique_ptr<SpanProcessor>> &&processors,
@@ -61,8 +62,9 @@ class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::T
6162
std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
6263
std::unique_ptr<IdGenerator> id_generator =
6364
std::unique_ptr<IdGenerator>(new RandomIdGenerator()),
64-
std::unique_ptr<TracerConfigurator> tracer_configurator =
65-
std::make_unique<TracerConfigurator>(TracerConfig::DefaultConfigurator())) noexcept;
65+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator =
66+
std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
67+
TracerConfig::DefaultConfigurator())) noexcept;
6668

6769
/**
6870
* Initialize a new tracer provider with a specified context

‎sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class OPENTELEMETRY_EXPORT TracerProviderFactory
5353
const opentelemetry::sdk::resource::Resource &resource,
5454
std::unique_ptr<Sampler> sampler,
5555
std::unique_ptr<IdGenerator> id_generator,
56-
std::unique_ptr<TracerConfigurator> tracer_configurator);
56+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator);
5757

5858
/* Series of creator methods with a single processor. */
5959

@@ -80,7 +80,7 @@ class OPENTELEMETRY_EXPORT TracerProviderFactory
8080
const opentelemetry::sdk::resource::Resource &resource,
8181
std::unique_ptr<Sampler> sampler,
8282
std::unique_ptr<IdGenerator> id_generator,
83-
std::unique_ptr<TracerConfigurator> tracer_configurator);
83+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator);
8484

8585
/* Create with a tracer context. */
8686

‎sdk/src/trace/tracer_config.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ namespace trace
1313
const TracerConfig TracerConfig::kDefaultConfig = TracerConfig();
1414
const TracerConfig TracerConfig::kDisabledConfig = TracerConfig(true);
1515

16-
const TracerConfigurator TracerConfig::kDefaultTracerConfigurator =
17-
[](const instrumentationscope::InstrumentationScope &) { return Default(); };
16+
const instrumentationscope::ScopeConfigurator<TracerConfig>
17+
TracerConfig::kDefaultTracerConfigurator =
18+
[](const instrumentationscope::InstrumentationScope &) { return Default(); };
1819

1920
TracerConfig TracerConfig::Disabled()
2021
{
@@ -31,7 +32,7 @@ TracerConfig TracerConfig::Default()
3132
return kDefaultConfig;
3233
}
3334

34-
const TracerConfigurator &TracerConfig::DefaultConfigurator()
35+
const instrumentationscope::ScopeConfigurator<TracerConfig> &TracerConfig::DefaultConfigurator()
3536
{
3637
return kDefaultTracerConfigurator;
3738
}

‎sdk/src/trace/tracer_context.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ TracerContext::TracerContext(std::vector<std::unique_ptr<SpanProcessor>> &&proce
2626
const resource::Resource &resource,
2727
std::unique_ptr<Sampler> sampler,
2828
std::unique_ptr<IdGenerator> id_generator,
29-
std::unique_ptr<TracerConfigurator> tracer_configurator) noexcept
29+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>>
30+
tracer_configurator) noexcept
3031
: resource_(resource),
3132
sampler_(std::move(sampler)),
3233
id_generator_(std::move(id_generator)),

‎sdk/src/trace/tracer_context_factory.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ std::unique_ptr<TracerContext> TracerContextFactory::Create(
5353
std::unique_ptr<IdGenerator> id_generator)
5454
{
5555
auto tracer_configurator =
56-
std::make_unique<TracerConfigurator>(TracerConfig::DefaultConfigurator());
56+
std::make_unique<instrumentationscope::ScopeConfigurator<TracerConfig>>(
57+
TracerConfig::DefaultConfigurator());
5758
return Create(std::move(processors), resource, std::move(sampler), std::move(id_generator),
5859
std::move(tracer_configurator));
5960
}
@@ -63,7 +64,7 @@ std::unique_ptr<TracerContext> TracerContextFactory::Create(
6364
const opentelemetry::sdk::resource::Resource &resource,
6465
std::unique_ptr<Sampler> sampler,
6566
std::unique_ptr<IdGenerator> id_generator,
66-
std::unique_ptr<TracerConfigurator> tracer_configurator)
67+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>> tracer_configurator)
6768
{
6869
std::unique_ptr<TracerContext> context(
6970
new TracerContext(std::move(processors), resource, std::move(sampler),

‎sdk/src/trace/tracer_provider.cc‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ TracerProvider::TracerProvider(std::unique_ptr<TracerContext> context) noexcept
3939
OTEL_INTERNAL_LOG_DEBUG("[TracerProvider] TracerProvider created.");
4040
}
4141

42-
TracerProvider::TracerProvider(std::unique_ptr<SpanProcessor> processor,
43-
const resource::Resource &resource,
44-
std::unique_ptr<Sampler> sampler,
45-
std::unique_ptr<IdGenerator> id_generator,
46-
std::unique_ptr<TracerConfigurator> tracer_configurator) noexcept
42+
TracerProvider::TracerProvider(
43+
std::unique_ptr<SpanProcessor> processor,
44+
const resource::Resource &resource,
45+
std::unique_ptr<Sampler> sampler,
46+
std::unique_ptr<IdGenerator> id_generator,
47+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>>
48+
tracer_configurator) noexcept
4749
{
4850
std::vector<std::unique_ptr<SpanProcessor>> processors;
4951
processors.push_back(std::move(processor));
@@ -52,11 +54,13 @@ TracerProvider::TracerProvider(std::unique_ptr<SpanProcessor> processor,
5254
std::move(id_generator), std::move(tracer_configurator));
5355
}
5456

55-
TracerProvider::TracerProvider(std::vector<std::unique_ptr<SpanProcessor>> &&processors,
56-
const resource::Resource &resource,
57-
std::unique_ptr<Sampler> sampler,
58-
std::unique_ptr<IdGenerator> id_generator,
59-
std::unique_ptr<TracerConfigurator> tracer_configurator) noexcept
57+
TracerProvider::TracerProvider(
58+
std::vector<std::unique_ptr<SpanProcessor>> &&processors,
59+
const resource::Resource &resource,
60+
std::unique_ptr<Sampler> sampler,
61+
std::unique_ptr<IdGenerator> id_generator,
62+
std::unique_ptr<instrumentationscope::ScopeConfigurator<TracerConfig>>
63+
tracer_configurator) noexcept
6064
{
6165
context_ =
6266
std::make_shared<TracerContext>(std::move(processors), resource, std::move(sampler),

0 commit comments

Comments
 (0)