Skip to content

Commit

Permalink
Temporary bump submodule in this PR
Browse files Browse the repository at this point in the history
  • Loading branch information
@trask
trask committed Sep 26, 2021
1 parent f41d6b2 commit 060f1a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion otel
Submodule otel updated 55 files
+1 −12 build.gradle.kts
+0 −0 conventions/build.gradle.kts
+6 −0 conventions/settings.gradle.kts
+0 −0 conventions/src/main/kotlin/io.opentelemetry.instrumentation.base.gradle.kts
+2 −3 conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-instrumentation.gradle.kts
+0 −0 conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-shadowing.gradle.kts
+10 −0 conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
+0 −0 conventions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts
+0 −0 conventions/src/main/kotlin/io/opentelemetry/instrumentation/gradle/OtelJavaExtension.kt
+0 −0 conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.jacoco-conventions.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.java-conventions.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.javaagent-bootstrap.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.javaagent-instrumentation.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.javaagent-testing.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.jmh-conventions.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.library-instrumentation.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.publish-conventions.gradle.kts
+0 −0 conventions/src/main/kotlin/otel.scala-conventions.gradle.kts
+1 −0 conventions/src/main/kotlin/otel.spotless-conventions.gradle.kts
+0 −9 gradle-plugins/build.gradle.kts
+4 −6 gradle-plugins/src/main/java/io/opentelemetry/javaagent/muzzle/matcher/MuzzleGradlePluginUtil.java
+1 −1 gradle-plugins/src/main/kotlin/io.opentelemetry.instrumentation.muzzle-generation.gradle.kts
+7 −9 ...s-0.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkaclients/KafkaSingletons.java
+38 −7 instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/KafkaClientBaseTest.groovy
+16 −5 instrumentation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/KafkaClientDefaultTest.groovy
+4 −0 ...tation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/KafkaClientPropagationDisabledTest.groovy
+0 −11 ...ation/kafka-clients/kafka-clients-0.11/javaagent/src/test/groovy/KafkaClientSuppressReceiveSpansTest.groovy
+7 −9 ...javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/kafkastreams/KafkaStreamsSingletons.java
+111 −0 instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsBaseTest.groovy
+2 −79 instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsDefaultTest.groovy
+1 −78 instrumentation/kafka-streams-0.11/javaagent/src/test/groovy/KafkaStreamsSuppressReceiveSpansTest.groovy
+0 −121 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/ClassRef.java
+0 −130 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/ClassRefBuilder.java
+0 −101 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/FieldRef.java
+0 −158 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/Flag.java
+0 −103 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/MethodRef.java
+0 −56 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/ReferenceMergeUtil.java
+0 −54 javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/muzzle/Source.java
+6 −6 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/HelperReferenceWrapper.java
+5 −5 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/Mismatch.java
+1 −1 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/MuzzleReferencesAccessor.java
+7 −7 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectingClassVisitor.java
+2 −2 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollector.java
+4 −4 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcher.java
+4 −4 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferencesPrinter.java
+1 −1 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/AdviceClassNameCollector.java
+1 −1 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerationPlugin.java
+9 −10 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/MuzzleCodeGenerator.java
+1 −1 muzzle/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/generation/Utils.java
+4 −4 muzzle/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/HelperReferenceWrapperTest.groovy
+11 −11 muzzle/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/ReferenceMatcherTest.groovy
+9 −9 muzzle/src/test/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCollectorTest.java
+5 −2 settings.gradle.kts

0 comments on commit 060f1a1

Please sign in to comment.