Skip to content

Commit

Permalink
[chore] migrate metrics to mdatagen (#33514)
Browse files Browse the repository at this point in the history
Added metadata.yaml file to allow for generation of internal metrics.
Note the stability section of that file are not used anywhere, but
mdatagen requires it.

---------

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
codeboten committed Jun 19, 2024
1 parent 1442641 commit d065d41
Show file tree
Hide file tree
Showing 14 changed files with 288 additions and 43 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ body:
- pkg/resourcetotelemetry
- pkg/sampling
- pkg/stanza
- pkg/stanza/fileconsumer
- pkg/translator/azure
- pkg/translator/jaeger
- pkg/translator/loki
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ body:
- pkg/resourcetotelemetry
- pkg/sampling
- pkg/stanza
- pkg/stanza/fileconsumer
- pkg/translator/azure
- pkg/translator/jaeger
- pkg/translator/loki
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ body:
- pkg/resourcetotelemetry
- pkg/sampling
- pkg/stanza
- pkg/stanza/fileconsumer
- pkg/translator/azure
- pkg/translator/jaeger
- pkg/translator/loki
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/unmaintained.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ body:
- pkg/resourcetotelemetry
- pkg/sampling
- pkg/stanza
- pkg/stanza/fileconsumer
- pkg/translator/azure
- pkg/translator/jaeger
- pkg/translator/loki
Expand Down
39 changes: 12 additions & 27 deletions pkg/stanza/fileconsumer/config.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

//go:generate mdatagen metadata.yaml

package fileconsumer // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer"

import (
Expand All @@ -12,7 +14,6 @@ import (

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/otel/metric"
"go.uber.org/zap"
"golang.org/x/text/encoding"

Expand All @@ -21,6 +22,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/emit"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/header"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/reader"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/scanner"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/tracker"
Expand All @@ -35,8 +37,6 @@ const (
defaultMaxConcurrentFiles = 1024
defaultEncoding = "utf-8"
defaultPollInterval = 200 * time.Millisecond
openFilesMetric = "fileconsumer/open_files"
readingFilesMetric = "fileconsumer/reading_files"
)

var allowFileDeletion = featuregate.GlobalRegistry().MustRegister(
Expand Down Expand Up @@ -179,34 +179,19 @@ func (c Config) Build(set component.TelemetrySettings, emit emit.Callback, opts
t = tracker.NewFileTracker(set, c.MaxConcurrentFiles/2)
}

meter := set.MeterProvider.Meter("otelcol/fileconsumer")

openFiles, err := meter.Int64UpDownCounter(
openFilesMetric,
metric.WithDescription("Number of open files"),
metric.WithUnit("1"),
)
if err != nil {
return nil, err
}
readingFiles, err := meter.Int64UpDownCounter(
readingFilesMetric,
metric.WithDescription("Number of open files that are being read"),
metric.WithUnit("1"),
)
telemetryBuilder, err := metadata.NewTelemetryBuilder(set)
if err != nil {
return nil, err
}
return &Manager{
set: set,
readerFactory: readerFactory,
fileMatcher: fileMatcher,
pollInterval: c.PollInterval,
maxBatchFiles: c.MaxConcurrentFiles / 2,
maxBatches: c.MaxBatches,
tracker: t,
openFiles: openFiles,
readingFiles: readingFiles,
set: set,
readerFactory: readerFactory,
fileMatcher: fileMatcher,
pollInterval: c.PollInterval,
maxBatchFiles: c.MaxConcurrentFiles / 2,
maxBatches: c.MaxBatches,
tracker: t,
telemetryBuilder: telemetryBuilder,
}, nil
}

Expand Down
23 changes: 23 additions & 0 deletions pkg/stanza/fileconsumer/documentation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[comment]: <> (Code generated by mdatagen. DO NOT EDIT.)

# fileconsumer

## Internal Telemetry

The following telemetry is emitted by this component.

### fileconsumer_open_files

Number of open files

| Unit | Metric Type | Value Type | Monotonic |
| ---- | ----------- | ---------- | --------- |
| 1 | Sum | Int | false |

### fileconsumer_reading_files

Number of open files that are being read

| Unit | Metric Type | Value Type | Monotonic |
| ---- | ----------- | ---------- | --------- |
| 1 | Sum | Int | false |
17 changes: 8 additions & 9 deletions pkg/stanza/fileconsumer/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"time"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/otel/metric"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/checkpoint"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/metadata"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/reader"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/tracker"
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher"
Expand All @@ -36,8 +36,7 @@ type Manager struct {
maxBatches int
maxBatchFiles int

openFiles metric.Int64UpDownCounter
readingFiles metric.Int64UpDownCounter
telemetryBuilder *metadata.TelemetryBuilder
}

func (m *Manager) Start(persister operator.Persister) error {
Expand Down Expand Up @@ -74,7 +73,7 @@ func (m *Manager) Stop() error {
m.cancel = nil
}
m.wg.Wait()
m.openFiles.Add(context.TODO(), int64(0-m.tracker.ClosePreviousFiles()))
m.telemetryBuilder.FileconsumerOpenFiles.Add(context.TODO(), int64(0-m.tracker.ClosePreviousFiles()))
if m.persister != nil {
if err := checkpoint.Save(context.Background(), m.persister, m.tracker.GetMetadata()); err != nil {
m.set.Logger.Error("save offsets", zap.Error(err))
Expand Down Expand Up @@ -157,14 +156,14 @@ func (m *Manager) consume(ctx context.Context, paths []string) {
wg.Add(1)
go func(r *reader.Reader) {
defer wg.Done()
m.readingFiles.Add(ctx, 1)
m.telemetryBuilder.FileconsumerReadingFiles.Add(ctx, 1)
r.ReadToEnd(ctx)
m.readingFiles.Add(ctx, -1)
m.telemetryBuilder.FileconsumerReadingFiles.Add(ctx, -1)
}(r)
}
wg.Wait()

m.openFiles.Add(ctx, int64(0-m.tracker.EndConsume()))
m.telemetryBuilder.FileconsumerOpenFiles.Add(ctx, int64(0-m.tracker.EndConsume()))
}

func (m *Manager) makeFingerprint(path string) (*fingerprint.Fingerprint, *os.File) {
Expand Down Expand Up @@ -249,7 +248,7 @@ func (m *Manager) newReader(ctx context.Context, file *os.File, fp *fingerprint.
if err != nil {
return nil, err
}
m.openFiles.Add(ctx, 1)
m.telemetryBuilder.FileconsumerOpenFiles.Add(ctx, 1)
return r, nil
}

Expand All @@ -259,6 +258,6 @@ func (m *Manager) newReader(ctx context.Context, file *os.File, fp *fingerprint.
if err != nil {
return nil, err
}
m.openFiles.Add(ctx, 1)
m.telemetryBuilder.FileconsumerOpenFiles.Add(ctx, 1)
return r, nil
}
4 changes: 2 additions & 2 deletions pkg/stanza/fileconsumer/file_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ OUTER:
m.set.Logger.Debug("Reading lost file", zap.String("path", lostReader.GetFileName()))
go func(r *reader.Reader) {
defer lostWG.Done()
m.readingFiles.Add(ctx, 1)
m.telemetryBuilder.FileconsumerReadingFiles.Add(ctx, 1)
r.ReadToEnd(ctx)
m.readingFiles.Add(ctx, -1)
m.telemetryBuilder.FileconsumerReadingFiles.Add(ctx, -1)
}(lostReader)
}
lostWG.Wait()
Expand Down
64 changes: 64 additions & 0 deletions pkg/stanza/fileconsumer/generated_component_telemetry_test.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 69 additions & 0 deletions pkg/stanza/fileconsumer/internal/metadata/generated_telemetry.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit d065d41

Please sign in to comment.