Point-fix pulling in opentelemetry collector w/ host metrics fix. (open-telemetry#48)

* Point-fix pulling in opentelemetry collector w/ host metrics fix.

* Update to 0.29 release.

Author: jsuereth

cmd/otelopscol/main.go

@@ -41,14 +41,14 @@ func main() {
 		Version:     version.Version,
 	}
 
-	params := service.AppSettings{Factories: factories, BuildInfo: info}
+	params := service.CollectorSettings{Factories: factories, BuildInfo: info}
 
 	if err := run(params); err != nil {
 		log.Fatal(err)
 	}
 }
 
-func runInteractive(params service.AppSettings) error {
+func runInteractive(params service.CollectorSettings) error {
 	app, err := service.New(params)
 	if err != nil {
 		return fmt.Errorf("failed to construct the application: %w", err)

cmd/otelopscol/main_others.go

@@ -18,6 +18,6 @@ package main
 
 import "go.opentelemetry.io/collector/service"
 
-func run(params service.AppSettings) error {
+func run(params service.CollectorSettings) error {
 	return runInteractive(params)
 }

cmd/otelopscol/main_windows.go

@@ -23,7 +23,7 @@ import (
 	"golang.org/x/sys/windows/svc"
 )
 
-func run(params service.AppSettings) error {
+func run(params service.CollectorSettings) error {
 	isInteractive, err := svc.IsAnInteractiveSession()
 	if err != nil {
 		return fmt.Errorf("failed to determine if we are running in an interactive session: %w", err)
@@ -35,7 +35,7 @@ func run(params service.AppSettings) error {
 	return runService(params)
 }
 
-func runService(params service.AppSettings) error {
+func runService(params service.CollectorSettings) error {
 	// do not need to supply service name when startup is invoked through Service Control Manager directly
 	if err := svc.Run("", service.NewWindowsService(params)); err != nil {
 		return fmt.Errorf("failed to start service: %w", err)

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.28.0
 	github.com/shirou/gopsutil v3.21.5+incompatible
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.28.0
+	go.opentelemetry.io/collector v0.29.0
 	go.uber.org/zap v1.17.0
-	golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
+	golang.org/x/sys v0.0.0-20210611083646-a4fc73990273
 )