From 18d74daf347e45055374d53aee932bd00a11cba3 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 19 Mar 2020 14:08:55 -0700 Subject: [PATCH] Remove unused code (#252) --- .../jul/JavaUtilLoggingSpans.java | 5 ---- .../log4j/v1_1/Log4jSpans.java | 5 ---- .../log4j/v2_0/Log4jSpans.java | 5 ---- .../instrumentation/logback/LogbackSpans.java | 6 ----- .../src/test/java/NoOpInstrumentation.java | 27 ------------------- 5 files changed, 48 deletions(-) delete mode 100644 instrumentation/mongo/mongo-common/src/test/java/NoOpInstrumentation.java diff --git a/instrumentation/java-util-logging/src/main/java/io/opentelemetry/auto/instrumentation/jul/JavaUtilLoggingSpans.java b/instrumentation/java-util-logging/src/main/java/io/opentelemetry/auto/instrumentation/jul/JavaUtilLoggingSpans.java index d9f8fb227f..3f73091d6e 100644 --- a/instrumentation/java-util-logging/src/main/java/io/opentelemetry/auto/instrumentation/jul/JavaUtilLoggingSpans.java +++ b/instrumentation/java-util-logging/src/main/java/io/opentelemetry/auto/instrumentation/jul/JavaUtilLoggingSpans.java @@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.jul; import io.opentelemetry.OpenTelemetry; import io.opentelemetry.auto.config.Config; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Tracer; import java.io.PrintWriter; @@ -58,10 +57,6 @@ public class JavaUtilLoggingSpans { span.end(); } - private static AttributeValue newAttributeValue(final String stringValue) { - return AttributeValue.stringAttributeValue(stringValue); - } - private static String toString(final Throwable t) { final StringWriter out = new StringWriter(); t.printStackTrace(new PrintWriter(out)); diff --git a/instrumentation/log4j/log4j-1.1/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v1_1/Log4jSpans.java b/instrumentation/log4j/log4j-1.1/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v1_1/Log4jSpans.java index cb6020f70d..0f16204e0d 100644 --- a/instrumentation/log4j/log4j-1.1/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v1_1/Log4jSpans.java +++ b/instrumentation/log4j/log4j-1.1/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v1_1/Log4jSpans.java @@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.log4j.v1_1; import io.opentelemetry.OpenTelemetry; import io.opentelemetry.auto.config.Config; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Tracer; import java.io.PrintWriter; @@ -60,10 +59,6 @@ public class Log4jSpans { span.end(); } - private static AttributeValue newAttributeValue(final String stringValue) { - return AttributeValue.stringAttributeValue(stringValue); - } - private static String toString(final Throwable t) { final StringWriter out = new StringWriter(); t.printStackTrace(new PrintWriter(out)); diff --git a/instrumentation/log4j/log4j-2.0/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v2_0/Log4jSpans.java b/instrumentation/log4j/log4j-2.0/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v2_0/Log4jSpans.java index 312b9f694c..ac443659ca 100644 --- a/instrumentation/log4j/log4j-2.0/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v2_0/Log4jSpans.java +++ b/instrumentation/log4j/log4j-2.0/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v2_0/Log4jSpans.java @@ -17,7 +17,6 @@ package io.opentelemetry.auto.instrumentation.log4j.v2_0; import io.opentelemetry.OpenTelemetry; import io.opentelemetry.auto.config.Config; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Tracer; import java.io.PrintWriter; @@ -50,10 +49,6 @@ public class Log4jSpans { span.end(); } - private static AttributeValue newAttributeValue(final String stringValue) { - return AttributeValue.stringAttributeValue(stringValue); - } - private static String toString(final Throwable t) { final StringWriter out = new StringWriter(); t.printStackTrace(new PrintWriter(out)); diff --git a/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java b/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java index e32a49a38f..7334790f4a 100644 --- a/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java +++ b/instrumentation/logback-1.0/src/main/java/io/opentelemetry/auto/instrumentation/logback/LogbackSpans.java @@ -20,7 +20,6 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.ThrowableProxy; import io.opentelemetry.OpenTelemetry; import io.opentelemetry.auto.config.Config; -import io.opentelemetry.trace.AttributeValue; import io.opentelemetry.trace.Span; import io.opentelemetry.trace.Tracer; import java.io.PrintWriter; @@ -40,7 +39,6 @@ public class LogbackSpans { // this needs to be configurable return; } - final Span currentSpan = TRACER.getCurrentSpan(); final Object throwableProxy = event.getThrowableProxy(); Throwable t = null; @@ -60,10 +58,6 @@ public class LogbackSpans { span.end(); } - private static AttributeValue newAttributeValue(final String stringValue) { - return AttributeValue.stringAttributeValue(stringValue); - } - private static String toString(final Throwable t) { final StringWriter out = new StringWriter(); t.printStackTrace(new PrintWriter(out)); diff --git a/instrumentation/mongo/mongo-common/src/test/java/NoOpInstrumentation.java b/instrumentation/mongo/mongo-common/src/test/java/NoOpInstrumentation.java deleted file mode 100644 index c4f35a181e..0000000000 --- a/instrumentation/mongo/mongo-common/src/test/java/NoOpInstrumentation.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ -import com.google.auto.service.AutoService; -import io.opentelemetry.auto.tooling.Instrumenter; -import net.bytebuddy.agent.builder.AgentBuilder; - -@AutoService(Instrumenter.class) -public class NoOpInstrumentation implements Instrumenter { - - @Override - public AgentBuilder instrument(final AgentBuilder agentBuilder) { - return agentBuilder; - } -}