From be40f097530708c756f615da0126298e5acfb263 Mon Sep 17 00:00:00 2001
From: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Date: Fri, 20 Oct 2023 08:33:23 +0200
Subject: [PATCH] Move class that should've been internal to internal package

---
 .../http/HttpClientPeerServiceAttributesExtractor.java    | 2 +-
 .../api/instrumenter/net/PeerServiceResolverImpl.java     | 2 +-
 .../api/instrumenter/{url => net/internal}/UrlParser.java | 8 ++++++--
 .../api/instrumenter/url/UrlParserTest.java               | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)
 rename instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/{url => net/internal}/UrlParser.java (94%)

diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java
index 621c57ef4329..b9f5d83713b0 100644
--- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java
+++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientPeerServiceAttributesExtractor.java
@@ -9,7 +9,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.net.PeerServiceResolver;
-import io.opentelemetry.instrumentation.api.instrumenter.url.UrlParser;
+import io.opentelemetry.instrumentation.api.instrumenter.net.internal.UrlParser;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.semconv.SemanticAttributes;
 import java.util.function.Supplier;
diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceResolverImpl.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceResolverImpl.java
index 99473cbdcfe3..df10e9de344e 100644
--- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceResolverImpl.java
+++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/PeerServiceResolverImpl.java
@@ -10,7 +10,7 @@
 import static java.util.Comparator.nullsFirst;
 
 import com.google.auto.value.AutoValue;
-import io.opentelemetry.instrumentation.api.instrumenter.url.UrlParser;
+import io.opentelemetry.instrumentation.api.instrumenter.net.internal.UrlParser;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParser.java b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/UrlParser.java
similarity index 94%
rename from instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParser.java
rename to instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/UrlParser.java
index e3f0426be43e..ac6681525e3b 100644
--- a/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParser.java
+++ b/instrumentation-api-semconv/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/net/internal/UrlParser.java
@@ -3,12 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.instrumentation.api.instrumenter.url;
+package io.opentelemetry.instrumentation.api.instrumenter.net.internal;
 
 import java.util.function.Predicate;
 import javax.annotation.Nullable;
 
-public class UrlParser {
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class UrlParser {
 
   @Nullable
   public static String getHost(String url) {
diff --git a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParserTest.java b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParserTest.java
index b5996087b5cb..c0b30d34e386 100644
--- a/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParserTest.java
+++ b/instrumentation-api-semconv/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/url/UrlParserTest.java
@@ -7,6 +7,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.instrumentation.api.instrumenter.net.internal.UrlParser;
 import org.junit.jupiter.api.Test;
 
 class UrlParserTest {