shardingjdbc.opentracing.tracer.class => shardingsphere.opentracing.tracer.class (e1a72ad5) · Commits · SUMMER2020 / students / proj-2004142

sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTracer.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -47,9 +47,8 @@ public final class ShardingTracer {
		}
		ConfigurationLoader configuration = new ConfigurationLoader();
		String tracerClassName = configuration.getTracerClassName();
		int sampleNumPM = configuration.getSampleNumPM();
		try {
		init((Tracer) Class.forName(tracerClassName).newInstance(), sampleNumPM);
		init((Tracer) Class.forName(tracerClassName).newInstance());
		} catch (final InstantiationException \| IllegalAccessException \| ClassNotFoundException ex) {
		throw new ShardingException("Parse tracer class name", ex);
		}
		@@ -61,16 +60,6 @@ public final class ShardingTracer {
		* @param tracer that is delegated
		*/
		public static void init(final Tracer tracer) {
		init(tracer, 0);
		}

		/**
		* Initialize tracer from another one.
		*
		* @param tracer that is delegated
		* @param samplingRatePerMinute sampling rate per minute
		*/
		public static void init(final Tracer tracer, final int samplingRatePerMinute) {
		if (GlobalTracer.isRegistered()) {
		return;
		}

+4 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@

		package io.shardingsphere.opentracing.config;

		import com.google.common.base.Optional;
		import com.google.common.base.Preconditions;
		import lombok.Getter;

		@@ -30,12 +29,12 @@ import lombok.Getter;
		@Getter
		public final class ConfigurationLoader {

		private static final String OPENTRACING_TRACER_CLASS_NAME = "shardingsphere.opentracing.tracer.class";

		private final String tracerClassName;

		public ConfigurationLoader() {
		ConfigurationParser configurationParser = new OpentracingConfigurationParser();
		Optional<String> tracerClass = configurationParser.parse("tracer.class");
		Preconditions.checkState(tracerClass.isPresent(), "Can not find opentracing tracer implementation class.");
		this.tracerClassName = tracerClass.get();
		tracerClassName = System.getProperty(OPENTRACING_TRACER_CLASS_NAME);
		Preconditions.checkNotNull(tracerClassName, "Can not find opentracing tracer implementation class.");
		}
		}

deleted100644 → 0

+0 −36

Original line number	Diff line number	Diff line
		/*
		* Copyright 2016-2018 shardingsphere.io.
		* <p>
		* 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.
		* </p>
		*/

		package io.shardingsphere.opentracing.config;

		import com.google.common.base.Optional;

		/**
		* Parse config from java opts.
		*
		* @author gaohongtao
		* @author wangkai
		*/
		public final class OpentracingConfigurationParser implements ConfigurationParser {

		private static final String PREFIX = "shardingjdbc.opentracing";

		@Override
		public Optional<String> parse(final String configItem) {
		return Optional.fromNullable(System.getProperty(PREFIX + "." + configItem));
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,7 @@ public final class ExecuteEventListenerTest {

		@BeforeClass
		public static void init() {
		ShardingTracer.init(TRACER, 40);
		ShardingTracer.init(TRACER);
		}

		@AfterClass

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public final class MergeEventListenerTest {

		@BeforeClass
		public static void init() {
		ShardingTracer.init(TRACER, 40);
		ShardingTracer.init(TRACER);
		}

		@AfterClass