Skip to content

Commit fa9bb9e

Browse files
Copilottrask
Copilot
and
trask
authored
Rename remaining javaagent instrumentation packages to versioned paths (#18180)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: trask <218610+trask@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent 539cba3 commit fa9bb9e

149 files changed

Lines changed: 203 additions & 203 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.

instrumentation/akka/akka-http-10.0/javaagent/src/javaRouteTest/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerJavaRouteTest.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/javaRouteTest/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/AkkaHttpServerJavaRouteTest.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.akkahttp;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0;
77

88
import static akka.http.javadsl.server.PathMatchers.integerSegment;
99
import static org.assertj.core.api.Assertions.assertThat;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpUtil.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/AkkaHttpUtil.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.akkahttp;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0;
77

88
import static java.util.Collections.emptyList;
99
import static java.util.Collections.singletonList;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientAttributesGetter.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/AkkaHttpClientAttributesGetter.java

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

6-
package io.opentelemetry.javaagent.instrumentation.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

88
import akka.http.scaladsl.model.HttpRequest;
99
import akka.http.scaladsl.model.HttpResponse;
1010
import akka.http.scaladsl.model.Uri;
1111
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
1212
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
13-
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
13+
import io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.AkkaHttpUtil;
1414
import java.util.List;
1515
import javax.annotation.Nullable;
1616

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientInstrumentationModule.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/AkkaHttpClientInstrumentationModule.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.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

88
import static java.util.Arrays.asList;
99

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientSingletons.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/AkkaHttpClientSingletons.java

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

6-
package io.opentelemetry.javaagent.instrumentation.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

88
import akka.http.scaladsl.model.HttpRequest;
99
import akka.http.scaladsl.model.HttpResponse;
1010
import io.opentelemetry.api.GlobalOpenTelemetry;
1111
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
1212
import io.opentelemetry.javaagent.bootstrap.internal.JavaagentHttpClientInstrumenters;
13-
import io.opentelemetry.javaagent.instrumentation.akkahttp.AkkaHttpUtil;
13+
import io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.AkkaHttpUtil;
1414

1515
class AkkaHttpClientSingletons {
1616

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/AkkaHttpClientUtil.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/AkkaHttpClientUtil.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.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

88
import akka.actor.ActorSystem;
99
import akka.actor.ExtendedActorSystem;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/FutureWrapper.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/FutureWrapper.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.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

88
import io.opentelemetry.context.Context;
99
import io.opentelemetry.context.Scope;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpExtClientInstrumentation.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/HttpExtClientInstrumentation.java

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

6-
package io.opentelemetry.javaagent.instrumentation.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

8-
import static io.opentelemetry.javaagent.instrumentation.akkahttp.client.AkkaHttpClientSingletons.instrumenter;
9-
import static io.opentelemetry.javaagent.instrumentation.akkahttp.client.AkkaHttpClientSingletons.setter;
8+
import static io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client.AkkaHttpClientSingletons.instrumenter;
9+
import static io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client.AkkaHttpClientSingletons.setter;
1010
import static net.bytebuddy.matcher.ElementMatchers.named;
1111
import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
1212
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/HttpHeaderSetter.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/HttpHeaderSetter.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.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

88
import akka.http.javadsl.model.headers.RawHeader;
99
import akka.http.scaladsl.model.HttpRequest;

instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/client/OnCompleteHandler.java renamed to instrumentation/akka/akka-http-10.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/akkahttp/v10_0/client/OnCompleteHandler.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.akkahttp.client;
6+
package io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client;
77

8-
import static io.opentelemetry.javaagent.instrumentation.akkahttp.client.AkkaHttpClientSingletons.instrumenter;
8+
import static io.opentelemetry.javaagent.instrumentation.akkahttp.v10_0.client.AkkaHttpClientSingletons.instrumenter;
99

1010
import akka.http.scaladsl.model.HttpRequest;
1111
import akka.http.scaladsl.model.HttpResponse;

0 commit comments

Comments
 (0)