Rename the instrumentation-api-semconv module into `instrumentation…

…-api-incubator` (open-telemetry#9985)
zeitlinger · Dec 12, 2023 · 3ab5875 · 3ab5875
1 parent 1a8706d
commit 3ab5875
Show file tree

Hide file tree

Showing 297 changed files with 485 additions and 527 deletions.
diff --git a/...ons/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-instrumentation.gradle.kts b/...ons/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-instrumentation.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
+  add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
   add("muzzleBootstrap", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   add("muzzleTooling", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")

diff --git a/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts b/conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
   // Integration tests may need to define custom instrumentation modules so we include the standard
   // instrumentation infrastructure for testing too.
   compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
+  compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   // Apply common dependencies for instrumentation.
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") {

diff --git a/...tions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts b/...tions/src/main/kotlin/io.opentelemetry.instrumentation.library-instrumentation.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   api("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
-  api("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")
+  api("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")
 
   api("io.opentelemetry:opentelemetry-api")
 

diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts
@@ -442,7 +442,7 @@ configurations.configureEach {
     // what modules they add to reference generically.
     dependencySubstitution {
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")).using(project(":instrumentation-api"))
-      substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv")).using(project(":instrumentation-api-semconv"))
+      substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator")).using(project(":instrumentation-api-incubator"))
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations")).using(project(":instrumentation-annotations"))
       substitute(module("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")).using(
         project(":instrumentation-annotations-support")

diff --git a/docs/contributing/javaagent-structure.md b/docs/contributing/javaagent-structure.md
@@ -29,7 +29,7 @@ The bootstrap class loader contains several modules:
   it contains classes that continue the initialization work started by `OpenTelemetryAgent`, as well
   as some internal javaagent classes and interfaces that must be globally available to the whole
   application. This module is internal and its APIs are considered unstable.
-- **The `instrumentation-api` and `instrumentation-api-semconv` modules**:
+- **The `instrumentation-api` and `instrumentation-api-incubator` modules**:
   these modules contain the [Instrumenter API](using-instrumenter-api.md) and other related
   utilities. Because they are used by almost all instrumentations, they must be globally available
   to all classloaders running within the instrumented application. The classes located in these

diff --git a/instrumentation-api-semconv/build.gradle.kts → ...umentation-api-incubator/build.gradle.kts b/instrumentation-api-semconv/build.gradle.kts → ...umentation-api-incubator/build.gradle.kts
diff --git a/...tion/api/log/LoggingContextConstants.java → ...ncubator/log/LoggingContextConstants.java b/...tion/api/log/LoggingContextConstants.java → ...ncubator/log/LoggingContextConstants.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.log;
+package io.opentelemetry.instrumentation.api.incubator.log;
 
 import io.opentelemetry.api.trace.SpanContext;
 

diff --git a/...umenter/code/CodeAttributesExtractor.java → ...semconv/code/CodeAttributesExtractor.java b/...umenter/code/CodeAttributesExtractor.java → ...semconv/code/CodeAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.code;
+package io.opentelemetry.instrumentation.api.incubator.semconv.code;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 

diff --git a/...strumenter/code/CodeAttributesGetter.java → ...or/semconv/code/CodeAttributesGetter.java b/...strumenter/code/CodeAttributesGetter.java → ...or/semconv/code/CodeAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.code;
+package io.opentelemetry.instrumentation.api.incubator.semconv.code;
 
 import javax.annotation.Nullable;
 

diff --git a/...trumenter/code/CodeSpanNameExtractor.java → ...r/semconv/code/CodeSpanNameExtractor.java b/...trumenter/code/CodeSpanNameExtractor.java → ...r/semconv/code/CodeSpanNameExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.code;
+package io.opentelemetry.instrumentation.api.incubator.semconv.code;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 import io.opentelemetry.instrumentation.api.internal.ClassNames;

diff --git a/...enter/db/DbClientAttributesExtractor.java → ...mconv/db/DbClientAttributesExtractor.java b/...enter/db/DbClientAttributesExtractor.java → ...mconv/db/DbClientAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 

diff --git a/...rumenter/db/DbClientAttributesGetter.java → .../semconv/db/DbClientAttributesGetter.java b/...rumenter/db/DbClientAttributesGetter.java → .../semconv/db/DbClientAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import javax.annotation.Nullable;
 

diff --git a/...db/DbClientCommonAttributesExtractor.java → ...db/DbClientCommonAttributesExtractor.java b/...db/DbClientCommonAttributesExtractor.java → ...db/DbClientCommonAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 

diff --git a/...er/db/DbClientCommonAttributesGetter.java → ...nv/db/DbClientCommonAttributesGetter.java b/...er/db/DbClientCommonAttributesGetter.java → ...nv/db/DbClientCommonAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import javax.annotation.Nullable;
 

diff --git a/...umenter/db/DbClientSpanNameExtractor.java → ...semconv/db/DbClientSpanNameExtractor.java b/...umenter/db/DbClientSpanNameExtractor.java → ...semconv/db/DbClientSpanNameExtractor.java
@@ -3,10 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
-import io.opentelemetry.instrumentation.api.db.SqlStatementInfo;
-import io.opentelemetry.instrumentation.api.db.SqlStatementSanitizer;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 
 public abstract class DbClientSpanNameExtractor<REQUEST> implements SpanNameExtractor<REQUEST> {

diff --git a/...i/metrics/db/DbConnectionPoolMetrics.java → ...r/semconv/db/DbConnectionPoolMetrics.java b/...i/metrics/db/DbConnectionPoolMetrics.java → ...r/semconv/db/DbConnectionPoolMetrics.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.metrics.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 

diff --git a/...ntation/api/db/RedisCommandSanitizer.java → ...tor/semconv/db/RedisCommandSanitizer.java b/...ntation/api/db/RedisCommandSanitizer.java → ...tor/semconv/db/RedisCommandSanitizer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableMap;

diff --git a/...nter/db/SqlClientAttributesExtractor.java → ...conv/db/SqlClientAttributesExtractor.java b/...nter/db/SqlClientAttributesExtractor.java → ...conv/db/SqlClientAttributesExtractor.java
@@ -3,15 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.db.SqlStatementInfo;
-import io.opentelemetry.instrumentation.api.db.SqlStatementSanitizer;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.SemanticAttributes;
 

diff --git a/.../SqlClientAttributesExtractorBuilder.java → .../SqlClientAttributesExtractorBuilder.java b/.../SqlClientAttributesExtractorBuilder.java → .../SqlClientAttributesExtractorBuilder.java
@@ -3,13 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static java.util.Objects.requireNonNull;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import io.opentelemetry.api.common.AttributeKey;
-import io.opentelemetry.instrumentation.api.db.SqlStatementSanitizer;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.semconv.SemanticAttributes;
 

diff --git a/...umenter/db/SqlClientAttributesGetter.java → ...semconv/db/SqlClientAttributesGetter.java b/...umenter/db/SqlClientAttributesGetter.java → ...semconv/db/SqlClientAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import javax.annotation.Nullable;
 

diff --git a/...ry/instrumentation/api/db/SqlDialect.java → .../api/incubator/semconv/db/SqlDialect.java b/...ry/instrumentation/api/db/SqlDialect.java → .../api/incubator/semconv/db/SqlDialect.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 /** Enumeration of sql dialects that are handled differently by {@link SqlStatementSanitizer}. */
 public enum SqlDialect {

diff --git a/...trumentation/api/db/SqlStatementInfo.java → ...ncubator/semconv/db/SqlStatementInfo.java b/...trumentation/api/db/SqlStatementInfo.java → ...ncubator/semconv/db/SqlStatementInfo.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import com.google.auto.value.AutoValue;
 import javax.annotation.Nullable;

diff --git a/...ntation/api/db/SqlStatementSanitizer.java → ...tor/semconv/db/SqlStatementSanitizer.java b/...ntation/api/db/SqlStatementSanitizer.java → ...tor/semconv/db/SqlStatementSanitizer.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.db;
+package io.opentelemetry.instrumentation.api.incubator.semconv.db;
 
 import static io.opentelemetry.instrumentation.api.internal.SupportabilityMetrics.CounterNames.SQL_STATEMENT_SANITIZER_CACHE_MISS;
 

diff --git a/...r/http/HttpClientExperimentalMetrics.java → ...v/http/HttpClientExperimentalMetrics.java b/...r/http/HttpClientExperimentalMetrics.java → ...v/http/HttpClientExperimentalMetrics.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.http;
+package io.opentelemetry.instrumentation.api.incubator.semconv.http;
 
-import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpMessageBodySizeUtil.getHttpRequestBodySize;
-import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpMessageBodySizeUtil.getHttpResponseBodySize;
+import static io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpMessageBodySizeUtil.getHttpRequestBodySize;
+import static io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpMessageBodySizeUtil.getHttpResponseBodySize;
 import static java.util.logging.Level.FINE;
 
 import io.opentelemetry.api.common.Attributes;

diff --git a/...ClientPeerServiceAttributesExtractor.java → ...ClientPeerServiceAttributesExtractor.java b/...ClientPeerServiceAttributesExtractor.java → ...ClientPeerServiceAttributesExtractor.java
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.http;
+package io.opentelemetry.instrumentation.api.incubator.semconv.http;
 
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.PeerServiceResolver;
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.internal.UrlParser;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
-import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceResolver;
-import io.opentelemetry.instrumentation.api.instrumenter.net.internal.UrlParser;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpClientAttributesGetter;
 import io.opentelemetry.semconv.SemanticAttributes;
 import java.util.function.Supplier;

diff --git a/.../HttpExperimentalAttributesExtractor.java → .../HttpExperimentalAttributesExtractor.java b/.../HttpExperimentalAttributesExtractor.java → .../HttpExperimentalAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.http;
+package io.opentelemetry.instrumentation.api.incubator.semconv.http;
 
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 

diff --git a/...r/http/HttpExperimentalMetricsAdvice.java → ...v/http/HttpExperimentalMetricsAdvice.java b/...r/http/HttpExperimentalMetricsAdvice.java → ...v/http/HttpExperimentalMetricsAdvice.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.http;
+package io.opentelemetry.instrumentation.api.incubator.semconv.http;
 
 import static java.util.Arrays.asList;
 

diff --git a/...umenter/http/HttpMessageBodySizeUtil.java → ...semconv/http/HttpMessageBodySizeUtil.java b/...umenter/http/HttpMessageBodySizeUtil.java → ...semconv/http/HttpMessageBodySizeUtil.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.http;
+package io.opentelemetry.instrumentation.api.incubator.semconv.http;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;

diff --git a/...r/http/HttpServerExperimentalMetrics.java → ...v/http/HttpServerExperimentalMetrics.java b/...r/http/HttpServerExperimentalMetrics.java → ...v/http/HttpServerExperimentalMetrics.java
@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.http;
+package io.opentelemetry.instrumentation.api.incubator.semconv.http;
 
-import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpMessageBodySizeUtil.getHttpRequestBodySize;
-import static io.opentelemetry.instrumentation.api.instrumenter.http.HttpMessageBodySizeUtil.getHttpResponseBodySize;
+import static io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpMessageBodySizeUtil.getHttpRequestBodySize;
+import static io.opentelemetry.instrumentation.api.incubator.semconv.http.HttpMessageBodySizeUtil.getHttpResponseBodySize;
 import static java.util.logging.Level.FINE;
 
 import io.opentelemetry.api.common.Attributes;

diff --git a/...messaging/CapturedMessageHeadersUtil.java → ...messaging/CapturedMessageHeadersUtil.java b/...messaging/CapturedMessageHeadersUtil.java → ...messaging/CapturedMessageHeadersUtil.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.messaging;
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
 import static java.util.Collections.unmodifiableList;
 

diff --git a/...trumenter/messaging/MessageOperation.java → ...r/semconv/messaging/MessageOperation.java b/...trumenter/messaging/MessageOperation.java → ...r/semconv/messaging/MessageOperation.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.messaging;
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
 import java.util.Locale;
 

diff --git a/...ssaging/MessagingAttributesExtractor.java → ...ssaging/MessagingAttributesExtractor.java b/...ssaging/MessagingAttributesExtractor.java → ...ssaging/MessagingAttributesExtractor.java
@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.messaging;
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
-import static io.opentelemetry.instrumentation.api.instrumenter.messaging.CapturedMessageHeadersUtil.attributeKey;
-import static io.opentelemetry.instrumentation.api.instrumenter.messaging.CapturedMessageHeadersUtil.lowercase;
-import static io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation.PROCESS;
-import static io.opentelemetry.instrumentation.api.instrumenter.messaging.MessageOperation.RECEIVE;
 import static io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil.internalSet;
 
 import io.opentelemetry.api.common.AttributesBuilder;
@@ -61,7 +57,7 @@ public static <REQUEST, RESPONSE> MessagingAttributesExtractorBuilder<REQUEST, R
       List<String> capturedHeaders) {
     this.getter = getter;
     this.operation = operation;
-    this.capturedHeaders = lowercase(capturedHeaders);
+    this.capturedHeaders = CapturedMessageHeadersUtil.lowercase(capturedHeaders);
   }
 
   @Override
@@ -109,7 +105,7 @@ public void onEnd(
     for (String name : capturedHeaders) {
       List<String> values = getter.getMessageHeader(request, name);
       if (!values.isEmpty()) {
-        internalSet(attributes, attributeKey(name), values);
+        internalSet(attributes, CapturedMessageHeadersUtil.attributeKey(name), values);
       }
     }
   }

diff --git a/.../MessagingAttributesExtractorBuilder.java → .../MessagingAttributesExtractorBuilder.java b/.../MessagingAttributesExtractorBuilder.java → .../MessagingAttributesExtractorBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.messaging;
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
 import static java.util.Collections.emptyList;
 

diff --git a/.../messaging/MessagingAttributesGetter.java → .../messaging/MessagingAttributesGetter.java b/.../messaging/MessagingAttributesGetter.java → .../messaging/MessagingAttributesGetter.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.messaging;
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
 import static java.util.Collections.emptyList;
 

diff --git a/...messaging/MessagingSpanNameExtractor.java → ...messaging/MessagingSpanNameExtractor.java b/...messaging/MessagingSpanNameExtractor.java → ...messaging/MessagingSpanNameExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.messaging;
+package io.opentelemetry.instrumentation.api.incubator.semconv.messaging;
 
 import io.opentelemetry.instrumentation.api.instrumenter.SpanNameExtractor;
 

diff --git a/...r/net/PeerServiceAttributesExtractor.java → ...v/net/PeerServiceAttributesExtractor.java b/...r/net/PeerServiceAttributesExtractor.java → ...v/net/PeerServiceAttributesExtractor.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.net;
+package io.opentelemetry.instrumentation.api.incubator.semconv.net;
 
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;

diff --git a/...instrumenter/net/PeerServiceResolver.java → ...ator/semconv/net/PeerServiceResolver.java b/...instrumenter/net/PeerServiceResolver.java → ...ator/semconv/net/PeerServiceResolver.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.net;
+package io.opentelemetry.instrumentation.api.incubator.semconv.net;
 
 import java.util.Map;
 import java.util.function.Supplier;

diff --git a/...rumenter/net/PeerServiceResolverImpl.java → .../semconv/net/PeerServiceResolverImpl.java b/...rumenter/net/PeerServiceResolverImpl.java → .../semconv/net/PeerServiceResolverImpl.java
@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.net;
+package io.opentelemetry.instrumentation.api.incubator.semconv.net;
 
 import static java.util.Comparator.comparing;
 import static java.util.Comparator.naturalOrder;
 import static java.util.Comparator.nullsFirst;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.instrumentation.api.instrumenter.net.internal.UrlParser;
+import io.opentelemetry.instrumentation.api.incubator.semconv.net.internal.UrlParser;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;