Skip to content

Commit 1ea9327

Browse files
trasktrask
committed
Merge remote-tracking branch 'upstream/main' into remove-unnecessary-is-not-null
# Conflicts: # instrumentation/internal/internal-reflection/javaagent-integration-tests/src/test/java/io/opentelemetry/javaagent/instrumentation/internal/reflection/ReflectionTest.java
2 parents 0becb4c + 99a4a4b commit 1ea9327

350 files changed

Lines changed: 612 additions & 1633 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎conventions/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ dependencies {
6969
implementation("com.gradle.develocity:com.gradle.develocity.gradle.plugin:4.4.1")
7070
implementation("org.sonatype.gradle.plugins:scan-gradle-plugin:3.1.5")
7171
implementation("ru.vyarus:gradle-animalsniffer-plugin:2.0.1")
72-
implementation("org.spdx:spdx-gradle-plugin:0.10.0")
72+
implementation("org.spdx:spdx-gradle-plugin:0.11.0")
7373
// When updating, also update dependencyManagement/build.gradle.kts
7474
implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.18.8")
7575
implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")

‎instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/SpanLinksExtractor.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ public interface SpanLinksExtractor<REQUEST> {
1515
/**
1616
* Extracts {@link SpanContext}s that should be linked to the newly created span and adds them to
1717
* {@code spanLinks}.
18+
*
19+
* <p>A link points to a related span other than the parent (for example, the producer span of a
20+
* message being processed). Implementations should not derive link targets from the span
21+
* currently in {@code parentContext}; {@code parentContext} is provided for access to
22+
* request-scoped state attached via {@link io.opentelemetry.context.ContextKey ContextKey}s (for
23+
* example, baggage set earlier in the pipeline).
1824
*/
1925
void extract(SpanLinksBuilder spanLinks, Context parentContext, REQUEST request);
2026
}

‎instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/internal/PropagatorBasedSpanLinksExtractor.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public PropagatorBasedSpanLinksExtractor(
3030

3131
@Override
3232
public void extract(SpanLinksBuilder spanLinks, Context parentContext, REQUEST request) {
33-
Context extracted = propagator.extract(parentContext, request, getter);
33+
// extract from the carrier against a root context so that, when the carrier contains no
34+
// propagation data, no link is added (rather than linking to the ambient parent span)
35+
Context extracted = propagator.extract(Context.root(), request, getter);
3436
spanLinks.addLink(Span.fromContext(extracted).getSpanContext());
3537
}
3638
}

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejAsyncServletInstrumentation.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejAsyncServletInstrumentation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge.currentContext;
99
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
1010
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasSuperType;
11-
import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerSingletons.instrumenter;
11+
import static io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0.ActivejHttpServerSingletons.instrumenter;
1212
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
1313
import static net.bytebuddy.matcher.ElementMatchers.named;
1414
import static net.bytebuddy.matcher.ElementMatchers.not;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerAttributesGetter.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerAttributesGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import io.activej.http.HttpHeader;
99
import io.activej.http.HttpHeaderValue;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerInstrumentationModule.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerInstrumentationModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
99
import static java.util.Collections.singletonList;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerRequestGetter.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerRequestGetter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static java.util.Collections.emptyIterator;
99

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerSingletons.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerSingletons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import io.activej.http.HttpRequest;
99
import io.activej.http.HttpResponse;

instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/PromiseWrapper.java renamed to instrumentation/activej-http-6.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/PromiseWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

8-
import static io.opentelemetry.javaagent.instrumentation.activejhttp.ActivejHttpServerSingletons.instrumenter;
8+
import static io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0.ActivejHttpServerSingletons.instrumenter;
99

1010
import io.activej.http.HttpRequest;
1111
import io.activej.http.HttpResponse;

instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/ActivejHttpServerTest.java renamed to instrumentation/activej-http-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/activejhttp/v6_0/ActivejHttpServerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.javaagent.instrumentation.activejhttp;
6+
package io.opentelemetry.javaagent.instrumentation.activejhttp.v6_0;
77

88
import static io.activej.common.exception.FatalErrorHandlers.logging;
99
import static io.activej.http.HttpMethod.GET;

0 commit comments

Comments
 (0)