Skip to content

Commit

Permalink
Renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@trask
trask committed Jul 15, 2024
1 parent 7099d96 commit 0461f57
Show file tree
Hide file tree
Showing 65 changed files with 132 additions and 132 deletions.
4 changes: 2 additions & 2 deletions docs/apidiffs/current_vs_latest/opentelemetry-spring-boot-autoconfigure-2.txt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Comparing source compatibility of opentelemetry-spring-2.6.0-SNAPSHOT.jar against
+++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.v2.OpenTelemetryAutoConfiguration (not serializable)
+++ NEW CLASS: PUBLIC(+) io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.OpenTelemetryAutoConfiguration (not serializable)
+++ CLASS FILE FORMAT VERSION: 52.0 <- n.a.
+++ NEW SUPERCLASS: java.lang.Object
+++ NEW CONSTRUCTOR: PUBLIC(+) OpenTelemetryAutoConfiguration()
+++ NEW ANNOTATION: org.springframework.context.annotation.Configuration
+++ NEW ANNOTATION: org.springframework.boot.context.properties.EnableConfigurationProperties
+++ NEW ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties (+)
+++ NEW ELEMENT: value=io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties,io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties (+)
18 changes: 9 additions & 9 deletions ...re/v2/OpenTelemetryAutoConfiguration.java → .../v2_7/OpenTelemetryAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.TracerProvider;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.MapConverter;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.SdkEnabled;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtelResourceProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.OtlpExporterProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.PropagationProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.SpringConfigProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources.DistroVersionResourceProvider;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.resources.SpringResourceProvider;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.MapConverter;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.SdkEnabled;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtelResourceProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.OtlpExporterProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.PropagationProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.SpringConfigProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources.DistroVersionResourceProvider;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.resources.SpringResourceProvider;
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
import io.opentelemetry.sdk.autoconfigure.internal.AutoConfigureUtil;
import io.opentelemetry.sdk.autoconfigure.internal.ComponentLoader;
Expand Down
2 changes: 1 addition & 1 deletion .../ConditionalOnEnabledInstrumentation.java → .../ConditionalOnEnabledInstrumentation.java
View file
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.spring.autoconfigure.v2.internal;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal;

import io.opentelemetry.api.OpenTelemetry;
import java.lang.annotation.ElementType;
Expand Down
2 changes: 1 addition & 1 deletion ...ernal/InstrumentationPropertyEnabled.java → ...ernal/InstrumentationPropertyEnabled.java
View file
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.spring.autoconfigure.v2.internal;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal;

import java.util.Map;
import org.springframework.context.annotation.Condition;
Expand Down
2 changes: 1 addition & 1 deletion ...toconfigure/v2/internal/MapConverter.java → ...configure/v2_7/internal/MapConverter.java
View file
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.spring.autoconfigure.v2.internal;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal;

import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion ...autoconfigure/v2/internal/SdkEnabled.java → ...toconfigure/v2_7/internal/SdkEnabled.java
View file
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.spring.autoconfigure.v2.internal;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal;

import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand Down
4 changes: 2 additions & 2 deletions ...entationAnnotationsAutoConfiguration.java → ...entationAnnotationsAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.annotations;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.annotations.WithSpan;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
Expand Down
2 changes: 1 addition & 1 deletion ...ations/InstrumentationWithSpanAspect.java → ...ations/InstrumentationWithSpanAspect.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.annotations;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations;

import io.opentelemetry.api.OpenTelemetry;
import org.aspectj.lang.ProceedingJoinPoint;
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/annotations/JoinPointRequest.java → ...ntation/annotations/JoinPointRequest.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.annotations;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations;

import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.instrumentation.annotations.WithSpan;
Expand Down
2 changes: 1 addition & 1 deletion ...ns/JointPointCodeAttributesExtractor.java → ...ns/JointPointCodeAttributesExtractor.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.annotations;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations;

import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;

Expand Down
2 changes: 1 addition & 1 deletion ...mentation/annotations/WithSpanAspect.java → ...mentation/annotations/WithSpanAspect.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.annotations;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span;
Expand Down
2 changes: 1 addition & 1 deletion ...pectParameterAttributeNamesExtractor.java → ...pectParameterAttributeNamesExtractor.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.annotations;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.annotations;

import io.opentelemetry.instrumentation.annotations.SpanAttribute;
import io.opentelemetry.instrumentation.api.annotation.support.ParameterAttributeNamesExtractor;
Expand Down
4 changes: 2 additions & 2 deletions ...ntation/jdbc/DataSourcePostProcessor.java → ...ntation/jdbc/DataSourcePostProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.jdbc;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.jdbc;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.jdbc.datasource.JdbcTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import javax.sql.DataSource;
import org.springframework.aop.scope.ScopedProxyUtils;
Expand Down
4 changes: 2 additions & 2 deletions ...JdbcInstrumentationAutoConfiguration.java → ...JdbcInstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.jdbc;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.jdbc;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import javax.sql.DataSource;
import org.springframework.beans.factory.ObjectProvider;
Expand Down
2 changes: 1 addition & 1 deletion ...istenerContainerFactoryPostProcessor.java → ...istenerContainerFactoryPostProcessor.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.kafka;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.kafka.v2_7.SpringKafkaTelemetry;
Expand Down
4 changes: 2 additions & 2 deletions ...afkaInstrumentationAutoConfiguration.java → ...afkaInstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.kafka;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.kafka;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.kafkaclients.v2_6.KafkaTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down
2 changes: 1 addition & 1 deletion ...g/LogbackAppenderApplicationListener.java → ...g/LogbackAppenderApplicationListener.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.logging;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
Expand Down
2 changes: 1 addition & 1 deletion ...ion/logging/LogbackAppenderInstaller.java → ...ion/logging/LogbackAppenderInstaller.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.logging;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging;

import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent;
Expand Down
4 changes: 2 additions & 2 deletions ...enTelemetryAppenderAutoConfiguration.java → ...enTelemetryAppenderAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.logging;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.logging;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationListener;
Expand Down
4 changes: 2 additions & 2 deletions ...er/MicrometerBridgeAutoConfiguration.java → ...er/MicrometerBridgeAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.micrometer;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.micrometer;

import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.MeterRegistry;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
Expand Down
6 changes: 3 additions & 3 deletions ...ientInstrumentationAutoConfiguration.java → ...ientInstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.mongo;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.mongo;

import com.mongodb.MongoClientSettings;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.mongo.v3_1.MongoTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down
4 changes: 2 additions & 2 deletions ...2dbcInstrumentationAutoConfiguration.java → ...2dbcInstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.r2dbc.spi.ConnectionFactory;
import org.springframework.beans.factory.ObjectProvider;
Expand Down
4 changes: 2 additions & 2 deletions ...2dbc/R2dbcInstrumentingPostProcessor.java → ...2dbc/R2dbcInstrumentingPostProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.r2dbc;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.r2dbc;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.r2dbc.v1_0.internal.shaded.R2dbcTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import io.r2dbc.spi.ConnectionFactory;
import io.r2dbc.spi.ConnectionFactoryOptions;
Expand Down
2 changes: 1 addition & 1 deletion ...on/web/RestTemplateBeanPostProcessor.java → ...on/web/RestTemplateBeanPostProcessor.java
View file
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.spring.autoconfigure.v2.internal.instrumentation.web;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
Expand Down
4 changes: 2 additions & 2 deletions ...tion/web/RestTemplateInstrumentation.java → ...tion/web/RestTemplateInstrumentation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web;

import com.google.errorprone.annotations.CanIgnoreReturnValue;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.web.v3_1.SpringWebTelemetry;
import io.opentelemetry.instrumentation.spring.web.v3_1.internal.WebTelemetryUtil;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
Expand Down
4 changes: 2 additions & 2 deletions ...gWebInstrumentationAutoConfiguration.java → ...gWebInstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.web;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.web;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down
4 changes: 2 additions & 2 deletions ...fluxInstrumentationAutoConfiguration.java → ...fluxInstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down
4 changes: 2 additions & 2 deletions ...n/webflux/WebClientBeanPostProcessor.java → ...n/webflux/WebClientBeanPostProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webflux;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webflux;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.webflux.v5_3.SpringWebfluxTelemetry;
import io.opentelemetry.instrumentation.spring.webflux.v5_3.internal.SpringWebfluxBuilderUtil;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
Expand Down
6 changes: 3 additions & 3 deletions ...Mvc5InstrumentationAutoConfiguration.java → ...Mvc5InstrumentationAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.instrumentation.webmvc;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.instrumentation.webmvc;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.ConditionalOnEnabledInstrumentation;
import io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties.InstrumentationConfigUtil;
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.SpringWebMvcTelemetry;
import io.opentelemetry.instrumentation.spring.webmvc.v5_3.internal.SpringMvcBuilderUtil;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
Expand Down
2 changes: 1 addition & 1 deletion ...al/properties/ConfigPropertiesBridge.java → ...al/properties/ConfigPropertiesBridge.java
View file
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.spring.autoconfigure.v2.internal.properties;
package io.opentelemetry.instrumentation.spring.autoconfigure.v2_7.internal.properties;

import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
Expand Down
Loading

0 comments on commit 0461f57

Please sign in to comment.