Added virtual memory scraper to hostmetrics receiver #989
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| // Copyright 2020, 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. | ||
|
|
||
| package virtualmemoryscraper | ||
|
|
||
| import "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" | ||
|
|
||
| // Config relating to VirtualMemory Metric Scraper. | ||
| type Config struct { | ||
| internal.ConfigSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright 2020, 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. | ||
|
|
||
| package virtualmemoryscraper | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "go.uber.org/zap" | ||
|
|
||
| "go.opentelemetry.io/collector/receiver/hostmetricsreceiver/internal" | ||
| ) | ||
|
|
||
| // This file implements Factory for VirtualMemory scraper. | ||
|
|
||
| const ( | ||
| // The value of "type" key in configuration. | ||
| TypeStr = "virtualmemory" | ||
| ) | ||
|
|
||
| // Factory is the Factory for scraper. | ||
| type Factory struct { | ||
| } | ||
|
|
||
| // CreateDefaultConfig creates the default configuration for the Scraper. | ||
| func (f *Factory) CreateDefaultConfig() internal.Config { | ||
| return &Config{} | ||
| } | ||
|
|
||
| // CreateMetricsScraper creates a scraper based on provided config. | ||
| func (f *Factory) CreateMetricsScraper( | ||
| ctx context.Context, | ||
| logger *zap.Logger, | ||
| config internal.Config, | ||
| ) (internal.Scraper, error) { | ||
| cfg := config.(*Config) | ||
| return newVirtualMemoryScraper(ctx, cfg), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // Copyright 2020, 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. | ||
|
|
||
| package virtualmemoryscraper | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| func TestCreateDefaultConfig(t *testing.T) { | ||
| factory := &Factory{} | ||
| cfg := factory.CreateDefaultConfig() | ||
| assert.IsType(t, &Config{}, cfg) | ||
| } | ||
|
|
||
| func TestCreateMetricsScraper(t *testing.T) { | ||
| factory := &Factory{} | ||
| cfg := &Config{} | ||
|
|
||
| scraper, err := factory.CreateMetricsScraper(context.Background(), zap.NewNop(), cfg) | ||
| assert.NoError(t, err) | ||
| assert.NotNil(t, scraper) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| // Copyright 2020, 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. | ||
|
|
||
| // +build windows | ||
|
|
||
| package virtualmemoryscraper | ||
|
|
||
| import ( | ||
| "syscall" | ||
| "unsafe" | ||
|
|
||
| "golang.org/x/sys/windows" | ||
| ) | ||
|
|
||
| var ( | ||
| modPsapi = windows.NewLazySystemDLL("psapi.dll") | ||
| procEnumPageFilesW = modPsapi.NewProc("EnumPageFilesW") | ||
| ) | ||
|
There was a problem hiding this comment. Ideally everything in this file will get upstreamed to |
||
|
|
||
| type pageFileData struct { | ||
| name string | ||
| used uint64 | ||
| total uint64 | ||
| } | ||
|
|
||
| // system type as defined in https://docs.microsoft.com/en-us/windows/win32/api/psapi/ns-psapi-enum_page_file_information | ||
| type enumPageFileInformation struct { | ||
| cb uint32 | ||
| reserved uint32 | ||
| totalSize uint64 | ||
| totalInUse uint64 | ||
| peakUsage uint64 | ||
| } | ||
|
|
||
| func getPageFileStatsInternal() ([]*pageFileData, error) { | ||
| // the following system call invokes the supplied callback function once for each page file before returning | ||
| // see https://docs.microsoft.com/en-us/windows/win32/api/psapi/nf-psapi-enumpagefilesw | ||
| var pageFiles []*pageFileData | ||
| result, _, _ := procEnumPageFilesW.Call(windows.NewCallback(pEnumPageFileCallbackW), uintptr(unsafe.Pointer(&pageFiles))) | ||
| if result == 0 { | ||
| return nil, windows.GetLastError() | ||
| } | ||
|
|
||
| return pageFiles, nil | ||
| } | ||
|
|
||
| // system callback as defined in https://docs.microsoft.com/en-us/windows/win32/api/psapi/nc-psapi-penum_page_file_callbackw | ||
| func pEnumPageFileCallbackW(pageFiles *[]*pageFileData, enumPageFileInfo *enumPageFileInformation, lpFilenamePtr *[syscall.MAX_LONG_PATH]uint16) *bool { | ||
| pageFileName := syscall.UTF16ToString((*lpFilenamePtr)[:]) | ||
|
|
||
| pfData := &pageFileData{ | ||
| name: pageFileName, | ||
| used: enumPageFileInfo.totalInUse, | ||
| total: enumPageFileInfo.totalSize, | ||
| } | ||
|
|
||
| *pageFiles = append(*pageFiles, pfData) | ||
|
|
||
| // return true to continue enumerating page files | ||
| ret := true | ||
| return &ret | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In the future better to send changes unrelated to the main PR separately.