open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add spotless to standalone subprojects (#5058) 

* Update spotless version

* Add spotless to benchmark-overhead

* Add spotless to smoke-test images

* Add spotless to examples

* Apply spotless

* Resolve log4j conflict

* Apply spotless after upgrade
This commit is contained in:
Trask Stalnaker 2022-01-10 12:46:52 -08:00 committed by GitHub
parent c6fe6b8252
commit db8cd050a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
75 changed files with 387 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
benchmark-overhead/build.gradle.kts
View File

@ -1,5 +1,14 @@
plugins {
id("java")
id("com.diffplug.spotless") version "6.1.2"
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
repositories {

6
benchmark-overhead/src/test/java/io/opentelemetry/OverheadTests.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry;
import static org.junit.jupiter.api.Assertions.fail;
@ -41,7 +42,7 @@ public class OverheadTests {
private static final Network NETWORK = Network.newNetwork();
private static GenericContainer<?> collector;
private final NamingConventions namingConventions = new NamingConventions();
private final Map<String,Long> runDurations = new HashMap<>();
private final Map<String, Long> runDurations = new HashMap<>();
@BeforeAll
static void setUp() {
@ -71,7 +72,8 @@ public class OverheadTests {
fail("Unhandled exception in " + config.getName(), e);
}
});
List<AppPerfResults> results = new ResultsCollector(namingConventions.local, runDurations).collect(config);
List<AppPerfResults> results =
new ResultsCollector(namingConventions.local, runDurations).collect(config);
new MainResultsPersister(config).write(results);
}

5
benchmark-overhead/src/test/java/io/opentelemetry/agents/Agent.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.agents;
import java.net.MalformedURLException;

1
benchmark-overhead/src/test/java/io/opentelemetry/agents/AgentResolver.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.agents;
import java.net.URL;

1
benchmark-overhead/src/test/java/io/opentelemetry/agents/LatestAgentSnapshotResolver.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.agents;
import static org.joox.JOOX.$;

1
benchmark-overhead/src/test/java/io/opentelemetry/config/Configs.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.config;
import io.opentelemetry.agents.Agent;

1
benchmark-overhead/src/test/java/io/opentelemetry/config/TestConfig.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.config;
import io.opentelemetry.agents.Agent;

1
benchmark-overhead/src/test/java/io/opentelemetry/containers/CollectorContainer.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.containers;
import org.slf4j.Logger;

1
benchmark-overhead/src/test/java/io/opentelemetry/containers/K6Container.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.containers;
import io.opentelemetry.agents.Agent;

1
benchmark-overhead/src/test/java/io/opentelemetry/containers/PetClinicRestContainer.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.containers;
import io.opentelemetry.agents.Agent;

1
benchmark-overhead/src/test/java/io/opentelemetry/containers/PostgresContainer.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.containers;
import org.slf4j.Logger;

26
benchmark-overhead/src/test/java/io/opentelemetry/results/AppPerfResults.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import io.opentelemetry.agents.Agent;
@ -55,11 +56,11 @@ public class AppPerfResults {
return bytesToMegs(this.totalAllocated);
}
double getMinHeapUsedMB(){
double getMinHeapUsedMB() {
return bytesToMegs(this.heapUsed.min);
}
double getMaxHeapUsedMB(){
double getMaxHeapUsedMB() {
return bytesToMegs(this.heapUsed.max);
}
@ -70,6 +71,7 @@ public class AppPerfResults {
String getAgentName() {
return agent.getName();
}
static Builder builder() {
return new Builder();
}
@ -164,32 +166,32 @@ public class AppPerfResults {
return this;
}
Builder averageNetworkWrite(long averageNetworkWrite){
Builder averageNetworkWrite(long averageNetworkWrite) {
this.averageNetworkWrite = averageNetworkWrite;
return this;
}
Builder averageJvmUserCpu(float averageJvmUserCpu){
Builder averageJvmUserCpu(float averageJvmUserCpu) {
this.averageJvmUserCpu = averageJvmUserCpu;
return this;
}
Builder maxJvmUserCpu(float maxJvmUserCpu){
Builder maxJvmUserCpu(float maxJvmUserCpu) {
this.maxJvmUserCpu = maxJvmUserCpu;
return this;
}
Builder averageMachineCpuTotal(float averageMachineCpuTotal){
Builder averageMachineCpuTotal(float averageMachineCpuTotal) {
this.averageMachineCpuTotal = averageMachineCpuTotal;
return this;
}
Builder runDurationMs(long runDurationMs){
Builder runDurationMs(long runDurationMs) {
this.runDurationMs = runDurationMs;
return this;
}
Builder totalGcPauseNanos(long totalGcPauseNanos){
Builder totalGcPauseNanos(long totalGcPauseNanos) {
this.totalGcPauseNanos = totalGcPauseNanos;
return this;
}
@ -199,20 +201,20 @@ public class AppPerfResults {
public final long min;
public final long max;
public MinMax(){
public MinMax() {
this(Long.MAX_VALUE, Long.MIN_VALUE);
}
public MinMax(long min, long max){
public MinMax(long min, long max) {
this.min = min;
this.max = max;
}
public MinMax withMin(long min){
public MinMax withMin(long min) {
return new MinMax(min, max);
}
public MinMax withMax(long max){
public MinMax withMax(long max) {
return new MinMax(min, max);
}
}

1
benchmark-overhead/src/test/java/io/opentelemetry/results/ConsoleResultsPersister.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import java.util.List;

49
benchmark-overhead/src/test/java/io/opentelemetry/results/CsvPersister.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@ -18,30 +19,32 @@ import java.util.stream.Collectors;
class CsvPersister implements ResultsPersister {
// The fields as they are output, in order, but spread across agents
private final static List<FieldSpec> FIELDS = Arrays.asList(
FieldSpec.of("startupDurationMs", r -> r.startupDurationMs),
FieldSpec.of("minHeapUsed", r -> r.heapUsed.min),
FieldSpec.of("maxHeapUsed", r -> r.heapUsed.max),
FieldSpec.of("totalAllocatedMB", r -> r.getTotalAllocatedMB()),
FieldSpec.of("totalGCTime", r -> r.totalGCTime),
FieldSpec.of("maxThreadContextSwitchRate", r -> r.maxThreadContextSwitchRate),
FieldSpec.of("iterationAvg", r -> r.iterationAvg),
FieldSpec.of("iterationP95", r -> r.iterationP95),
FieldSpec.of("requestAvg", r -> r.requestAvg),
FieldSpec.of("requestP95", r -> r.requestP95),
FieldSpec.of("netReadAvg", r -> r.averageNetworkRead),
FieldSpec.of("netWriteAvg", r -> r.averageNetworkWrite),
FieldSpec.of("peakThreadCount", r -> r.peakThreadCount),
FieldSpec.of("averageCpuUser", r -> r.averageJvmUserCpu),
FieldSpec.of("maxCpuUser", r -> r.maxJvmUserCpu),
FieldSpec.of("averageMachineCpuTotal", r -> r.averageMachineCpuTotal),
FieldSpec.of("runDurationMs", r -> r.runDurationMs),
FieldSpec.of("gcPauseMs", r -> NANOSECONDS.toMillis(r.totalGcPauseNanos))
);
private static final List<FieldSpec> FIELDS =
Arrays.asList(
FieldSpec.of("startupDurationMs", r -> r.startupDurationMs),
FieldSpec.of("minHeapUsed", r -> r.heapUsed.min),
FieldSpec.of("maxHeapUsed", r -> r.heapUsed.max),
FieldSpec.of("totalAllocatedMB", r -> r.getTotalAllocatedMB()),
FieldSpec.of("totalGCTime", r -> r.totalGCTime),
FieldSpec.of("maxThreadContextSwitchRate", r -> r.maxThreadContextSwitchRate),
FieldSpec.of("iterationAvg", r -> r.iterationAvg),
FieldSpec.of("iterationP95", r -> r.iterationP95),
FieldSpec.of("requestAvg", r -> r.requestAvg),
FieldSpec.of("requestP95", r -> r.requestP95),
FieldSpec.of("netReadAvg", r -> r.averageNetworkRead),
FieldSpec.of("netWriteAvg", r -> r.averageNetworkWrite),
FieldSpec.of("peakThreadCount", r -> r.peakThreadCount),
FieldSpec.of("averageCpuUser", r -> r.averageJvmUserCpu),
FieldSpec.of("maxCpuUser", r -> r.maxJvmUserCpu),
FieldSpec.of("averageMachineCpuTotal", r -> r.averageMachineCpuTotal),
FieldSpec.of("runDurationMs", r -> r.runDurationMs),
FieldSpec.of("gcPauseMs", r -> NANOSECONDS.toMillis(r.totalGcPauseNanos)));
private final Path resultsFile;
public CsvPersister(Path resultsFile) {this.resultsFile = resultsFile;}
public CsvPersister(Path resultsFile) {
this.resultsFile = resultsFile;
}
@Override
public void write(List<AppPerfResults> results) {
@ -98,14 +101,14 @@ class CsvPersister implements ResultsPersister {
static class FieldSpec {
private final String name;
private final Function<AppPerfResults,Object> getter;
private final Function<AppPerfResults, Object> getter;
public FieldSpec(String name, Function<AppPerfResults, Object> getter) {
this.name = name;
this.getter = getter;
}
static FieldSpec of(String name, Function<AppPerfResults,Object> getter){
static FieldSpec of(String name, Function<AppPerfResults, Object> getter) {
return new FieldSpec(name, getter);
}
}

1
benchmark-overhead/src/test/java/io/opentelemetry/results/FileSummaryPersister.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import java.io.FileNotFoundException;

1
benchmark-overhead/src/test/java/io/opentelemetry/results/MainResultsPersister.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import io.opentelemetry.config.TestConfig;

38
benchmark-overhead/src/test/java/io/opentelemetry/results/PrintStreamPersister.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@ -17,7 +18,9 @@ class PrintStreamPersister implements ResultsPersister {
private final PrintStream out;
public PrintStreamPersister(PrintStream out) {this.out = out;}
public PrintStreamPersister(PrintStream out) {
this.out = out;
}
@Override
public void write(List<AppPerfResults> results) {
@ -25,14 +28,21 @@ class PrintStreamPersister implements ResultsPersister {
out.println("----------------------------------------------------------");
out.println(" Run at " + new Date());
out.printf(" %s : %s\n", config.getName(), config.getDescription());
out.printf(" %d users, %d iterations\n", config.getConcurrentConnections(), config.getTotalIterations());
out.printf(
" %d users, %d iterations\n",
config.getConcurrentConnections(), config.getTotalIterations());
out.println("----------------------------------------------------------");
display(results, "Agent", appPerfResults -> appPerfResults.agent.getName());
display(results, "Run duration", res -> {
Duration duration = Duration.ofMillis(res.runDurationMs);
return String.format("%02d:%02d:%02d", duration.toHours(), duration.toMinutesPart(), duration.toSecondsPart());
});
display(
results,
"Run duration",
res -> {
Duration duration = Duration.ofMillis(res.runDurationMs);
return String.format(
"%02d:%02d:%02d",
duration.toHours(), duration.toMinutesPart(), duration.toSecondsPart());
});
display(results, "Avg. CPU (user) %", res -> String.valueOf(res.averageJvmUserCpu));
display(results, "Max. CPU (user) %", res -> String.valueOf(res.maxJvmUserCpu));
display(results, "Avg. mch tot cpu %", res -> String.valueOf(res.averageMachineCpuTotal));
@ -42,7 +52,10 @@ class PrintStreamPersister implements ResultsPersister {
display(results, "Max heap used (MB)", res -> format(res.getMaxHeapUsedMB()));
display(results, "Thread switch rate", res -> String.valueOf(res.maxThreadContextSwitchRate));
display(results, "GC time (ms)", res -> String.valueOf(res.totalGCTime));
display(results, "GC pause time (ms)", res -> String.valueOf(NANOSECONDS.toMillis(res.totalGcPauseNanos)));
display(
results,
"GC pause time (ms)",
res -> String.valueOf(NANOSECONDS.toMillis(res.totalGcPauseNanos)));
display(results, "Req. mean (ms)", res -> format(res.requestAvg));
display(results, "Req. p95 (ms)", res -> format(res.requestP95));
display(results, "Iter. mean (ms)", res -> format(res.iterationAvg));
@ -52,16 +65,17 @@ class PrintStreamPersister implements ResultsPersister {
display(results, "Peak threads", res -> String.valueOf(res.peakThreadCount));
}
private void display(List<AppPerfResults> results, String pref, Function<AppPerfResults, String> vs) {
private void display(
List<AppPerfResults> results, String pref, Function<AppPerfResults, String> vs) {
out.printf("%-20s: ", pref);
results.forEach(result -> {
out.printf("%17s", vs.apply(result));
});
results.forEach(
result -> {
out.printf("%17s", vs.apply(result));
});
out.println();
}
private String format(double d) {
return String.format("%.2f", d);
}
}

12
benchmark-overhead/src/test/java/io/opentelemetry/results/ResultsCollector.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import com.jayway.jsonpath.JsonPath;
@ -27,7 +28,6 @@ public class ResultsCollector {
this.runDurations = runDurations;
}
public List<AppPerfResults> collect(TestConfig config) {
return config.getAgents().stream()
.map(a -> readAgentResults(a, config))
@ -36,10 +36,11 @@ public class ResultsCollector {
private AppPerfResults readAgentResults(Agent agent, TestConfig config) {
try {
AppPerfResults.Builder builder = AppPerfResults.builder()
.agent(agent)
.runDurationMs(runDurations.get(agent.getName()))
.config(config);
AppPerfResults.Builder builder =
AppPerfResults.builder()
.agent(agent)
.runDurationMs(runDurations.get(agent.getName()))
.config(config);
builder = addStartupTime(builder, agent);
builder = addK6Results(builder, agent);
@ -134,5 +135,4 @@ public class ResultsCollector {
private long computeTotalGcPauseNanos(Path jfrFile) throws IOException {
return JFRUtils.sumLongEventValues(jfrFile, "jdk.GCPhasePause", "duration");
}
}

1
benchmark-overhead/src/test/java/io/opentelemetry/results/ResultsPersister.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.results;
import java.util.List;

1
benchmark-overhead/src/test/java/io/opentelemetry/util/JFRUtils.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.util;
import io.opentelemetry.results.AppPerfResults.MinMax;

1
benchmark-overhead/src/test/java/io/opentelemetry/util/NamingConvention.java
View File

@ -2,6 +2,7 @@
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.util;
import io.opentelemetry.agents.Agent;

5
benchmark-overhead/src/test/java/io/opentelemetry/util/NamingConventions.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.util;
/** An container to hold both the local and container naming conventions. */

6
conventions/build.gradle.kts
View File

@ -1,7 +1,7 @@
plugins {
`kotlin-dsl`
// When updating, update below in dependencies too
id("com.diffplug.spotless") version "5.16.0"
id("com.diffplug.spotless") version "6.1.2"
}
spotless {
@ -35,10 +35,10 @@ dependencies {
implementation("org.apache.maven:maven-aether-provider:3.3.9")
// When updating, update above in plugins too
implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
implementation("com.diffplug.spotless:spotless-plugin-gradle:6.1.2")
implementation("com.google.guava:guava:31.0.1-jre")
implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
implementation("org.ow2.asm:asm:9.1")
implementation("org.ow2.asm:asm-tree:9.1")
implementation("org.apache.httpcomponents:httpclient:4.5.13")

20
examples/distro/build.gradle
View File

@ -1,10 +1,22 @@
group 'io.opentelemetry.example'
version '1.0-SNAPSHOT'
buildscript {
repositories {
maven {
url "https://plugins.gradle.org/m2/"
}
}
dependencies {
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.1.2"
}
}
subprojects {
version = rootProject.version
apply plugin: "java"
apply plugin: "com.diffplug.spotless"
ext {
versions = [
@ -35,6 +47,14 @@ subprojects {
}
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
testImplementation("org.mockito:mockito-core:3.3.3")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.6.2")

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoIdGenerator.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.sdk.trace.IdGenerator;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoPropagator.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.context.Context;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoPropagatorProvider.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.context.propagation.TextMapPropagator;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoPropertySource.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.javaagent.extension.config.ConfigPropertySource;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoResourceProvider.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.api.common.Attributes;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoSampler.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.api.common.Attributes;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoSdkTracerProviderConfigurer.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoSpanExporter.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.sdk.common.CompletableResultCode;

5
examples/distro/custom/src/main/java/com/example/javaagent/DemoSpanProcessor.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.context.Context;

5
examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3Instrumentation.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.instrumentation;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;

5
examples/distro/instrumentation/servlet-3/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.instrumentation;
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;

5
examples/distro/instrumentation/servlet-3/src/test/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationTest.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.instrumentation;
import static io.opentelemetry.sdk.testing.assertj.TracesAssert.assertThat;

5
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/OkHttpUtils.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.smoketest;
import java.util.concurrent.TimeUnit;

5
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.smoketest;
import com.fasterxml.jackson.core.JsonProcessingException;

5
examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SpringBootSmokeTest.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.smoketest;
import io.opentelemetry.api.trace.TraceId;

9
examples/extension/build.gradle
View File

@ -11,6 +11,7 @@ plugins {
See https://imperceptiblethoughts.com/shadow/ for more details about Shadow plugin.
*/
id "com.github.johnrengelman.shadow" version "6.1.0"
id "com.diffplug.spotless" version "6.1.2"
id "io.opentelemetry.instrumentation.muzzle-generation" version "1.10.0-alpha-SNAPSHOT"
id "io.opentelemetry.instrumentation.muzzle-check" version "1.10.0-alpha-SNAPSHOT"
@ -49,6 +50,14 @@ configurations {
otel
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
/*
Interfaces and SPIs that we implement. We use `compileOnly` dependency because during

5
examples/extension/src/main/java/com/example/javaagent/DemoIdGenerator.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.sdk.trace.IdGenerator;

5
examples/extension/src/main/java/com/example/javaagent/DemoIgnoredTypesConfigurer.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import com.google.auto.service.AutoService;

5
examples/extension/src/main/java/com/example/javaagent/DemoPropagator.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.context.Context;

5
examples/extension/src/main/java/com/example/javaagent/DemoPropagatorProvider.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import com.google.auto.service.AutoService;

5
examples/extension/src/main/java/com/example/javaagent/DemoPropertySource.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import com.google.auto.service.AutoService;

5
examples/extension/src/main/java/com/example/javaagent/DemoResourceProvider.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import com.google.auto.service.AutoService;

5
examples/extension/src/main/java/com/example/javaagent/DemoSampler.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.api.common.Attributes;

5
examples/extension/src/main/java/com/example/javaagent/DemoSdkTracerProviderConfigurer.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import com.google.auto.service.AutoService;

5
examples/extension/src/main/java/com/example/javaagent/DemoSpanExporter.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.sdk.common.CompletableResultCode;

5
examples/extension/src/main/java/com/example/javaagent/DemoSpanProcessor.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent;
import io.opentelemetry.context.Context;

5
examples/extension/src/main/java/com/example/javaagent/instrumentation/DemoServlet3Instrumentation.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.instrumentation;
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;

5
examples/extension/src/main/java/com/example/javaagent/instrumentation/DemoServlet3InstrumentationModule.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.instrumentation;
import static java.util.Collections.singletonList;

5
examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.smoketest;
import com.fasterxml.jackson.core.JsonProcessingException;

5
examples/extension/src/test/java/com/example/javaagent/smoketest/OkHttpUtils.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.smoketest;
import java.util.concurrent.TimeUnit;

5
examples/extension/src/test/java/com/example/javaagent/smoketest/SpringBootIntegrationTest.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package com.example.javaagent.smoketest;
import io.opentelemetry.api.trace.TraceId;

2
gradle-plugins/build.gradle.kts
View File

@ -34,7 +34,7 @@ dependencies {
implementation("org.eclipse.aether:aether-transport-http:1.1.0")
implementation("org.apache.maven:maven-aether-provider:3.3.9")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.1")
implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
testImplementation("org.assertj:assertj-core:3.21.0")

2
instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestAsyncWebServer.scala
View File

@ -31,7 +31,7 @@ object AkkaHttpTestAsyncWebServer {
def doCall(): HttpResponse = {
val resp = HttpResponse(status =
endpoint.getStatus
) //.withHeaders(headers.Type)resp.contentType = "text/plain"
) // .withHeaders(headers.Type)resp.contentType = "text/plain"
endpoint match {
case SUCCESS => resp.withEntity(endpoint.getBody)
case INDEXED_CHILD =>

2
instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/AkkaHttpTestWebServer.scala
View File

@ -27,7 +27,7 @@ object AkkaHttpTestWebServer {
)
}
val route = { //handleExceptions(exceptionHandler) {
val route = { // handleExceptions(exceptionHandler) {
path(SUCCESS.rawPath) {
complete(
HttpResponse(status = SUCCESS.getStatus).withEntity(SUCCESS.getBody)

9
smoke-tests/images/fake-backend/build.gradle
View File

@ -7,6 +7,7 @@ plugins {
id "com.bmuschko.docker-remote-api" version "6.7.0"
id "com.github.johnrengelman.shadow" version "6.1.0"
id "de.undercouch.download" version "4.1.1"
id "com.diffplug.spotless" version "6.1.2"
}
group = "io.opentelemetry"
@ -20,6 +21,14 @@ compileJava {
options.release.set(11)
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
implementation("com.linecorp.armeria:armeria-grpc:1.0.0")
implementation("io.opentelemetry:opentelemetry-proto:1.3.0-alpha")

13
smoke-tests/images/fake-backend/src/main/java/io/opentelemetry/smoketest/fakebackend/FakeBackendMain.java
View File

@ -1,17 +1,6 @@
/*
* Copyright The 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.
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.fakebackend;

5
smoke-tests/images/fake-backend/src/main/java/io/opentelemetry/smoketest/fakebackend/FakeLogsCollectorService.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.fakebackend;
import com.google.common.collect.ImmutableList;

5
smoke-tests/images/fake-backend/src/main/java/io/opentelemetry/smoketest/fakebackend/FakeMetricsCollectorService.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.fakebackend;
import com.google.common.collect.ImmutableList;

13
smoke-tests/images/fake-backend/src/main/java/io/opentelemetry/smoketest/fakebackend/FakeTraceCollectorService.java
View File

@ -1,17 +1,6 @@
/*
* Copyright The 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.
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.fakebackend;

9
smoke-tests/images/grpc/build.gradle
View File

@ -1,6 +1,7 @@
plugins {
id "java"
id "com.google.cloud.tools.jib" version "3.1.4"
id "com.diffplug.spotless" version "6.1.2"
}
group = "io.opentelemetry"
@ -17,6 +18,14 @@ repositories {
}
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
implementation platform("io.grpc:grpc-bom:1.33.1")
implementation platform("io.opentelemetry:opentelemetry-bom:1.0.0")

9
smoke-tests/images/play/build.gradle
View File

@ -1,6 +1,7 @@
plugins {
id "org.gradle.playframework" version "0.12"
id "com.google.cloud.tools.jib" version "3.1.4"
id "com.diffplug.spotless" version "6.1.2"
}
ext {
@ -28,6 +29,14 @@ repositories {
description = "Play Integration Tests."
spotless {
scala {
scalafmt()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.scala")
}
}
dependencies {
implementation "com.typesafe.play:play-guice_$scalaVersion:$playVersion"
implementation "com.typesafe.play:play-logback_$scalaVersion:$playVersion"

9
smoke-tests/images/quarkus/build.gradle
View File

@ -8,6 +8,7 @@ plugins {
id "java"
id "io.quarkus"
id "com.google.cloud.tools.jib" version "3.1.4"
id "com.diffplug.spotless" version "6.1.2"
}
group = "io.opentelemetry"
@ -18,6 +19,14 @@ repositories {
mavenLocal()
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
implementation enforcedPlatform("io.quarkus.platform:quarkus-bom:2.5.0.Final")
implementation "io.quarkus:quarkus-resteasy"

5
smoke-tests/images/quarkus/src/main/java/io/opentelemetry/smoketest/quarkus/HelloResource.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.quarkus;
import javax.ws.rs.GET;

9
smoke-tests/images/servlet/servlet-3.0/build.gradle
View File

@ -1,5 +1,6 @@
plugins {
id "war"
id "com.diffplug.spotless" version "6.1.2"
}
compileJava {
@ -10,6 +11,14 @@ repositories {
mavenCentral()
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
implementation("javax.servlet:javax.servlet-api:3.0.1")
}

5
smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import javax.servlet.ServletRequestEvent;

9
smoke-tests/images/servlet/servlet-5.0/build.gradle
View File

@ -1,5 +1,6 @@
plugins {
id "war"
id "com.diffplug.spotless" version "6.1.2"
}
compileJava {
@ -10,6 +11,14 @@ repositories {
mavenCentral()
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
}

5
smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java
View File

@ -1,3 +1,8 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import jakarta.servlet.ServletRequestEvent;

9
smoke-tests/images/spring-boot/build.gradle
View File

@ -3,6 +3,7 @@ plugins {
id "io.spring.dependency-management" version "1.0.9.RELEASE"
id "java"
id "com.google.cloud.tools.jib" version "3.1.4"
id "com.diffplug.spotless" version "6.1.2"
}
group = "io.opentelemetry"
@ -19,6 +20,14 @@ repositories {
}
}
spotless {
java {
googleJavaFormat()
licenseHeaderFile(rootProject.file("../../../buildscripts/spotless.license.java"), "(package|import|public)")
target("src/**/*.java")
}
}
dependencies {
implementation platform("io.opentelemetry:opentelemetry-bom:1.0.0")

13
smoke-tests/images/spring-boot/src/main/java/io/opentelemetry/smoketest/springboot/SpringbootApplication.java
View File

@ -1,17 +1,6 @@
/*
* Copyright The 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.
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.springboot;

13
smoke-tests/images/spring-boot/src/main/java/io/opentelemetry/smoketest/springboot/controller/PropagatingController.java
View File

@ -1,17 +1,6 @@
/*
* Copyright The 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.
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.springboot.controller;

13
smoke-tests/images/spring-boot/src/main/java/io/opentelemetry/smoketest/springboot/controller/WebController.java
View File

@ -1,17 +1,6 @@
/*
* Copyright The 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.
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.springboot.controller;