Skip to content

Commit 1077265

Browse files
marcalffmarcalff
committed
Implemented code review comments.
1 parent 3a42cd4 commit 1077265

File tree

13 files changed

+73
-842
lines changed

13 files changed

+73
-842
lines changed

‎api/include/opentelemetry/semconv/http_metrics.h‎

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -47,25 +47,6 @@ CreateSyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
4747
unitMetricHttpClientRequestDuration);
4848
}
4949

50-
#ifdef OPENTELEMETRY_LATER
51-
// Unsupported: Async histogram
52-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
53-
CreateAsyncInt64MetricHttpClientRequestDuration(metrics::Meter *meter)
54-
{
55-
return meter->CreateInt64ObservableHistogram(kMetricHttpClientRequestDuration,
56-
descrMetricHttpClientRequestDuration,
57-
unitMetricHttpClientRequestDuration);
58-
}
59-
60-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
61-
CreateAsyncDoubleMetricHttpClientRequestDuration(metrics::Meter *meter)
62-
{
63-
return meter->CreateDoubleObservableHistogram(kMetricHttpClientRequestDuration,
64-
descrMetricHttpClientRequestDuration,
65-
unitMetricHttpClientRequestDuration);
66-
}
67-
#endif /* OPENTELEMETRY_LATER */
68-
6950
/**
7051
* Duration of HTTP server requests.
7152
* <p>
@@ -93,25 +74,6 @@ CreateSyncDoubleMetricHttpServerRequestDuration(metrics::Meter *meter)
9374
unitMetricHttpServerRequestDuration);
9475
}
9576

96-
#ifdef OPENTELEMETRY_LATER
97-
// Unsupported: Async histogram
98-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
99-
CreateAsyncInt64MetricHttpServerRequestDuration(metrics::Meter *meter)
100-
{
101-
return meter->CreateInt64ObservableHistogram(kMetricHttpServerRequestDuration,
102-
descrMetricHttpServerRequestDuration,
103-
unitMetricHttpServerRequestDuration);
104-
}
105-
106-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
107-
CreateAsyncDoubleMetricHttpServerRequestDuration(metrics::Meter *meter)
108-
{
109-
return meter->CreateDoubleObservableHistogram(kMetricHttpServerRequestDuration,
110-
descrMetricHttpServerRequestDuration,
111-
unitMetricHttpServerRequestDuration);
112-
}
113-
#endif /* OPENTELEMETRY_LATER */
114-
11577
} // namespace http
11678
} // namespace semconv
11779
OPENTELEMETRY_END_NAMESPACE

‎api/include/opentelemetry/semconv/incubating/db_metrics.h‎

Lines changed: 0 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,6 @@ CreateSyncDoubleMetricDbClientConnectionCreateTime(metrics::Meter *meter)
8888
unitMetricDbClientConnectionCreateTime);
8989
}
9090

91-
#ifdef OPENTELEMETRY_LATER
92-
// Unsupported: Async histogram
93-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
94-
CreateAsyncInt64MetricDbClientConnectionCreateTime(metrics::Meter *meter)
95-
{
96-
return meter->CreateInt64ObservableHistogram(kMetricDbClientConnectionCreateTime,
97-
descrMetricDbClientConnectionCreateTime,
98-
unitMetricDbClientConnectionCreateTime);
99-
}
100-
101-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
102-
CreateAsyncDoubleMetricDbClientConnectionCreateTime(metrics::Meter *meter)
103-
{
104-
return meter->CreateDoubleObservableHistogram(kMetricDbClientConnectionCreateTime,
105-
descrMetricDbClientConnectionCreateTime,
106-
unitMetricDbClientConnectionCreateTime);
107-
}
108-
#endif /* OPENTELEMETRY_LATER */
109-
11091
/**
11192
* The maximum number of idle open connections allowed
11293
* <p>
@@ -349,25 +330,6 @@ CreateSyncDoubleMetricDbClientConnectionUseTime(metrics::Meter *meter)
349330
unitMetricDbClientConnectionUseTime);
350331
}
351332

352-
#ifdef OPENTELEMETRY_LATER
353-
// Unsupported: Async histogram
354-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
355-
CreateAsyncInt64MetricDbClientConnectionUseTime(metrics::Meter *meter)
356-
{
357-
return meter->CreateInt64ObservableHistogram(kMetricDbClientConnectionUseTime,
358-
descrMetricDbClientConnectionUseTime,
359-
unitMetricDbClientConnectionUseTime);
360-
}
361-
362-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
363-
CreateAsyncDoubleMetricDbClientConnectionUseTime(metrics::Meter *meter)
364-
{
365-
return meter->CreateDoubleObservableHistogram(kMetricDbClientConnectionUseTime,
366-
descrMetricDbClientConnectionUseTime,
367-
unitMetricDbClientConnectionUseTime);
368-
}
369-
#endif /* OPENTELEMETRY_LATER */
370-
371333
/**
372334
* The time it took to obtain an open connection from the pool
373335
* <p>
@@ -395,25 +357,6 @@ CreateSyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
395357
unitMetricDbClientConnectionWaitTime);
396358
}
397359

398-
#ifdef OPENTELEMETRY_LATER
399-
// Unsupported: Async histogram
400-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
401-
CreateAsyncInt64MetricDbClientConnectionWaitTime(metrics::Meter *meter)
402-
{
403-
return meter->CreateInt64ObservableHistogram(kMetricDbClientConnectionWaitTime,
404-
descrMetricDbClientConnectionWaitTime,
405-
unitMetricDbClientConnectionWaitTime);
406-
}
407-
408-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
409-
CreateAsyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
410-
{
411-
return meter->CreateDoubleObservableHistogram(kMetricDbClientConnectionWaitTime,
412-
descrMetricDbClientConnectionWaitTime,
413-
unitMetricDbClientConnectionWaitTime);
414-
}
415-
#endif /* OPENTELEMETRY_LATER */
416-
417360
/**
418361
* Deprecated, use @code db.client.connection.create_time @endcode instead. Note: the unit also
419362
* changed from @code ms @endcode to @code s @endcode. <p>
@@ -449,27 +392,6 @@ CreateSyncDoubleMetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *me
449392
unitMetricDbClientConnectionsCreateTimeDeprecated);
450393
}
451394

452-
#ifdef OPENTELEMETRY_LATER
453-
// Unsupported: Async histogram
454-
OPENTELEMETRY_DEPRECATED
455-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
456-
CreateAsyncInt64MetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *meter)
457-
{
458-
return meter->CreateInt64ObservableHistogram(kMetricDbClientConnectionsCreateTimeDeprecated,
459-
descrMetricDbClientConnectionsCreateTimeDeprecated,
460-
unitMetricDbClientConnectionsCreateTimeDeprecated);
461-
}
462-
463-
OPENTELEMETRY_DEPRECATED
464-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
465-
CreateAsyncDoubleMetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *meter)
466-
{
467-
return meter->CreateDoubleObservableHistogram(kMetricDbClientConnectionsCreateTimeDeprecated,
468-
descrMetricDbClientConnectionsCreateTimeDeprecated,
469-
unitMetricDbClientConnectionsCreateTimeDeprecated);
470-
}
471-
#endif /* OPENTELEMETRY_LATER */
472-
473395
/**
474396
* Deprecated, use @code db.client.connection.idle.max @endcode instead.
475397
* <p>
@@ -825,27 +747,6 @@ CreateSyncDoubleMetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter
825747
unitMetricDbClientConnectionsUseTimeDeprecated);
826748
}
827749

828-
#ifdef OPENTELEMETRY_LATER
829-
// Unsupported: Async histogram
830-
OPENTELEMETRY_DEPRECATED
831-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
832-
CreateAsyncInt64MetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
833-
{
834-
return meter->CreateInt64ObservableHistogram(kMetricDbClientConnectionsUseTimeDeprecated,
835-
descrMetricDbClientConnectionsUseTimeDeprecated,
836-
unitMetricDbClientConnectionsUseTimeDeprecated);
837-
}
838-
839-
OPENTELEMETRY_DEPRECATED
840-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
841-
CreateAsyncDoubleMetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
842-
{
843-
return meter->CreateDoubleObservableHistogram(kMetricDbClientConnectionsUseTimeDeprecated,
844-
descrMetricDbClientConnectionsUseTimeDeprecated,
845-
unitMetricDbClientConnectionsUseTimeDeprecated);
846-
}
847-
#endif /* OPENTELEMETRY_LATER */
848-
849750
/**
850751
* Deprecated, use @code db.client.connection.wait_time @endcode instead. Note: the unit also
851752
* changed from @code ms @endcode to @code s @endcode. <p>
@@ -881,27 +782,6 @@ CreateSyncDoubleMetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *mete
881782
unitMetricDbClientConnectionsWaitTimeDeprecated);
882783
}
883784

884-
#ifdef OPENTELEMETRY_LATER
885-
// Unsupported: Async histogram
886-
OPENTELEMETRY_DEPRECATED
887-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
888-
CreateAsyncInt64MetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter)
889-
{
890-
return meter->CreateInt64ObservableHistogram(kMetricDbClientConnectionsWaitTimeDeprecated,
891-
descrMetricDbClientConnectionsWaitTimeDeprecated,
892-
unitMetricDbClientConnectionsWaitTimeDeprecated);
893-
}
894-
895-
OPENTELEMETRY_DEPRECATED
896-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
897-
CreateAsyncDoubleMetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter)
898-
{
899-
return meter->CreateDoubleObservableHistogram(kMetricDbClientConnectionsWaitTimeDeprecated,
900-
descrMetricDbClientConnectionsWaitTimeDeprecated,
901-
unitMetricDbClientConnectionsWaitTimeDeprecated);
902-
}
903-
#endif /* OPENTELEMETRY_LATER */
904-
905785
/**
906786
* Duration of database client operations.
907787
* <p>
@@ -931,25 +811,6 @@ CreateSyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
931811
unitMetricDbClientOperationDuration);
932812
}
933813

934-
#ifdef OPENTELEMETRY_LATER
935-
// Unsupported: Async histogram
936-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
937-
CreateAsyncInt64MetricDbClientOperationDuration(metrics::Meter *meter)
938-
{
939-
return meter->CreateInt64ObservableHistogram(kMetricDbClientOperationDuration,
940-
descrMetricDbClientOperationDuration,
941-
unitMetricDbClientOperationDuration);
942-
}
943-
944-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
945-
CreateAsyncDoubleMetricDbClientOperationDuration(metrics::Meter *meter)
946-
{
947-
return meter->CreateDoubleObservableHistogram(kMetricDbClientOperationDuration,
948-
descrMetricDbClientOperationDuration,
949-
unitMetricDbClientOperationDuration);
950-
}
951-
#endif /* OPENTELEMETRY_LATER */
952-
953814
} // namespace db
954815
} // namespace semconv
955816
OPENTELEMETRY_END_NAMESPACE

‎api/include/opentelemetry/semconv/incubating/dns_metrics.h‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,6 @@ static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetr
4444
unitMetricDnsLookupDuration);
4545
}
4646

47-
#ifdef OPENTELEMETRY_LATER
48-
// Unsupported: Async histogram
49-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
50-
CreateAsyncInt64MetricDnsLookupDuration(metrics::Meter *meter)
51-
{
52-
return meter->CreateInt64ObservableHistogram(
53-
kMetricDnsLookupDuration, descrMetricDnsLookupDuration, unitMetricDnsLookupDuration);
54-
}
55-
56-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
57-
CreateAsyncDoubleMetricDnsLookupDuration(metrics::Meter *meter)
58-
{
59-
return meter->CreateDoubleObservableHistogram(
60-
kMetricDnsLookupDuration, descrMetricDnsLookupDuration, unitMetricDnsLookupDuration);
61-
}
62-
#endif /* OPENTELEMETRY_LATER */
63-
6447
} // namespace dns
6548
} // namespace semconv
6649
OPENTELEMETRY_END_NAMESPACE

‎api/include/opentelemetry/semconv/incubating/faas_metrics.h‎

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -80,23 +80,6 @@ static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetr
8080
unitMetricFaasCpuUsage);
8181
}
8282

83-
#ifdef OPENTELEMETRY_LATER
84-
// Unsupported: Async histogram
85-
static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasCpuUsage(
86-
metrics::Meter *meter)
87-
{
88-
return meter->CreateInt64ObservableHistogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
89-
unitMetricFaasCpuUsage);
90-
}
91-
92-
static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasCpuUsage(
93-
metrics::Meter *meter)
94-
{
95-
return meter->CreateDoubleObservableHistogram(kMetricFaasCpuUsage, descrMetricFaasCpuUsage,
96-
unitMetricFaasCpuUsage);
97-
}
98-
#endif /* OPENTELEMETRY_LATER */
99-
10083
/**
10184
* Number of invocation errors
10285
* <p>
@@ -156,23 +139,6 @@ static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetr
156139
unitMetricFaasInitDuration);
157140
}
158141

159-
#ifdef OPENTELEMETRY_LATER
160-
// Unsupported: Async histogram
161-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
162-
CreateAsyncInt64MetricFaasInitDuration(metrics::Meter *meter)
163-
{
164-
return meter->CreateInt64ObservableHistogram(kMetricFaasInitDuration, descrMetricFaasInitDuration,
165-
unitMetricFaasInitDuration);
166-
}
167-
168-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
169-
CreateAsyncDoubleMetricFaasInitDuration(metrics::Meter *meter)
170-
{
171-
return meter->CreateDoubleObservableHistogram(
172-
kMetricFaasInitDuration, descrMetricFaasInitDuration, unitMetricFaasInitDuration);
173-
}
174-
#endif /* OPENTELEMETRY_LATER */
175-
176142
/**
177143
* Number of successful invocations
178144
* <p>
@@ -234,23 +200,6 @@ CreateSyncDoubleMetricFaasInvokeDuration(metrics::Meter *meter)
234200
unitMetricFaasInvokeDuration);
235201
}
236202

237-
#ifdef OPENTELEMETRY_LATER
238-
// Unsupported: Async histogram
239-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
240-
CreateAsyncInt64MetricFaasInvokeDuration(metrics::Meter *meter)
241-
{
242-
return meter->CreateInt64ObservableHistogram(
243-
kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration, unitMetricFaasInvokeDuration);
244-
}
245-
246-
static inline nostd::shared_ptr<metrics::ObservableInstrument>
247-
CreateAsyncDoubleMetricFaasInvokeDuration(metrics::Meter *meter)
248-
{
249-
return meter->CreateDoubleObservableHistogram(
250-
kMetricFaasInvokeDuration, descrMetricFaasInvokeDuration, unitMetricFaasInvokeDuration);
251-
}
252-
#endif /* OPENTELEMETRY_LATER */
253-
254203
/**
255204
* Distribution of max memory usage per invocation
256205
* <p>
@@ -275,23 +224,6 @@ static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetr
275224
unitMetricFaasMemUsage);
276225
}
277226

278-
#ifdef OPENTELEMETRY_LATER
279-
// Unsupported: Async histogram
280-
static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasMemUsage(
281-
metrics::Meter *meter)
282-
{
283-
return meter->CreateInt64ObservableHistogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
284-
unitMetricFaasMemUsage);
285-
}
286-
287-
static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasMemUsage(
288-
metrics::Meter *meter)
289-
{
290-
return meter->CreateDoubleObservableHistogram(kMetricFaasMemUsage, descrMetricFaasMemUsage,
291-
unitMetricFaasMemUsage);
292-
}
293-
#endif /* OPENTELEMETRY_LATER */
294-
295227
/**
296228
* Distribution of net I/O usage per invocation
297229
* <p>
@@ -313,23 +245,6 @@ static inline nostd::unique_ptr<metrics::Histogram<double>> CreateSyncDoubleMetr
313245
return meter->CreateDoubleHistogram(kMetricFaasNetIo, descrMetricFaasNetIo, unitMetricFaasNetIo);
314246
}
315247

316-
#ifdef OPENTELEMETRY_LATER
317-
// Unsupported: Async histogram
318-
static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncInt64MetricFaasNetIo(
319-
metrics::Meter *meter)
320-
{
321-
return meter->CreateInt64ObservableHistogram(kMetricFaasNetIo, descrMetricFaasNetIo,
322-
unitMetricFaasNetIo);
323-
}
324-
325-
static inline nostd::shared_ptr<metrics::ObservableInstrument> CreateAsyncDoubleMetricFaasNetIo(
326-
metrics::Meter *meter)
327-
{
328-
return meter->CreateDoubleObservableHistogram(kMetricFaasNetIo, descrMetricFaasNetIo,
329-
unitMetricFaasNetIo);
330-
}
331-
#endif /* OPENTELEMETRY_LATER */
332-
333248
/**
334249
* Number of invocation timeouts
335250
* <p>

0 commit comments

Comments
 (0)