Skip to content

Enforce library instrumentation package names matching their module names #12957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 12, 2025
Merged

Enforce library instrumentation package names matching their module names #12957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4f4cc1f
Validate package names
trask Dec 23, 2024
11c50e1
netty-common-4.0
trask Feb 20, 2025
38d7fab
package name
trask Feb 20, 2025
d4b0b5c
elasticsearch-rest-common-5.0
trask Feb 20, 2025
0ceaa14
package names
trask Feb 20, 2025
acf3c26
kafka-client-common-0.11
trask Feb 20, 2025
15c73d6
package name
trask Feb 20, 2025
12de48e
script
trask Feb 20, 2025
efd64aa
migration notes
trask Feb 20, 2025
b69d0ba
fossa
trask Feb 20, 2025
d274cc4
fix
trask Feb 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,10 @@ targets:
target: ':instrumentation:elasticsearch:elasticsearch-rest-7.0:library'
- type: gradle
path: ./
target: ':instrumentation:elasticsearch:elasticsearch-rest-common:javaagent'
target: ':instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent'
- type: gradle
path: ./
target: ':instrumentation:elasticsearch:elasticsearch-rest-common:library'
target: ':instrumentation:elasticsearch:elasticsearch-rest-common-5.0:library'
- type: gradle
path: ./
target: ':instrumentation:elasticsearch:elasticsearch-transport-5.0:javaagent'
Expand Down Expand Up @@ -691,12 +691,6 @@ targets:
- type: gradle
path: ./
target: ':instrumentation:netty:netty-3.8:javaagent'
- type: gradle
path: ./
target: ':instrumentation:netty:netty-4-common:javaagent'
- type: gradle
path: ./
target: ':instrumentation:netty:netty-4-common:library'
- type: gradle
path: ./
target: ':instrumentation:netty:netty-4.0:javaagent'
Expand All @@ -709,6 +703,12 @@ targets:
- type: gradle
path: ./
target: ':instrumentation:netty:netty-common:library'
- type: gradle
path: ./
target: ':instrumentation:netty:netty-common-4.0:javaagent'
- type: gradle
path: ./
target: ':instrumentation:netty:netty-common-4.0:library'
- type: gradle
path: ./
target: ':instrumentation:okhttp:okhttp-2.2:javaagent'
Expand Down Expand Up @@ -1008,7 +1008,7 @@ targets:
target: ':instrumentation:kafka:kafka-clients:kafka-clients-2.6:library'
- type: gradle
path: ./
target: ':instrumentation:kafka:kafka-clients:kafka-clients-common:library'
target: ':instrumentation:kafka:kafka-clients:kafka-clients-common-0.11:library'
- type: gradle
path: ./
target: ':instrumentation:log4j:log4j-context-data:log4j-context-data-2.17:javaagent'
Expand Down
61 changes: 61 additions & 0 deletions .github/scripts/check-package-names.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#!/bin/bash -e

# shellcheck disable=SC2001

for dir in $(find instrumentation -name "*.java" | grep library/src/main/java | sed 's#/[^/]*$##' | sort -u); do

module_name=$(echo "$dir" | sed 's#.*/\([^/]*\)/library/src/main/java/.*#\1#')

if [[ "$module_name" =~ java-* ]]; then
continue
fi
if [[ "$module_name" == "jdbc" ]]; then
continue
fi
if [[ "$module_name" == "jmx-metrics" ]]; then
continue
fi
if [[ "$module_name" == "resources" ]]; then
continue
fi
if [[ "$module_name" == "oshi" ]]; then
continue
fi

# these are possibly problematic
if [[ "$dir" == "instrumentation/grpc-1.6/library/src/main/java/io/grpc/override" ]]; then
continue
fi
if [[ "$dir" == "instrumentation/lettuce/lettuce-5.1/library/src/main/java/io/lettuce/core/protocol" ]]; then
continue
fi

# some common modules don't have any base version
# - lettuce-common
# - netty-common
if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" ]]; then
echo "module name doesn't have a base version: $dir"
exit 1
fi

simple_module_name=$(echo "$module_name" | sed 's/-[0-9.]*$//' | sed 's/-//g')
base_version=$(echo "$module_name" | sed 's/.*-\([0-9.]*\)$/\1/' | sed 's/\./_/')

if [[ ! "$module_name" =~ [0-9]$ && "$module_name" != "lettuce-common" && "$module_name" != "netty-common" ]]; then
expected_package_name="io/opentelemetry/instrumentation/$simple_module_name/v$base_version"
else
expected_package_name="io/opentelemetry/instrumentation/$simple_module_name"
fi

package_name=$(echo "$dir" | sed 's#.*/src/main/java/##')

# deal with differences like module name elasticsearch-rest and package name elasticsearch.rest
expected_package_name_normalized=$(echo "$expected_package_name" | sed 's#/##g')
package_name_normalized=$(echo "$package_name" | sed 's#/##g')

if [[ "$package_name_normalized" != "$expected_package_name_normalized"* ]]; then
echo "ERROR: $dir"
exit 1
fi

done
7 changes: 7 additions & 0 deletions .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@ jobs:

- run: .github/scripts/check-latest-dep-test-overrides.sh

check-package-names:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- run: .github/scripts/check-package-names.sh

build:
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
- The `java.net.http.HttpClient` instrumentation package
`io.opentelemetry.instrumentation.httpclient` was deprecated in favor of the new package name
`io.opentelemetry.instrumentation.javahttpclient`
- The class `io.opentelemetry.instrumentation.netty.v4.common.HttpRequestAndChannel` was
renamed to `io.opentelemetry.instrumentation.netty.common.v4_0.HttpRequestAndChannel`

## Version 2.13.1 (2025-02-18)

Expand Down
2 changes: 1 addition & 1 deletion ...ntation/elasticsearch/elasticsearch-api-client-7.16/javaagent-unit-tests/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ plugins {
}

dependencies {
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent"))
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent"))
testImplementation(project(":instrumentation:elasticsearch:elasticsearch-api-client-7.16:javaagent"))
}
2 changes: 1 addition & 1 deletion ...ntelemetry/javaagent/instrumentation/elasticsearch/rest/ElasticsearchEndpointMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import static org.junit.jupiter.api.Assertions.assertEquals;

import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.javaagent.instrumentation.elasticsearch.apiclient.ElasticsearchEndpointMap;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ muzzle {
dependencies {
library("co.elastic.clients:elasticsearch-java:7.16.0")

implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent"))
implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent"))

testInstrumentation(project(":instrumentation:elasticsearch:elasticsearch-rest-7.0:javaagent"))
testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion ...telemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchEndpointMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.javaagent.instrumentation.elasticsearch.apiclient;

import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchEndpointDefinition;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion ...avaagent/instrumentation/elasticsearch/apiclient/RestClientHttpClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion ...javaagent/instrumentation/elasticsearch/apiclient/RestClientTransportInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

import co.elastic.clients.transport.Endpoint;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ muzzle {
dependencies {
compileOnly("org.elasticsearch.client:rest:5.0.0")

implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent"))
implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent"))

testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion ...metry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.v5_0;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.ElasticsearchRestJavaagentInstrumenterFactory;
import org.elasticsearch.client.Response;

Expand Down
4 changes: 2 additions & 2 deletions ...elemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.RestResponseListener;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.RestResponseListener;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ muzzle {
dependencies {
library("org.elasticsearch.client:elasticsearch-rest-client:6.4.0")

implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent"))
implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent"))

testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion ...metry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.v6_4;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.ElasticsearchRestJavaagentInstrumenterFactory;
import org.elasticsearch.client.Response;

Expand Down
4 changes: 2 additions & 2 deletions ...elemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.RestResponseListener;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.RestResponseListener;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ muzzle {
dependencies {
library("org.elasticsearch.client:elasticsearch-rest-client:7.0.0")

implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common:javaagent"))
implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:javaagent"))

testInstrumentation(project(":instrumentation:apache-httpclient:apache-httpclient-4.0:javaagent"))
testInstrumentation(project(":instrumentation:apache-httpasyncclient-4.1:javaagent"))
Expand Down
2 changes: 1 addition & 1 deletion ...metry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Singletons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.v7_0;

import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.javaagent.instrumentation.elasticsearch.rest.ElasticsearchRestJavaagentInstrumenterFactory;
import org.elasticsearch.client.Response;

Expand Down
6 changes: 3 additions & 3 deletions ...elemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/RestClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.util.VirtualField;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.RestResponseListener;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchEndpointDefinition;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.RestResponseListener;
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
import net.bytebuddy.asm.Advice;
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/elasticsearch/elasticsearch-rest-7.0/library/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
dependencies {
library("org.elasticsearch.client:elasticsearch-rest-client:7.0.0")
implementation("net.bytebuddy:byte-buddy")
implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common:library"))
implementation(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:library"))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the idea with common modules that we would always add a version suffix for the lowest version number that it is used by?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that was my first idea, but then I thought the more consistent strategy is

the common module version would match the version used in its build.gradle.kts

there are two common modules (lettuce-common and netty-common) that don't have a dependency on the instrumented library, in which case I didn't add any base version


testImplementation("com.fasterxml.jackson.core:jackson-databind")
testImplementation("org.testcontainers:elasticsearch")
Expand Down
2 changes: 1 addition & 1 deletion ...io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Telemetry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import org.elasticsearch.client.Response;
import org.elasticsearch.client.RestClient;

Expand Down
4 changes: 2 additions & 2 deletions ...telemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7TelemetryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
import io.opentelemetry.instrumentation.api.internal.HttpConstants;
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesExtractorBuilder;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestInstrumenterFactory;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestInstrumenterFactory;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/RestClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.RestResponseListener;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.RestResponseListener;
import java.lang.reflect.Array;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
Expand Down
2 changes: 1 addition & 1 deletion ...ch-rest-common/javaagent/build.gradle.kts → ...est-common-5.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ plugins {
dependencies {
compileOnly("org.elasticsearch.client:rest:5.0.0")

api(project(":instrumentation:elasticsearch:elasticsearch-rest-common:library"))
api(project(":instrumentation:elasticsearch:elasticsearch-rest-common-5.0:library"))
}
4 changes: 2 additions & 2 deletions ...archRestJavaagentInstrumenterFactory.java → ...archRestJavaagentInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

import io.opentelemetry.api.GlobalOpenTelemetry;
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestInstrumenterFactory;
import io.opentelemetry.instrumentation.elasticsearch.rest.internal.ElasticsearchRestRequest;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestInstrumenterFactory;
import io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal.ElasticsearchRestRequest;
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
import io.opentelemetry.javaagent.bootstrap.internal.AgentInstrumentationConfig;
import java.util.Collections;
Expand Down
0 ...arch-rest-common/library/build.gradle.kts → ...-rest-common-5.0/library/build.gradle.kts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lasticsearchClientAttributeExtractor.java → ...lasticsearchClientAttributeExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
import static io.opentelemetry.instrumentation.api.internal.HttpConstants._OTHER;
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/ElasticsearchDbAttributesGetter.java → ...rnal/ElasticsearchDbAttributesGetter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import static java.util.logging.Level.FINE;

Expand Down
2 changes: 1 addition & 1 deletion ...rnal/ElasticsearchEndpointDefinition.java → ...rnal/ElasticsearchEndpointDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import static java.util.Collections.unmodifiableList;

Expand Down
2 changes: 1 addition & 1 deletion ...ElasticsearchRestInstrumenterFactory.java → ...ElasticsearchRestInstrumenterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.api.incubator.semconv.db.DbClientAttributesExtractor;
Expand Down
2 changes: 1 addition & 1 deletion ...st/internal/ElasticsearchRestRequest.java → ..._0/internal/ElasticsearchRestRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import com.google.auto.value.AutoValue;
import javax.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...ernal/ElasticsearchSpanNameExtractor.java → ...ernal/ElasticsearchSpanNameExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;

Expand Down
2 changes: 1 addition & 1 deletion ...h/rest/internal/RestResponseListener.java → ...n/v5_0/internal/RestResponseListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.elasticsearch.rest.internal;
package io.opentelemetry.instrumentation.elasticsearch.rest.common.v5_0.internal;

import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
Expand Down
Loading
Loading