Skip to content

Commit c000f9d

Browse files
committed
Removing Histograms and ALL, reverting metric name
1 parent e49ae71 commit c000f9d

File tree

3 files changed

+9
-27
lines changed

3 files changed

+9
-27
lines changed

cmd/telemetrygen/internal/metrics/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ func (c *Config) Flags(fs *pflag.FlagSet) {
2222
c.MetricType = metricTypeGauge
2323

2424
c.CommonFlags(fs)
25-
fs.Var(&c.MetricType, "metric-type", "Metric type enum. must be one of 'gauge', 'sum', 'histogram' or 'all'")
25+
fs.Var(&c.MetricType, "metric-type", "Metric type enum. must be one of 'Gauge' or 'Sum'")
2626
fs.IntVar(&c.NumMetrics, "metrics", 1, "Number of metrics to generate in each worker (ignored if duration is provided)")
2727
}

cmd/telemetrygen/internal/metrics/metrics_types.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ import (
77
type metricType string
88

99
const (
10-
metricTypeAll metricType = "all"
11-
metricTypeGauge metricType = "gauge"
12-
metricTypeHistogram metricType = "histogram"
13-
metricTypeSum metricType = "sum"
10+
metricTypeGauge = "Gauge"
11+
metricTypeSum = "Sum"
1412
)
1513

1614
// String is used both by fmt.Print and by Cobra in help text
@@ -21,11 +19,11 @@ func (e *metricType) String() string {
2119
// Set must have pointer receiver so it doesn't change the value of a copy
2220
func (e *metricType) Set(v string) error {
2321
switch v {
24-
case "gauge", "sum", "histogram", "all":
22+
case "Gauge", "Sum":
2523
*e = metricType(v)
2624
return nil
2725
default:
28-
return errors.New(`must be one of "gauge", "sum", "histogram" or "all"`)
26+
return errors.New(`must be one of "Gauge" or "Sum"`)
2927
}
3028
}
3129

cmd/telemetrygen/internal/metrics/worker.go

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ func (w worker) simulateMetrics(res *resource.Resource, exporter sdkmetric.Expor
3333
var i int64
3434
for w.running.Load() {
3535
var metrics []metricdata.Metrics
36-
if w.metricType == metricTypeGauge || w.metricType == metricTypeAll {
36+
if w.metricType == metricTypeGauge {
3737
metrics = append(metrics, metricdata.Metrics{
38-
Name: "gen.metric.gauge",
38+
Name: "gen",
3939
Data: metricdata.Gauge[int64]{
4040
DataPoints: []metricdata.DataPoint[int64]{
4141
{
@@ -45,9 +45,9 @@ func (w worker) simulateMetrics(res *resource.Resource, exporter sdkmetric.Expor
4545
},
4646
},
4747
})
48-
} else if w.metricType == metricTypeSum || w.metricType == metricTypeAll {
48+
} else if w.metricType == metricTypeSum {
4949
metrics = append(metrics, metricdata.Metrics{
50-
Name: "gen.metric.sum",
50+
Name: "gen",
5151
Data: metricdata.Sum[int64]{
5252
IsMonotonic: true,
5353
Temporality: metricdata.DeltaTemporality,
@@ -60,22 +60,6 @@ func (w worker) simulateMetrics(res *resource.Resource, exporter sdkmetric.Expor
6060
},
6161
},
6262
})
63-
} else if w.metricType == metricTypeHistogram || w.metricType == metricTypeAll {
64-
value := 24.42
65-
metrics = append(metrics, metricdata.Metrics{
66-
Name: "gen.metric.histogram",
67-
Data: metricdata.Histogram[float64]{
68-
Temporality: metricdata.CumulativeTemporality,
69-
DataPoints: []metricdata.HistogramDataPoint[float64]{
70-
{
71-
Sum: float64(float32(value)),
72-
Max: metricdata.NewExtrema(float64(float32(value))),
73-
Min: metricdata.NewExtrema(float64(float32(value))),
74-
Count: 1,
75-
},
76-
},
77-
},
78-
})
7963
} else {
8064
w.logger.Fatal("unknown metric type")
8165
}

0 commit comments

Comments
 (0)