POTEL 27 - Rename classes and mark some classes internal

sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java

@@ -161,7 +161,7 @@ private SdkTracerProviderBuilder configureSdkTracerProvider(
       SdkTracerProviderBuilder tracerProvider, ConfigProperties config) {
     return tracerProvider
         .setSampler(new SentrySampler())
-        .addSpanProcessor(new PotelSentrySpanProcessor())
+        .addSpanProcessor(new OtelSentrySpanProcessor())
         .addSpanProcessor(BatchSpanProcessor.builder(new SentrySpanExporter()).build());
   }
 

sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryPropagatorProvider.java

@@ -7,8 +7,7 @@
 public final class SentryPropagatorProvider implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
-    //    return new SentryPropagator();
-    return new PotelSentryPropagator();
+    return new OtelSentryPropagator();
   }
 
   @Override

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/InternalSemanticAttributes.java

@@ -1,7 +1,9 @@
 package io.sentry.opentelemetry;
 
 import io.opentelemetry.api.common.AttributeKey;
+import org.jetbrains.annotations.ApiStatus;
 
+@ApiStatus.Internal
 public final class InternalSemanticAttributes {
   public static final AttributeKey<Boolean> SAMPLED = AttributeKey.booleanKey("sentry.sampled");
   public static final AttributeKey<Double> SAMPLE_RATE =

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelContextScopesStorage.java

@@ -7,9 +7,11 @@
 import io.sentry.IScopes;
 import io.sentry.IScopesStorage;
 import io.sentry.ISentryLifecycleToken;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 @SuppressWarnings("MustBeClosedChecker")
 public final class OtelContextScopesStorage implements IScopesStorage {
 

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelSpanContext.java

@@ -11,9 +11,11 @@
 import io.sentry.TracesSamplingDecision;
 import io.sentry.protocol.SentryId;
 import java.lang.ref.WeakReference;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class OtelSpanContext extends SpanContext {
 
   /**

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextStorage.java

@@ -5,8 +5,10 @@
 import io.opentelemetry.context.Scope;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.Internal
 public final class SentryContextStorage implements ContextStorage {
   private final @NotNull Logger logger = Logger.getLogger(SentryContextStorage.class.getName());
 

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextWrapper.java

@@ -7,9 +7,11 @@
 import io.opentelemetry.context.ContextKey;
 import io.sentry.IScopes;
 import io.sentry.Sentry;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class SentryContextWrapper implements Context {
 
   private final @NotNull Context delegate;

sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api

@@ -15,31 +15,31 @@ public final class io/sentry/opentelemetry/OtelSamplingUtil {
 	public static fun extractSamplingDecisionOrDefault (Lio/opentelemetry/api/common/Attributes;)Lio/sentry/TracesSamplingDecision;
 }
 
-public final class io/sentry/opentelemetry/OtelSpanInfo {
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;Ljava/util/Map;)V
-	public fun addDataField (Ljava/lang/String;Ljava/lang/Object;)V
-	public fun getDataFields ()Ljava/util/Map;
-	public fun getDescription ()Ljava/lang/String;
-	public fun getOp ()Ljava/lang/String;
-	public fun getTransactionNameSource ()Lio/sentry/protocol/TransactionNameSource;
-}
-
-public final class io/sentry/opentelemetry/PotelSentryPropagator : io/opentelemetry/context/propagation/TextMapPropagator {
+public final class io/sentry/opentelemetry/OtelSentryPropagator : io/opentelemetry/context/propagation/TextMapPropagator {
 	public fun <init> ()V
 	public fun extract (Lio/opentelemetry/context/Context;Ljava/lang/Object;Lio/opentelemetry/context/propagation/TextMapGetter;)Lio/opentelemetry/context/Context;
 	public fun fields ()Ljava/util/Collection;
 	public fun inject (Lio/opentelemetry/context/Context;Ljava/lang/Object;Lio/opentelemetry/context/propagation/TextMapSetter;)V
 }
 
-public final class io/sentry/opentelemetry/PotelSentrySpanProcessor : io/opentelemetry/sdk/trace/SpanProcessor {
+public final class io/sentry/opentelemetry/OtelSentrySpanProcessor : io/opentelemetry/sdk/trace/SpanProcessor {
 	public fun <init> ()V
 	public fun isEndRequired ()Z
 	public fun isStartRequired ()Z
 	public fun onEnd (Lio/opentelemetry/sdk/trace/ReadableSpan;)V
 	public fun onStart (Lio/opentelemetry/context/Context;Lio/opentelemetry/sdk/trace/ReadWriteSpan;)V
 }
 
+public final class io/sentry/opentelemetry/OtelSpanInfo {
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;Ljava/util/Map;)V
+	public fun addDataField (Ljava/lang/String;Ljava/lang/Object;)V
+	public fun getDataFields ()Ljava/util/Map;
+	public fun getDescription ()Ljava/lang/String;
+	public fun getOp ()Ljava/lang/String;
+	public fun getTransactionNameSource ()Lio/sentry/protocol/TransactionNameSource;
+}
+
 public final class io/sentry/opentelemetry/SentryPropagator : io/opentelemetry/context/propagation/TextMapPropagator {
 	public fun <init> ()V
 	public fun extract (Lio/opentelemetry/context/Context;Ljava/lang/Object;Lio/opentelemetry/context/propagation/TextMapGetter;)Lio/opentelemetry/context/Context;

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentryPropagator.java → sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentryPropagator.java

@@ -26,18 +26,18 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public final class PotelSentryPropagator implements TextMapPropagator {
+public final class OtelSentryPropagator implements TextMapPropagator {
 
   private static final @NotNull List<String> FIELDS =
       Arrays.asList(SentryTraceHeader.SENTRY_TRACE_HEADER, BaggageHeader.BAGGAGE_HEADER);
   private final @NotNull SentryWeakSpanStorage spanStorage = SentryWeakSpanStorage.getInstance();
   private final @NotNull IScopes scopes;
 
-  public PotelSentryPropagator() {
+  public OtelSentryPropagator() {
     this(ScopesAdapter.getInstance());
   }
 
-  PotelSentryPropagator(final @NotNull IScopes scopes) {
+  OtelSentryPropagator(final @NotNull IScopes scopes) {
     this.scopes = scopes;
   }
 

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/PotelSentrySpanProcessor.java → sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/OtelSentrySpanProcessor.java

@@ -23,15 +23,15 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public final class PotelSentrySpanProcessor implements SpanProcessor {
+public final class OtelSentrySpanProcessor implements SpanProcessor {
   private final @NotNull SentryWeakSpanStorage spanStorage = SentryWeakSpanStorage.getInstance();
   private final @NotNull IScopes scopes;
 
-  public PotelSentrySpanProcessor() {
+  public OtelSentrySpanProcessor() {
     this(ScopesAdapter.getInstance());
   }
 
-  PotelSentrySpanProcessor(final @NotNull IScopes scopes) {
+  OtelSentrySpanProcessor(final @NotNull IScopes scopes) {
     this.scopes = scopes;
   }
 

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentryPropagator.java

@@ -24,7 +24,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @deprecated please use {@link PotelSentryPropagator} instead
+ * @deprecated please use {@link OtelSentryPropagator} instead
  */
 @Deprecated
 public final class SentryPropagator implements TextMapPropagator {

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySamplingResult.java

@@ -4,8 +4,10 @@
 import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;
 import io.sentry.TracesSamplingDecision;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 
+@ApiStatus.Internal
 public final class SentrySamplingResult implements SamplingResult {
   private final TracesSamplingDecision sentryDecision;
 

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java

@@ -64,7 +64,7 @@ public final class SentrySpanExporter implements SpanExporter {
           InternalSemanticAttributes.PARENT_SAMPLED.getKey());
   private static final @NotNull Long SPAN_TIMEOUT = DateUtils.secondsToNanos(5 * 60);
 
-  public static final String TRACE_ORIGIN = "auto.potel";
+  public static final String TRACE_ORIGIN = "auto.otel";
 
   public SentrySpanExporter() {
     this(ScopesAdapter.getInstance());

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanProcessor.java

@@ -40,7 +40,7 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * @deprecated please use {@link PotelSentrySpanProcessor} instead.
+ * @deprecated please use {@link OtelSentrySpanProcessor} instead.
  */
 @Deprecated
 public final class SentrySpanProcessor implements SpanProcessor {

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanNode.java

@@ -3,9 +3,11 @@
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class SpanNode {
   private final @NotNull String id;
   private @Nullable SpanData span;

sentry/src/main/java/io/sentry/DefaultScopesStorage.java

@@ -1,8 +1,10 @@
 package io.sentry;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class DefaultScopesStorage implements IScopesStorage {
 
   private static final @NotNull ThreadLocal<IScopes> currentScopes = new ThreadLocal<>();

sentry/src/main/java/io/sentry/IScopesStorage.java

@@ -1,8 +1,10 @@
 package io.sentry;
 
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public interface IScopesStorage {
 
   @NotNull

sentry/src/main/java/io/sentry/ScopesStorageFactory.java

@@ -2,9 +2,11 @@
 
 import io.sentry.util.LoadClass;
 import java.lang.reflect.InvocationTargetException;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+@ApiStatus.Internal
 public final class ScopesStorageFactory {
 
   private static final String OTEL_SCOPES_STORAGE =

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -2727,11 +2727,13 @@ private void addPackageInfo() {
         .addPackage("maven:io.sentry:sentry", BuildConfig.VERSION_NAME);
   }
 
+  @ApiStatus.Internal
   public @NotNull ISpanFactory getSpanFactory() {
     // TODO [POTEL] use a util for checking if OTel is active or similar
     return spanFactory;
   }
 
+  @ApiStatus.Internal
   public void setSpanFactory(final @NotNull ISpanFactory spanFactory) {
     this.spanFactory = spanFactory;
   }

sentry/src/main/java/io/sentry/SentrySpanFactoryHolder.java

@@ -14,6 +14,7 @@
  * into the bootstrap classloader, then this hack should no longer be necessary.
  */
 @ApiStatus.Experimental
+@ApiStatus.Internal
 public final class SentrySpanFactoryHolder {
 
   private static ISpanFactory spanFactory = new DefaultSpanFactory();