Skip to content

Commit 8ecf228

Browse files
kaisechengkaisecheng
committed
Merge branch 'ottl_murmurhash3_func' of github.com:kaisecheng/opentelemetry-collector-contrib into ottl_murmurhash3_func
2 parents f606b35 + fe7c1a8 commit 8ecf228

File tree

21 files changed

+341
-116
lines changed

21 files changed

+341
-116
lines changed

‎cmd/githubgen/codeowners.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"sort"
1111
"strings"
1212

13-
"github.com/google/go-github/v62/github"
13+
"github.com/google/go-github/v63/github"
1414
)
1515

1616
const allowlistHeader = `# Code generated by githubgen. DO NOT EDIT.

‎cmd/githubgen/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/githubgen
33
go 1.21.0
44

55
require (
6-
github.com/google/go-github/v62 v62.0.0
6+
github.com/google/go-github/v63 v63.0.0
77
go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe
88
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.105.1-0.20240717163034-43ed6184f9fe
99
gopkg.in/yaml.v3 v3.0.1

‎cmd/githubgen/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/deltatocumulativeprocessor/README.md

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,5 @@ There is no further configuration required. All delta samples are converted to c
3636

3737
## Troubleshooting
3838

39-
The following metrics are recorded when [telemetry is
40-
enabled](https://opentelemetry.io/docs/collector/configuration/#telemetry):
41-
42-
| Name | Description | Unit |
43-
|------------------------------------------|---------------------------------------------------------------------------------------|---------------|
44-
| `deltatocumulative.streams.tracked` | Number of streams currently tracked by the aggregation state | `{stream}` |
45-
| `deltatocumulative.streams.limit` | Upper limit of tracked streams | `{stream}` |
46-
| `deltatocumulative.streams.evicted` | Number of streams removed from tracking to ingest newer streams | `{stream}` |
47-
| `deltatocumulative.streams.max_stale` | Duration without new samples after which streams are dropped | `second` |
48-
| `deltatocumulative.datapoints.processed` | Total number of datapoints processed, whether successful or not | `{datapoint}` |
49-
| `deltatocumulative.datapoints.dropped` | Faulty datapoints that were dropped due to the reason given in the `reason` attribute | `{datapoint}` |
50-
| `deltatocumulative.gaps.length` | Total length of all gaps in the streams, which occur e.g. due to lost in transit | `second` |
39+
When [Telemetry is
40+
enabled](https://opentelemetry.io/docs/collector/configuration/#telemetry), this component exports [several metrics](./documentation.md).

‎processor/deltatocumulativeprocessor/documentation.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
[comment]: <> (Code generated by mdatagen. DO NOT EDIT.)
2+
3+
# deltatocumulative
4+
5+
## Internal Telemetry
6+
7+
The following telemetry is emitted by this component.
8+
9+
### otelcol_deltatocumulative.datapoints.dropped
10+
11+
number of datapoints dropped due to given 'reason'
12+
13+
| Unit | Metric Type | Value Type | Monotonic |
14+
| ---- | ----------- | ---------- | --------- |
15+
| {datapoint} | Sum | Int | true |
16+
17+
### otelcol_deltatocumulative.datapoints.processed
18+
19+
number of datapoints processed
20+
21+
| Unit | Metric Type | Value Type | Monotonic |
22+
| ---- | ----------- | ---------- | --------- |
23+
| {datapoint} | Sum | Int | true |
24+
25+
### otelcol_deltatocumulative.gaps.length
26+
27+
total duration where data was expected but not received
28+
29+
| Unit | Metric Type | Value Type | Monotonic |
30+
| ---- | ----------- | ---------- | --------- |
31+
| s | Sum | Int | true |
32+
33+
### otelcol_deltatocumulative.streams.evicted
34+
35+
number of streams evicted
36+
37+
| Unit | Metric Type | Value Type | Monotonic |
38+
| ---- | ----------- | ---------- | --------- |
39+
| {stream} | Sum | Int | true |
40+
41+
### otelcol_deltatocumulative.streams.limit
42+
43+
upper limit of tracked streams
44+
45+
| Unit | Metric Type | Value Type |
46+
| ---- | ----------- | ---------- |
47+
| {stream} | Gauge | Int |
48+
49+
### otelcol_deltatocumulative.streams.max_stale
50+
51+
duration after which streams inactive streams are dropped
52+
53+
| Unit | Metric Type | Value Type |
54+
| ---- | ----------- | ---------- |
55+
| s | Gauge | Int |
56+
57+
### otelcol_deltatocumulative.streams.tracked
58+
59+
number of streams tracked
60+
61+
| Unit | Metric Type | Value Type | Monotonic |
62+
| ---- | ----------- | ---------- | --------- |
63+
| {dps} | Sum | Int | false |

‎processor/deltatocumulativeprocessor/factory.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ func createMetricsProcessor(_ context.Context, set processor.Settings, cfg compo
2828
return nil, fmt.Errorf("configuration parsing error")
2929
}
3030

31-
meter := metadata.Meter(set.TelemetrySettings)
32-
return newProcessor(pcfg, set.Logger, meter, next), nil
31+
telb, err := metadata.NewTelemetryBuilder(set.TelemetrySettings)
32+
if err != nil {
33+
return nil, err
34+
}
35+
36+
return newProcessor(pcfg, set.Logger, telb, next), nil
3337
}

‎processor/deltatocumulativeprocessor/generated_component_telemetry_test.go

Lines changed: 76 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/deltatocumulativeprocessor/go.mod

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ require (
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.105.0
88
github.com/stretchr/testify v1.9.0
99
go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe
10+
go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe
1011
go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe
1112
go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe
1213
go.opentelemetry.io/collector/pdata v1.12.1-0.20240716231837-5753a58f712b
1314
go.opentelemetry.io/collector/processor v0.105.1-0.20240717163034-43ed6184f9fe
1415
go.opentelemetry.io/otel v1.28.0
1516
go.opentelemetry.io/otel/metric v1.28.0
17+
go.opentelemetry.io/otel/sdk/metric v1.28.0
1618
go.opentelemetry.io/otel/trace v1.28.0
1719
go.uber.org/goleak v1.3.0
1820
go.uber.org/zap v1.27.0
@@ -43,15 +45,12 @@ require (
4345
github.com/prometheus/client_model v0.6.1 // indirect
4446
github.com/prometheus/common v0.55.0 // indirect
4547
github.com/prometheus/procfs v0.15.1 // indirect
46-
go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe // indirect
47-
go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe // indirect
4848
go.opentelemetry.io/collector/featuregate v1.12.1-0.20240716231837-5753a58f712b // indirect
4949
go.opentelemetry.io/collector/internal/globalgates v0.105.1-0.20240717163034-43ed6184f9fe // indirect
5050
go.opentelemetry.io/collector/pdata/pprofile v0.105.1-0.20240717163034-43ed6184f9fe // indirect
5151
go.opentelemetry.io/collector/pdata/testdata v0.105.1-0.20240717163034-43ed6184f9fe // indirect
5252
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
5353
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
54-
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
5554
go.uber.org/multierr v1.11.0 // indirect
5655
golang.org/x/net v0.26.0 // indirect
5756
golang.org/x/sys v0.21.0 // indirect

‎processor/deltatocumulativeprocessor/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎processor/deltatocumulativeprocessor/internal/metadata/generated_telemetry.go

Lines changed: 88 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)