SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed OTel (#1802)

Browse Source
This commit is contained in:
Marcin Grzejszczak
2020-12-10 22:19:57 +01:00
committed by GitHub
parent 89433dc4d7
commit 4c3d12e639
188 changed files with 57 additions and 10838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/SampleTests.java
View File

@@ -99,7 +99,6 @@ public class SampleTests {
protected String[] runArgs() {
List<String> strings = new ArrayList<>();
strings.addAll(Arrays.asList("--spring.jmx.enabled=false",
"--spring.autoconfigure.exclude=org.springframework.cloud.sleuth.otel.autoconfig.TraceOtelAutoConfiguration",
"--spring.application.name=defaultTraceContextForStream" + instrumentation.name()));
strings.addAll(instrumentation.entires.stream().map(s -> "--" + s).collect(Collectors.toList()));
return strings.toArray(new String[0]);

17
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/TracerImplementation.java
View File

@@ -16,24 +16,9 @@
package org.springframework.cloud.sleuth.benchmarks.jmh;
import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
import org.springframework.cloud.sleuth.autoconfig.otel.OtelAutoConfiguration;
public enum TracerImplementation {
otel(BraveAutoConfiguration.class.getCanonicalName()), brave(OtelAutoConfiguration.class.getCanonicalName());
private String key = "spring.autoconfigure.exclude";
private String value;
TracerImplementation(String value) {
this.value = value;
}
public String property() {
return "--" + this.key + "=" + this.value;
}
brave;
@Override
public String toString() {

5
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/bridge/BridgeTests.java
View File

@@ -38,7 +38,6 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.Tracer;
import org.springframework.cloud.sleuth.autoconfig.brave.BraveAutoConfiguration;
import org.springframework.cloud.sleuth.autoconfig.otel.OtelAutoConfiguration;
import org.springframework.cloud.sleuth.benchmarks.jmh.TracerImplementation;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Configuration;
@@ -106,7 +105,7 @@ public class BridgeTests {
public void setup() {
SpringApplication application = new SpringApplication(TestConfiguration.class);
application.setWebApplicationType(WebApplicationType.NONE);
this.withSleuth = application.run("--spring.jmx.enabled=false", this.tracerImplementation.property(),
this.withSleuth = application.run("--spring.jmx.enabled=false",
"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
this.tracer = this.withSleuth.getBean(Tracer.class);
this.parent = this.tracer.nextSpan().name("name").start();
@@ -119,7 +118,7 @@ public class BridgeTests {
}
@Configuration(proxyBeanMethods = false)
@ImportAutoConfiguration({ BraveAutoConfiguration.class, OtelAutoConfiguration.class })
@ImportAutoConfiguration(BraveAutoConfiguration.class)
static class TestConfiguration {
}

2
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/AnnotationBenchmarksTests.java
View File

@@ -72,7 +72,7 @@ public class AnnotationBenchmarksTests {
@Setup
public void setup() {
this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
this.tracerImplementation.property(),
"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
this.sleuth = this.withSleuth.getBean(SleuthBenchmarkingSpringApp.class);
}

2
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/AsyncBenchmarksTests.java
View File

@@ -76,7 +76,7 @@ public class AsyncBenchmarksTests {
@Setup
public void setup() {
this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
this.tracerImplementation.property(),
"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
this.withoutSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run(
"--spring.jmx.enabled=false", "--spring.application.name=withoutSleuth",

2
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/HttpFilterBenchmarksTests.java
View File

@@ -139,7 +139,7 @@ public class HttpFilterBenchmarksTests {
@Setup
public void setup() {
this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
this.tracerImplementation.property(),
"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
this.tracingFilter = this.withSleuth.getBean(TracingFilter.class);
this.mockMvcForTracedController = MockMvcBuilders

2
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java
View File

@@ -88,7 +88,7 @@ public class RestTemplateBenchmarkTests {
@Setup
public void setup() {
this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
this.tracerImplementation.property(),
"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
this.mockMvc = MockMvcBuilders.standaloneSetup(this.withSleuth.getBean(SleuthBenchmarkingSpringApp.class))
.build();

2
benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/stream/MicroBenchmarkStreamTests.java
View File

@@ -107,7 +107,7 @@ public class MicroBenchmarkStreamTests {
protected String[] runArgs() {
List<String> strings = new ArrayList<>();
strings.addAll(Arrays.asList("--spring.jmx.enabled=false", this.tracerImplementation.property(),
strings.addAll(Arrays.asList("--spring.jmx.enabled=false",
"--spring.application.name=defaultTraceContextForStream" + instrumentation.name() + "_"
+ tracerImplementation.name()));
strings.addAll(instrumentation.entires.stream().map(s -> "--" + s).collect(Collectors.toList()));