Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[receiver/iis] Do not pass metrics details to pkg/winperfcounters #9789

Merged
merged 1 commit into from
May 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/winperfcounters/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ type Watcher struct {
MetricRep
}

// NewWatcher creates new PerfCounterWatcher by provided parts of its path.
func NewWatcher(object, instance, counterName string) (PerfCounterWatcher, error) {
path := counterPath(object, instance, counterName)
counter, err := pdh.NewPerfCounter(path, true)
if err != nil {
return nil, fmt.Errorf("failed to create perf counter with path %v: %w", path, err)
}
return Watcher{Counter: counter}, nil
}

func (w Watcher) Path() string {
return w.Counter.Path()
}
Expand Down
211 changes: 0 additions & 211 deletions receiver/iisreceiver/config_generator.go

This file was deleted.

48 changes: 0 additions & 48 deletions receiver/iisreceiver/internal/metadata/recorder.go

This file was deleted.

114 changes: 114 additions & 0 deletions receiver/iisreceiver/recorder.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
// Copyright The OpenTelemetry Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//go:build windows
// +build windows

package iisreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver"

import (
"go.opentelemetry.io/collector/pdata/pcommon"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/iisreceiver/internal/metadata"
)

type recordFunc = func(*metadata.MetricsBuilder, pcommon.Timestamp, float64)

type perfCounterRecorderConf struct {
object string
instance string
recorders map[string]recordFunc
}

var perfCounterRecorders = []perfCounterRecorderConf{
{
object: "Web Service",
instance: "_Total",
recorders: map[string]recordFunc{
"Current Connections": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisConnectionActiveDataPoint(ts, int64(val))
},
"Total Bytes Received": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisNetworkIoDataPoint(ts, int64(val), metadata.AttributeDirectionReceived)
},
"Total Bytes Sent": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisNetworkIoDataPoint(ts, int64(val), metadata.AttributeDirectionSent)
},
"Total Connection Attempts (all instances)": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp,
val float64) {
mb.RecordIisConnectionAttemptCountDataPoint(ts, int64(val))
},
"Total Delete Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestDelete)
},
"Total Get Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestGet)
},
"Total Head Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestHead)
},
"Total Options Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestOptions)
},
"Total Post Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestPost)
},
"Total Put Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestPut)
},
"Total Trace Requests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestCountDataPoint(ts, int64(val), metadata.AttributeRequestTrace)
},
"Total Files Received": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisNetworkFileCountDataPoint(ts, int64(val), metadata.AttributeDirectionReceived)
},
"Total Files Sent": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisNetworkFileCountDataPoint(ts, int64(val), metadata.AttributeDirectionSent)
},
"Total Anonymous Users": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisConnectionAnonymousDataPoint(ts, int64(val))
},
"Total blocked bandwidth bytes.": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisNetworkBlockedDataPoint(ts, int64(val))
},
"Service Uptime": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisUptimeDataPoint(ts, int64(val))
},
},
},
{
object: "HTTP Service Request Queues",
instance: "*",
recorders: map[string]recordFunc{
"RejectedRequests": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestRejectedDataPoint(ts, int64(val))
},
"CurrentQueueSize": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestQueueCountDataPoint(ts, int64(val))
},
"MaxQueueItemAge": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisRequestQueueAgeMaxDataPoint(ts, int64(val))
},
},
},
{
object: "Process",
instance: "_Total",
recorders: map[string]recordFunc{
"Thread Count": func(mb *metadata.MetricsBuilder, ts pcommon.Timestamp, val float64) {
mb.RecordIisThreadActiveDataPoint(ts, int64(val))
},
},
},
}
Loading