From 38e662129d99c06d9ba85455b2145ebbc24f6d7f Mon Sep 17 00:00:00 2001 From: yabuchan Date: Fri, 8 Jul 2022 10:23:17 +0900 Subject: [PATCH] remove warning from golinter --- trace/opentelemetry/opentelemetry.go | 8 ++------ trace/opentelemetry/opentelemetry_test.go | 14 +++++++------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/trace/opentelemetry/opentelemetry.go b/trace/opentelemetry/opentelemetry.go index 4bb911e3d..f8a8e1c49 100644 --- a/trace/opentelemetry/opentelemetry.go +++ b/trace/opentelemetry/opentelemetry.go @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package openTelemetry implements a github.com/virtual-kubelet/virtual-kubelet/trace.Tracer +// Package opentelemetry implements a github.com/virtual-kubelet/virtual-kubelet/trace.Tracer // using openTelemetry as a backend. // // Use this by setting `trace.T = Adapter{}` // // For customizing trace provider used in Adapter, set trace provider by -//`otel.SetTracerProvider(*sdktrace.TracerProvider)`. Examples of customize are setting service name, +// `otel.SetTracerProvider(*sdktrace.TracerProvider)`. Examples of customize are setting service name, // use your own exporter (e.g. jaeger, otlp, prometheus, zipkin, and stdout) etc. Do not forget // to call TracerProvider.Shutdown() when you create your TracerProvider to avoid memory leak. package opentelemetry @@ -48,10 +48,6 @@ const ( lFatal logLevel = "FATAL" ) -func (l logLevel) string() string { - return string(l) -} - // Adapter implements the trace.Tracer interface for openTelemetry type Adapter struct{} diff --git a/trace/opentelemetry/opentelemetry_test.go b/trace/opentelemetry/opentelemetry_test.go index 6f75b5ff4..452025798 100644 --- a/trace/opentelemetry/opentelemetry_test.go +++ b/trace/opentelemetry/opentelemetry_test.go @@ -42,7 +42,7 @@ func TestStartSpan(t *testing.T) { defer cancel() a := Adapter{} - ctx, s := a.StartSpan(ctx, "name") + _, s := a.StartSpan(ctx, "name") s.End() }) } @@ -182,7 +182,7 @@ func TestWithFields(t *testing.T) { l := log.G(ctx).WithField("method", tt.spanName) s := &span{s: ots, l: l} - ctx = s.WithFields(ctx, tt.fields) + _ = s.WithFields(ctx, tt.fields) s.End() assert.Assert(t, len(e.attributes) == len(tt.expectedAttributes)) @@ -254,7 +254,7 @@ func TestLog(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - ctx, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) + _, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) fl := &fakeLogger{} l := logger{s: s, l: fl, a: make([]attribute.KeyValue, 0)} switch tt.logLevel { @@ -366,7 +366,7 @@ func TestLogf(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - ctx, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) + _, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) fl := &fakeLogger{} l := logger{s: s, l: fl, a: make([]attribute.KeyValue, 0)} switch tt.logLevel { @@ -437,7 +437,7 @@ func TestLogWithField(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - ctx, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) + _, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) fl := &fakeLogger{} l := logger{s: s, l: fl, a: make([]attribute.KeyValue, 0)} @@ -485,7 +485,7 @@ func TestLogWithError(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - ctx, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) + _, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) fl := &fakeLogger{} l := logger{s: s, l: fl, a: make([]attribute.KeyValue, 0)} @@ -528,7 +528,7 @@ func TestLogWithFields(t *testing.T) { ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() - ctx, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) + _, s := otel.Tracer(tt.spanName).Start(ctx, tt.spanName) fl := &fakeLogger{} l := logger{s: s, l: fl, a: make([]attribute.KeyValue, 0)}