From 824a366a22120aad1954f8d20ff62ddeff04da72 Mon Sep 17 00:00:00 2001 From: Kevin Parsons Date: Wed, 19 Dec 2018 01:52:09 -0800 Subject: [PATCH] Make etw package internal --- {pkg => internal}/etw/etw.go | 0 {pkg => internal}/etw/event.go | 0 {pkg => internal}/etw/eventdata.go | 0 {pkg => internal}/etw/eventmetadata.go | 0 {pkg => internal}/etw/provider.go | 0 {pkg => internal}/etw/sample/sample.go | 0 {pkg => internal}/etw/zsyscall_windows.go | 0 pkg/etwlogrus/hook.go | 4 ++-- 8 files changed, 2 insertions(+), 2 deletions(-) rename {pkg => internal}/etw/etw.go (100%) rename {pkg => internal}/etw/event.go (100%) rename {pkg => internal}/etw/eventdata.go (100%) rename {pkg => internal}/etw/eventmetadata.go (100%) rename {pkg => internal}/etw/provider.go (100%) rename {pkg => internal}/etw/sample/sample.go (100%) rename {pkg => internal}/etw/zsyscall_windows.go (100%) diff --git a/pkg/etw/etw.go b/internal/etw/etw.go similarity index 100% rename from pkg/etw/etw.go rename to internal/etw/etw.go diff --git a/pkg/etw/event.go b/internal/etw/event.go similarity index 100% rename from pkg/etw/event.go rename to internal/etw/event.go diff --git a/pkg/etw/eventdata.go b/internal/etw/eventdata.go similarity index 100% rename from pkg/etw/eventdata.go rename to internal/etw/eventdata.go diff --git a/pkg/etw/eventmetadata.go b/internal/etw/eventmetadata.go similarity index 100% rename from pkg/etw/eventmetadata.go rename to internal/etw/eventmetadata.go diff --git a/pkg/etw/provider.go b/internal/etw/provider.go similarity index 100% rename from pkg/etw/provider.go rename to internal/etw/provider.go diff --git a/pkg/etw/sample/sample.go b/internal/etw/sample/sample.go similarity index 100% rename from pkg/etw/sample/sample.go rename to internal/etw/sample/sample.go diff --git a/pkg/etw/zsyscall_windows.go b/internal/etw/zsyscall_windows.go similarity index 100% rename from pkg/etw/zsyscall_windows.go rename to internal/etw/zsyscall_windows.go diff --git a/pkg/etwlogrus/hook.go b/pkg/etwlogrus/hook.go index 6037388..e64abf7 100644 --- a/pkg/etwlogrus/hook.go +++ b/pkg/etwlogrus/hook.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - "github.com/Microsoft/go-winio/pkg/etw" + "github.com/Microsoft/go-winio/internal/etw" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" @@ -45,7 +45,7 @@ func (h *Hook) Levels() []logrus.Level { // Fire receives each Logrus entry as it is logged, and logs it to ETW. func (h *Hook) Fire(e *logrus.Entry) error { if !h.provider.IsEnabledForLevel(etw.Level(e.Level)) { - return + return nil } descriptor := etw.NewEventDescriptor()