Skip to content

Commit 44c69ea

Browse files
jack-bergjack-berg
authored
Rename opentelemetry-extension-incubator to opentelemetry-api-incubator, merge opentelemetry-api-events (#6289)
1 parent 7926c45 commit 44c69ea

File tree

90 files changed

+120
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+120
-140
lines changed

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion

‎README.md

Lines changed: 7 additions & 8 deletions

‎api/events/build.gradle.kts

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎api/events/gradle.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎extensions/incubator/README.md renamed to ‎api/incubator/README.md

‎extensions/incubator/build.gradle.kts renamed to ‎api/incubator/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
}
88

99
description = "OpenTelemetry API Incubator"
10-
otelJava.moduleName.set("io.opentelemetry.extension.incubator")
10+
otelJava.moduleName.set("io.opentelemetry.api.incubator")
1111

1212
dependencies {
1313
api(project(":api:all"))

‎extensions/incubator/gradle.properties renamed to ‎api/incubator/gradle.properties

File renamed without changes.

‎extensions/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java renamed to ‎api/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package io.opentelemetry.extension.incubator;
77

8+
import io.opentelemetry.api.incubator.propagation.PassThroughPropagator;
89
import io.opentelemetry.api.trace.Span;
910
import io.opentelemetry.api.trace.SpanContext;
1011
import io.opentelemetry.api.trace.TraceFlags;
@@ -13,7 +14,6 @@
1314
import io.opentelemetry.context.Context;
1415
import io.opentelemetry.context.propagation.TextMapGetter;
1516
import io.opentelemetry.context.propagation.TextMapPropagator;
16-
import io.opentelemetry.extension.incubator.propagation.PassThroughPropagator;
1717
import java.util.Collections;
1818
import java.util.HashMap;
1919
import java.util.Map;

‎api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitter.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitter.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
import io.opentelemetry.api.common.Attributes;
99
import java.time.Instant;

‎api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitterProvider.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProvider.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
class DefaultEventEmitterProvider implements EventEmitterProvider {
99

‎api/events/src/main/java/io/opentelemetry/api/events/EventBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
import java.time.Instant;
99
import java.util.concurrent.TimeUnit;

‎api/events/src/main/java/io/opentelemetry/api/events/EventEmitter.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitter.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
import io.opentelemetry.api.common.Attributes;
99
import javax.annotation.concurrent.ThreadSafe;

‎api/events/src/main/java/io/opentelemetry/api/events/EventEmitterBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterBuilder.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
/**
99
* Builder class for creating {@link EventEmitter} instances.

‎api/events/src/main/java/io/opentelemetry/api/events/EventEmitterProvider.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterProvider.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
import javax.annotation.concurrent.ThreadSafe;
99

‎api/events/src/main/java/io/opentelemetry/api/events/GlobalEventEmitterProvider.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProvider.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.api.events;
6+
package io.opentelemetry.api.incubator.events;
77

88
import io.opentelemetry.api.GlobalOpenTelemetry;
99
import java.util.concurrent.atomic.AtomicReference;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValue.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import java.nio.ByteBuffer;
99
import java.util.List;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueArray.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import static java.util.stream.Collectors.joining;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBoolean.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import java.util.Objects;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBytes.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import java.nio.ByteBuffer;
99
import java.util.Arrays;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueDouble.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import java.util.Objects;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueLong.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import java.util.Objects;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueString.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import java.util.Objects;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueType.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
/**
99
* AnyValue type options, mirroring <a

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/ExtendedLogRecordBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/ExtendedLogRecordBuilder.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import io.opentelemetry.api.logs.LogRecordBuilder;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/KeyAnyValue.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValue.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
/**
99
* Key-value pair of {@link String} key and {@link AnyValue} value.

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/KeyAnyValueImpl.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueImpl.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import com.google.auto.value.AutoValue;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/KeyAnyValueList.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/KeyAnyValueList.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.extension.incubator.logs;
6+
package io.opentelemetry.api.incubator.logs;
77

88
import static java.util.stream.Collectors.joining;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/DoubleGauge.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/DoubleGauge.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.Attributes;
99
import javax.annotation.concurrent.ThreadSafe;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleCounterBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedDoubleCounterBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.DoubleCounterBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleGaugeBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedDoubleGaugeBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.DoubleGaugeBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleHistogramBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedDoubleHistogramBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.DoubleHistogramBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleUpDownCounterBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedDoubleUpDownCounterBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongCounterBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedLongCounterBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.LongCounterBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongGaugeBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedLongGaugeBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.LongGaugeBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongHistogramBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedLongHistogramBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.LongHistogramBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongUpDownCounterBuilder.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/ExtendedLongUpDownCounterBuilder.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.AttributeKey;
99
import io.opentelemetry.api.metrics.LongUpDownCounterBuilder;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/LongGauge.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/LongGauge.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.extension.incubator.metrics;
6+
package io.opentelemetry.api.incubator.metrics;
77

88
import io.opentelemetry.api.common.Attributes;
99
import javax.annotation.concurrent.ThreadSafe;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/propagation/CaseInsensitiveMap.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/propagation/CaseInsensitiveMap.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.extension.incubator.propagation;
6+
package io.opentelemetry.api.incubator.propagation;
77

88
import java.util.HashMap;
99
import java.util.Locale;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/propagation/ExtendedContextPropagators.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/propagation/ExtendedContextPropagators.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.extension.incubator.propagation;
6+
package io.opentelemetry.api.incubator.propagation;
77

88
import io.opentelemetry.api.OpenTelemetry;
99
import io.opentelemetry.context.Context;

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/propagation/PassThroughPropagator.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/propagation/PassThroughPropagator.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.extension.incubator.propagation;
6+
package io.opentelemetry.api.incubator.propagation;
77

88
import static java.util.Objects.requireNonNull;
99

‎extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/ExtendedSpan.java renamed to ‎api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/ExtendedSpan.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.extension.incubator.trace;
6+
package io.opentelemetry.api.incubator.trace;
77

88
import io.opentelemetry.api.common.Attributes;
99
import io.opentelemetry.api.trace.Span;

0 commit comments

Comments
 (0)