Skip to content

Commit bdef3df

Browse files
committed
cleanup
1 parent 4304b40 commit bdef3df

File tree

4 files changed

+105
-3
lines changed

4 files changed

+105
-3
lines changed

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,11 +424,14 @@ CreateAsyncDoubleMetricDbClientConnectionWaitTime(metrics::Meter *meter)
424424
OPENTELEMETRY_DEPRECATED
425425
static constexpr const char *kMetricDbClientConnectionsCreateTimeDeprecated =
426426
"metric.db.client.connections.create_time.deprecated";
427+
OPENTELEMETRY_DEPRECATED
427428
static constexpr const char *descrMetricDbClientConnectionsCreateTimeDeprecated =
428429
"Deprecated, use `db.client.connection.create_time` instead. Note: the unit also changed from "
429430
"`ms` to `s`.";
431+
OPENTELEMETRY_DEPRECATED
430432
static constexpr const char *unitMetricDbClientConnectionsCreateTimeDeprecated = "ms";
431433

434+
OPENTELEMETRY_DEPRECATED
432435
static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
433436
CreateSyncInt64MetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *meter)
434437
{
@@ -437,6 +440,7 @@ CreateSyncInt64MetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *met
437440
unitMetricDbClientConnectionsCreateTimeDeprecated);
438441
}
439442

443+
OPENTELEMETRY_DEPRECATED
440444
static inline nostd::unique_ptr<metrics::Histogram<double>>
441445
CreateSyncDoubleMetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *meter)
442446
{
@@ -447,6 +451,7 @@ CreateSyncDoubleMetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *me
447451

448452
#ifdef OPENTELEMETRY_LATER
449453
// Unsupported: Async histogram
454+
OPENTELEMETRY_DEPRECATED
450455
static inline nostd::shared_ptr<metrics::ObservableInstrument>
451456
CreateAsyncInt64MetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *meter)
452457
{
@@ -455,6 +460,7 @@ CreateAsyncInt64MetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *me
455460
unitMetricDbClientConnectionsCreateTimeDeprecated);
456461
}
457462

463+
OPENTELEMETRY_DEPRECATED
458464
static inline nostd::shared_ptr<metrics::ObservableInstrument>
459465
CreateAsyncDoubleMetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *meter)
460466
{
@@ -475,10 +481,13 @@ CreateAsyncDoubleMetricDbClientConnectionsCreateTimeDeprecated(metrics::Meter *m
475481
OPENTELEMETRY_DEPRECATED
476482
static constexpr const char *kMetricDbClientConnectionsIdleMaxDeprecated =
477483
"metric.db.client.connections.idle.max.deprecated";
484+
OPENTELEMETRY_DEPRECATED
478485
static constexpr const char *descrMetricDbClientConnectionsIdleMaxDeprecated =
479486
"Deprecated, use `db.client.connection.idle.max` instead.";
487+
OPENTELEMETRY_DEPRECATED
480488
static constexpr const char *unitMetricDbClientConnectionsIdleMaxDeprecated = "{connection}";
481489

490+
OPENTELEMETRY_DEPRECATED
482491
static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
483492
CreateSyncInt64MetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter)
484493
{
@@ -487,6 +496,7 @@ CreateSyncInt64MetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter)
487496
unitMetricDbClientConnectionsIdleMaxDeprecated);
488497
}
489498

499+
OPENTELEMETRY_DEPRECATED
490500
static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
491501
CreateSyncDoubleMetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter)
492502
{
@@ -495,6 +505,7 @@ CreateSyncDoubleMetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter
495505
unitMetricDbClientConnectionsIdleMaxDeprecated);
496506
}
497507

508+
OPENTELEMETRY_DEPRECATED
498509
static inline nostd::shared_ptr<metrics::ObservableInstrument>
499510
CreateAsyncInt64MetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter)
500511
{
@@ -503,6 +514,7 @@ CreateAsyncInt64MetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter
503514
unitMetricDbClientConnectionsIdleMaxDeprecated);
504515
}
505516

517+
OPENTELEMETRY_DEPRECATED
506518
static inline nostd::shared_ptr<metrics::ObservableInstrument>
507519
CreateAsyncDoubleMetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *meter)
508520
{
@@ -522,10 +534,13 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMaxDeprecated(metrics::Meter *mete
522534
OPENTELEMETRY_DEPRECATED
523535
static constexpr const char *kMetricDbClientConnectionsIdleMinDeprecated =
524536
"metric.db.client.connections.idle.min.deprecated";
537+
OPENTELEMETRY_DEPRECATED
525538
static constexpr const char *descrMetricDbClientConnectionsIdleMinDeprecated =
526539
"Deprecated, use `db.client.connection.idle.min` instead.";
540+
OPENTELEMETRY_DEPRECATED
527541
static constexpr const char *unitMetricDbClientConnectionsIdleMinDeprecated = "{connection}";
528542

543+
OPENTELEMETRY_DEPRECATED
529544
static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
530545
CreateSyncInt64MetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter)
531546
{
@@ -534,6 +549,7 @@ CreateSyncInt64MetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter)
534549
unitMetricDbClientConnectionsIdleMinDeprecated);
535550
}
536551

552+
OPENTELEMETRY_DEPRECATED
537553
static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
538554
CreateSyncDoubleMetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter)
539555
{
@@ -542,6 +558,7 @@ CreateSyncDoubleMetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter
542558
unitMetricDbClientConnectionsIdleMinDeprecated);
543559
}
544560

561+
OPENTELEMETRY_DEPRECATED
545562
static inline nostd::shared_ptr<metrics::ObservableInstrument>
546563
CreateAsyncInt64MetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter)
547564
{
@@ -550,6 +567,7 @@ CreateAsyncInt64MetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter
550567
unitMetricDbClientConnectionsIdleMinDeprecated);
551568
}
552569

570+
OPENTELEMETRY_DEPRECATED
553571
static inline nostd::shared_ptr<metrics::ObservableInstrument>
554572
CreateAsyncDoubleMetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *meter)
555573
{
@@ -569,10 +587,13 @@ CreateAsyncDoubleMetricDbClientConnectionsIdleMinDeprecated(metrics::Meter *mete
569587
OPENTELEMETRY_DEPRECATED
570588
static constexpr const char *kMetricDbClientConnectionsMaxDeprecated =
571589
"metric.db.client.connections.max.deprecated";
590+
OPENTELEMETRY_DEPRECATED
572591
static constexpr const char *descrMetricDbClientConnectionsMaxDeprecated =
573592
"Deprecated, use `db.client.connection.max` instead.";
593+
OPENTELEMETRY_DEPRECATED
574594
static constexpr const char *unitMetricDbClientConnectionsMaxDeprecated = "{connection}";
575595

596+
OPENTELEMETRY_DEPRECATED
576597
static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
577598
CreateSyncInt64MetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
578599
{
@@ -581,6 +602,7 @@ CreateSyncInt64MetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
581602
unitMetricDbClientConnectionsMaxDeprecated);
582603
}
583604

605+
OPENTELEMETRY_DEPRECATED
584606
static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
585607
CreateSyncDoubleMetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
586608
{
@@ -589,6 +611,7 @@ CreateSyncDoubleMetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
589611
unitMetricDbClientConnectionsMaxDeprecated);
590612
}
591613

614+
OPENTELEMETRY_DEPRECATED
592615
static inline nostd::shared_ptr<metrics::ObservableInstrument>
593616
CreateAsyncInt64MetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
594617
{
@@ -597,6 +620,7 @@ CreateAsyncInt64MetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
597620
unitMetricDbClientConnectionsMaxDeprecated);
598621
}
599622

623+
OPENTELEMETRY_DEPRECATED
600624
static inline nostd::shared_ptr<metrics::ObservableInstrument>
601625
CreateAsyncDoubleMetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
602626
{
@@ -616,10 +640,13 @@ CreateAsyncDoubleMetricDbClientConnectionsMaxDeprecated(metrics::Meter *meter)
616640
OPENTELEMETRY_DEPRECATED
617641
static constexpr const char *kMetricDbClientConnectionsPendingRequestsDeprecated =
618642
"metric.db.client.connections.pending_requests.deprecated";
643+
OPENTELEMETRY_DEPRECATED
619644
static constexpr const char *descrMetricDbClientConnectionsPendingRequestsDeprecated =
620645
"Deprecated, use `db.client.connection.pending_requests` instead.";
646+
OPENTELEMETRY_DEPRECATED
621647
static constexpr const char *unitMetricDbClientConnectionsPendingRequestsDeprecated = "{request}";
622648

649+
OPENTELEMETRY_DEPRECATED
623650
static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
624651
CreateSyncInt64MetricDbClientConnectionsPendingRequestsDeprecated(metrics::Meter *meter)
625652
{
@@ -628,6 +655,7 @@ CreateSyncInt64MetricDbClientConnectionsPendingRequestsDeprecated(metrics::Meter
628655
unitMetricDbClientConnectionsPendingRequestsDeprecated);
629656
}
630657

658+
OPENTELEMETRY_DEPRECATED
631659
static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
632660
CreateSyncDoubleMetricDbClientConnectionsPendingRequestsDeprecated(metrics::Meter *meter)
633661
{
@@ -636,6 +664,7 @@ CreateSyncDoubleMetricDbClientConnectionsPendingRequestsDeprecated(metrics::Mete
636664
unitMetricDbClientConnectionsPendingRequestsDeprecated);
637665
}
638666

667+
OPENTELEMETRY_DEPRECATED
639668
static inline nostd::shared_ptr<metrics::ObservableInstrument>
640669
CreateAsyncInt64MetricDbClientConnectionsPendingRequestsDeprecated(metrics::Meter *meter)
641670
{
@@ -645,6 +674,7 @@ CreateAsyncInt64MetricDbClientConnectionsPendingRequestsDeprecated(metrics::Mete
645674
unitMetricDbClientConnectionsPendingRequestsDeprecated);
646675
}
647676

677+
OPENTELEMETRY_DEPRECATED
648678
static inline nostd::shared_ptr<metrics::ObservableInstrument>
649679
CreateAsyncDoubleMetricDbClientConnectionsPendingRequestsDeprecated(metrics::Meter *meter)
650680
{
@@ -665,10 +695,13 @@ CreateAsyncDoubleMetricDbClientConnectionsPendingRequestsDeprecated(metrics::Met
665695
OPENTELEMETRY_DEPRECATED
666696
static constexpr const char *kMetricDbClientConnectionsTimeoutsDeprecated =
667697
"metric.db.client.connections.timeouts.deprecated";
698+
OPENTELEMETRY_DEPRECATED
668699
static constexpr const char *descrMetricDbClientConnectionsTimeoutsDeprecated =
669700
"Deprecated, use `db.client.connection.timeouts` instead.";
701+
OPENTELEMETRY_DEPRECATED
670702
static constexpr const char *unitMetricDbClientConnectionsTimeoutsDeprecated = "{timeout}";
671703

704+
OPENTELEMETRY_DEPRECATED
672705
static inline nostd::unique_ptr<metrics::Counter<uint64_t>>
673706
CreateSyncInt64MetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *meter)
674707
{
@@ -677,6 +710,7 @@ CreateSyncInt64MetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *meter
677710
unitMetricDbClientConnectionsTimeoutsDeprecated);
678711
}
679712

713+
OPENTELEMETRY_DEPRECATED
680714
static inline nostd::unique_ptr<metrics::Counter<double>>
681715
CreateSyncDoubleMetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *meter)
682716
{
@@ -685,6 +719,7 @@ CreateSyncDoubleMetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *mete
685719
unitMetricDbClientConnectionsTimeoutsDeprecated);
686720
}
687721

722+
OPENTELEMETRY_DEPRECATED
688723
static inline nostd::shared_ptr<metrics::ObservableInstrument>
689724
CreateAsyncInt64MetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *meter)
690725
{
@@ -693,6 +728,7 @@ CreateAsyncInt64MetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *mete
693728
unitMetricDbClientConnectionsTimeoutsDeprecated);
694729
}
695730

731+
OPENTELEMETRY_DEPRECATED
696732
static inline nostd::shared_ptr<metrics::ObservableInstrument>
697733
CreateAsyncDoubleMetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *meter)
698734
{
@@ -712,10 +748,13 @@ CreateAsyncDoubleMetricDbClientConnectionsTimeoutsDeprecated(metrics::Meter *met
712748
OPENTELEMETRY_DEPRECATED
713749
static constexpr const char *kMetricDbClientConnectionsCountDeprecated =
714750
"metric.db.client.connections.count.deprecated";
751+
OPENTELEMETRY_DEPRECATED
715752
static constexpr const char *descrMetricDbClientConnectionsCountDeprecated =
716753
"Deprecated, use `db.client.connection.count` instead.";
754+
OPENTELEMETRY_DEPRECATED
717755
static constexpr const char *unitMetricDbClientConnectionsCountDeprecated = "{connection}";
718756

757+
OPENTELEMETRY_DEPRECATED
719758
static inline nostd::unique_ptr<metrics::UpDownCounter<int64_t>>
720759
CreateSyncInt64MetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
721760
{
@@ -724,6 +763,7 @@ CreateSyncInt64MetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
724763
unitMetricDbClientConnectionsCountDeprecated);
725764
}
726765

766+
OPENTELEMETRY_DEPRECATED
727767
static inline nostd::unique_ptr<metrics::UpDownCounter<double>>
728768
CreateSyncDoubleMetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
729769
{
@@ -732,6 +772,7 @@ CreateSyncDoubleMetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
732772
unitMetricDbClientConnectionsCountDeprecated);
733773
}
734774

775+
OPENTELEMETRY_DEPRECATED
735776
static inline nostd::shared_ptr<metrics::ObservableInstrument>
736777
CreateAsyncInt64MetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
737778
{
@@ -740,6 +781,7 @@ CreateAsyncInt64MetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
740781
unitMetricDbClientConnectionsCountDeprecated);
741782
}
742783

784+
OPENTELEMETRY_DEPRECATED
743785
static inline nostd::shared_ptr<metrics::ObservableInstrument>
744786
CreateAsyncDoubleMetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
745787
{
@@ -758,11 +800,14 @@ CreateAsyncDoubleMetricDbClientConnectionsCountDeprecated(metrics::Meter *meter)
758800
OPENTELEMETRY_DEPRECATED
759801
static constexpr const char *kMetricDbClientConnectionsUseTimeDeprecated =
760802
"metric.db.client.connections.use_time.deprecated";
803+
OPENTELEMETRY_DEPRECATED
761804
static constexpr const char *descrMetricDbClientConnectionsUseTimeDeprecated =
762805
"Deprecated, use `db.client.connection.use_time` instead. Note: the unit also changed from "
763806
"`ms` to `s`.";
807+
OPENTELEMETRY_DEPRECATED
764808
static constexpr const char *unitMetricDbClientConnectionsUseTimeDeprecated = "ms";
765809

810+
OPENTELEMETRY_DEPRECATED
766811
static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
767812
CreateSyncInt64MetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
768813
{
@@ -771,6 +816,7 @@ CreateSyncInt64MetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
771816
unitMetricDbClientConnectionsUseTimeDeprecated);
772817
}
773818

819+
OPENTELEMETRY_DEPRECATED
774820
static inline nostd::unique_ptr<metrics::Histogram<double>>
775821
CreateSyncDoubleMetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
776822
{
@@ -781,6 +827,7 @@ CreateSyncDoubleMetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter
781827

782828
#ifdef OPENTELEMETRY_LATER
783829
// Unsupported: Async histogram
830+
OPENTELEMETRY_DEPRECATED
784831
static inline nostd::shared_ptr<metrics::ObservableInstrument>
785832
CreateAsyncInt64MetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
786833
{
@@ -789,6 +836,7 @@ CreateAsyncInt64MetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter
789836
unitMetricDbClientConnectionsUseTimeDeprecated);
790837
}
791838

839+
OPENTELEMETRY_DEPRECATED
792840
static inline nostd::shared_ptr<metrics::ObservableInstrument>
793841
CreateAsyncDoubleMetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *meter)
794842
{
@@ -808,11 +856,14 @@ CreateAsyncDoubleMetricDbClientConnectionsUseTimeDeprecated(metrics::Meter *mete
808856
OPENTELEMETRY_DEPRECATED
809857
static constexpr const char *kMetricDbClientConnectionsWaitTimeDeprecated =
810858
"metric.db.client.connections.wait_time.deprecated";
859+
OPENTELEMETRY_DEPRECATED
811860
static constexpr const char *descrMetricDbClientConnectionsWaitTimeDeprecated =
812861
"Deprecated, use `db.client.connection.wait_time` instead. Note: the unit also changed from "
813862
"`ms` to `s`.";
863+
OPENTELEMETRY_DEPRECATED
814864
static constexpr const char *unitMetricDbClientConnectionsWaitTimeDeprecated = "ms";
815865

866+
OPENTELEMETRY_DEPRECATED
816867
static inline nostd::unique_ptr<metrics::Histogram<uint64_t>>
817868
CreateSyncInt64MetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter)
818869
{
@@ -821,6 +872,7 @@ CreateSyncInt64MetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter
821872
unitMetricDbClientConnectionsWaitTimeDeprecated);
822873
}
823874

875+
OPENTELEMETRY_DEPRECATED
824876
static inline nostd::unique_ptr<metrics::Histogram<double>>
825877
CreateSyncDoubleMetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter)
826878
{
@@ -831,6 +883,7 @@ CreateSyncDoubleMetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *mete
831883

832884
#ifdef OPENTELEMETRY_LATER
833885
// Unsupported: Async histogram
886+
OPENTELEMETRY_DEPRECATED
834887
static inline nostd::shared_ptr<metrics::ObservableInstrument>
835888
CreateAsyncInt64MetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter)
836889
{
@@ -839,6 +892,7 @@ CreateAsyncInt64MetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *mete
839892
unitMetricDbClientConnectionsWaitTimeDeprecated);
840893
}
841894

895+
OPENTELEMETRY_DEPRECATED
842896
static inline nostd::shared_ptr<metrics::ObservableInstrument>
843897
CreateAsyncDoubleMetricDbClientConnectionsWaitTimeDeprecated(metrics::Meter *meter)
844898
{

0 commit comments

Comments
 (0)