Fix file formatting (#256)

This commit is contained in:
Trask Stalnaker 2020-03-19 18:57:05 -07:00 committed by GitHub
parent d70f4ded94
commit bdf2b8eafd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 271 additions and 291 deletions

View File

@ -18,23 +18,6 @@ package io.opentelemetry.auto.bootstrap.instrumentation.decorator
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.Tags
/*
* 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 io.opentelemetry.trace.Span
import static io.opentelemetry.auto.test.utils.ConfigUtils.withConfigOverride

View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
import io.opentelemetry.auto.bootstrap.AgentClassLoader
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.bootstrap.instrumentation.decorator.HttpClientDecorator
import io.opentelemetry.auto.config.Config
import io.opentelemetry.auto.instrumentation.api.MoreTags
import io.opentelemetry.auto.instrumentation.api.SpanTypes
import io.opentelemetry.auto.instrumentation.api.Tags

View File

@ -3,12 +3,12 @@
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_OUT">
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n" />
<PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
</Console>
</Appenders>
<Loggers>
<Root level="warn">
<AppenderRef ref="Console" />
<AppenderRef ref="Console"/>
</Root>
</Loggers>
</Configuration>

View File

@ -46,10 +46,7 @@ public class TracingClientResponseSubscriber implements CoreSubscriber<ClientRes
this.clientRequest = clientRequest;
this.context = context;
spanRef = new AtomicReference<>(span);
this.parentSpan =
parentSpan == null
? DefaultSpan.getInvalid()
: parentSpan;
this.parentSpan = parentSpan == null ? DefaultSpan.getInvalid() : parentSpan;
}
@Override