From 67b6013e99687d1530d3ffae52456aba5f52d1cf Mon Sep 17 00:00:00 2001 From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:25:49 +0800 Subject: [PATCH] deps: reverts to zipkin-reporter 2.x (#1403) After integrating with Sleuth and Otel, it seems hastey to manage the zipkin-reporter to 3.0. The reason is both projects end up sharing classpath between Brave and reporter types. Since Brave doesn't care about this version anyway, it can leave it at the prior and remove tension. Brave 6 will completely remove zipkin version management, anyway. Following this change, I will cut a release-5.18.1 tag. Signed-off-by: Adrian Cole --- brave-bom/pom.xml | 4 ++-- brave-tests/pom.xml | 2 +- .../java/brave/test/propagation/CurrentTraceContextTest.java | 2 +- .../java/brave/test/propagation/PropagationSetterTest.java | 2 +- .../src/main/java/brave/test/propagation/PropagationTest.java | 2 +- .../src/main/java/brave/test/util/AssertableCallback.java | 2 +- .../src/test/java/brave/propagation/B3PropagationTest.java | 2 +- .../test/java/brave/propagation/B3SinglePropagationTest.java | 2 +- brave/pom.xml | 2 +- brave/src/main/java/brave/ErrorParser.java | 2 +- brave/src/main/java/brave/Response.java | 2 +- brave/src/main/java/brave/Span.java | 2 +- brave/src/main/java/brave/Tags.java | 2 +- brave/src/main/java/brave/Tracer.java | 2 +- brave/src/main/java/brave/Tracing.java | 2 +- brave/src/main/java/brave/baggage/BaggageField.java | 2 +- brave/src/main/java/brave/handler/FinishedSpanHandler.java | 2 +- brave/src/main/java/brave/handler/MutableSpan.java | 2 +- .../src/main/java/brave/handler/MutableSpanBytesEncoder.java | 2 +- brave/src/main/java/brave/internal/baggage/BaggageCodec.java | 2 +- .../main/java/brave/internal/baggage/ExtraBaggageContext.java | 2 +- .../java/brave/internal/baggage/SingleFieldBaggageCodec.java | 2 +- brave/src/main/java/brave/internal/codec/WriteBuffer.java | 2 +- brave/src/main/java/brave/internal/collect/LongBitSet.java | 2 +- brave/src/main/java/brave/internal/extra/MapExtra.java | 2 +- brave/src/main/java/brave/propagation/B3Propagation.java | 2 +- .../src/main/java/brave/propagation/ExtraFieldCustomizer.java | 2 +- brave/src/main/java/brave/propagation/SamplingFlags.java | 2 +- brave/src/main/java/brave/propagation/TraceContext.java | 2 +- .../java/brave/propagation/TraceContextOrSamplingFlags.java | 2 +- brave/src/main/java/brave/propagation/TraceIdContext.java | 2 +- brave/src/main/java/brave/sampler/DeclarativeSampler.java | 2 +- brave/src/main/java/brave/sampler/ParameterizedSampler.java | 2 +- brave/src/test/java/brave/CurrentSpanCustomizerTest.java | 2 +- .../java/brave/CurrentTraceContextExecutorServiceTest.java | 2 +- .../src/test/java/brave/CurrentTraceContextExecutorTest.java | 2 +- brave/src/test/java/brave/ErrorParserTest.java | 2 +- brave/src/test/java/brave/LazySpanTest.java | 2 +- brave/src/test/java/brave/NoopSpanTest.java | 2 +- brave/src/test/java/brave/RealSpanTest.java | 2 +- brave/src/test/java/brave/TagTest.java | 2 +- brave/src/test/java/brave/TagsTest.java | 2 +- brave/src/test/java/brave/baggage/BaggageFieldTest.java | 2 +- brave/src/test/java/brave/baggage/BaggagePropagationTest.java | 2 +- .../java/brave/baggage/CorrelationScopeDecoratorTest.java | 2 +- .../test/java/brave/features/baggage/SingleHeaderCodec.java | 2 +- .../brave/features/handler/MutableSpanAsyncReporterTest.java | 2 +- .../java/brave/features/handler/SpanMetricsCustomizer.java | 2 +- brave/src/test/java/brave/handler/MutableSpanTest.java | 2 +- .../src/test/java/brave/internal/InternalPropagationTest.java | 2 +- .../internal/propagation/StringPropagationAdapterTest.java | 2 +- .../test/java/brave/internal/recorder/PendingSpansTest.java | 2 +- brave/src/test/java/brave/propagation/B3PropagationTest.java | 2 +- .../java/brave/propagation/ExtraFieldPropagationTest.java | 2 +- .../test/java/brave/propagation/PropagationConstantsTest.java | 2 +- .../test/java/brave/propagation/PropagationFactoryTest.java | 2 +- brave/src/test/java/brave/propagation/SamplingFlagsTest.java | 2 +- .../test/java/brave/propagation/StrictScopeDecoratorTest.java | 2 +- .../brave/propagation/TraceContextOrSamplingFlagsTest.java | 2 +- brave/src/test/java/brave/propagation/TraceContextTest.java | 2 +- brave/src/test/java/brave/sampler/DeclarativeSamplerTest.java | 2 +- .../src/test/java/brave/sampler/ParameterizedSamplerTest.java | 2 +- context/jfr/pom.xml | 2 +- .../test/java/brave/context/jfr/JfrScopeDecoratorTest.java | 2 +- context/log4j12/pom.xml | 2 +- .../java/brave/context/log4j12/MDCCurrentTraceContext.java | 2 +- .../main/java/brave/context/log4j12/MDCScopeDecorator.java | 2 +- .../brave/context/log4j12/MDCCurrentTraceContextTest.java | 2 +- context/log4j2/pom.xml | 2 +- .../context/log4j2/ThreadContextCurrentTraceContext.java | 2 +- .../brave/context/log4j2/ThreadContextScopeDecorator.java | 2 +- .../context/log4j2/ThreadContextCurrentTraceContextTest.java | 2 +- context/pom.xml | 2 +- .../rxjava2/internal/TraceContextCallableCompletable.java | 2 +- .../rxjava2/internal/TraceContextCallableFlowable.java | 2 +- .../context/rxjava2/internal/TraceContextCallableMaybe.java | 2 +- .../rxjava2/internal/TraceContextCallableObservable.java | 2 +- .../context/rxjava2/internal/TraceContextCallableSingle.java | 2 +- .../context/rxjava2/internal/TraceContextCompletable.java | 2 +- .../rxjava2/internal/TraceContextCompletableObserver.java | 2 +- .../rxjava2/internal/TraceContextConnectableFlowable.java | 2 +- .../rxjava2/internal/TraceContextConnectableObservable.java | 2 +- .../brave/context/rxjava2/internal/TraceContextFlowable.java | 2 +- .../rxjava2/internal/TraceContextFlowableSubscriber.java | 2 +- .../brave/context/rxjava2/internal/TraceContextMaybe.java | 2 +- .../context/rxjava2/internal/TraceContextMaybeObserver.java | 2 +- .../context/rxjava2/internal/TraceContextObservable.java | 2 +- .../brave/context/rxjava2/internal/TraceContextObserver.java | 2 +- .../rxjava2/internal/TraceContextParallelFlowable.java | 2 +- .../brave/context/rxjava2/internal/TraceContextSingle.java | 2 +- .../context/rxjava2/internal/TraceContextSingleObserver.java | 2 +- .../context/rxjava2/internal/TraceContextSubscriber.java | 2 +- .../src/main/java/brave/context/rxjava2/internal/Util.java | 2 +- .../main/java/brave/context/rxjava2/internal/Wrappers.java | 2 +- .../CurrentTraceContextAssemblyTrackingClassLoaderTest.java | 2 +- .../CurrentTraceContextAssemblyTrackingMatrixTest.java | 2 +- .../rxjava2/CurrentTraceContextAssemblyTrackingTest.java | 2 +- .../test/java/brave/context/rxjava2/NotYetSupportedTest.java | 2 +- .../brave/context/rxjava2/features/ITRetrofitRxJava2.java | 2 +- context/slf4j/pom.xml | 2 +- .../main/java/brave/context/slf4j/MDCCurrentTraceContext.java | 2 +- .../src/main/java/brave/context/slf4j/MDCScopeDecorator.java | 2 +- .../java/brave/context/slf4j/MDCCurrentTraceContextTest.java | 2 +- instrumentation/benchmarks/pom.xml | 2 +- .../main/java/brave/baggage/BaggagePropagationBenchmarks.java | 2 +- .../src/main/java/brave/grpc/GrpcPropagationBenchmarks.java | 2 +- .../brave/grpc/TraceContextBinaryMarshallerBenchmarks.java | 2 +- .../src/main/java/brave/http/HttpClientBenchmarks.java | 2 +- .../main/java/brave/jersey/server/JerseyServerBenchmarks.java | 2 +- .../src/main/java/brave/jms/JmsMessageProducerBenchmarks.java | 2 +- .../java/brave/kafka/clients/TracingProducerBenchmarks.java | 2 +- .../main/java/brave/netty/http/NettyHttpServerBenchmarks.java | 2 +- .../main/java/brave/propagation/B3PropagationBenchmarks.java | 2 +- .../java/brave/propagation/CurrentTraceContextBenchmarks.java | 2 +- .../src/main/java/brave/servlet/ServletBenchmarks.java | 2 +- .../src/main/java/brave/sparkjava/SparkBenchmarks.java | 2 +- .../spring/rabbit/TracingMessagePostProcessorBenchmarks.java | 2 +- .../src/main/java/brave/dubbo/rpc/DubboClientRequest.java | 2 +- .../src/main/java/brave/dubbo/rpc/DubboClientResponse.java | 2 +- .../dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboParser.java | 2 +- .../dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboRequest.java | 2 +- .../src/main/java/brave/dubbo/rpc/DubboResponse.java | 2 +- .../src/main/java/brave/dubbo/rpc/DubboServerRequest.java | 2 +- .../src/main/java/brave/dubbo/rpc/DubboServerResponse.java | 2 +- .../dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpan.java | 2 +- .../main/java/brave/dubbo/rpc/FinishSpanResponseFuture.java | 2 +- .../main/java/brave/dubbo/rpc/TracingResponseCallback.java | 2 +- .../src/test/java/brave/dubbo/rpc/DubboClientRequestTest.java | 2 +- .../test/java/brave/dubbo/rpc/DubboClientResponseTest.java | 2 +- .../src/test/java/brave/dubbo/rpc/DubboParserTest.java | 2 +- .../src/test/java/brave/dubbo/rpc/DubboServerRequestTest.java | 2 +- .../test/java/brave/dubbo/rpc/DubboServerResponseTest.java | 2 +- .../src/test/java/brave/dubbo/rpc/FinishSpanTest.java | 2 +- .../src/test/java/brave/dubbo/rpc/GraterService.java | 2 +- .../src/test/java/brave/dubbo/rpc/GreeterService.java | 2 +- .../test/java/brave/dubbo/rpc/ITTracingFilter_Provider.java | 2 +- .../src/test/java/brave/dubbo/rpc/PickUnusedPort.java | 2 +- .../dubbo-rpc/src/test/java/brave/dubbo/rpc/TestServer.java | 2 +- .../java/brave/dubbo/rpc/TracingResponseCallbackTest.java | 2 +- instrumentation/dubbo/pom.xml | 2 +- .../dubbo/src/main/java/brave/dubbo/TracingFilter.java | 2 +- .../src/test/java/brave/dubbo/ITTracingFilter_Provider.java | 2 +- .../dubbo/src/test/java/brave/dubbo/TestServer.java | 2 +- instrumentation/grpc/pom.xml | 2 +- .../grpc/src/main/java/brave/grpc/GrpcClientParser.java | 2 +- instrumentation/grpc/src/main/java/brave/grpc/GrpcParser.java | 2 +- .../grpc/src/main/java/brave/grpc/GrpcPropagation.java | 2 +- .../grpc/src/main/java/brave/grpc/GrpcServerParser.java | 2 +- .../grpc/src/main/java/brave/grpc/GrpcTracing.java | 2 +- .../grpc/src/main/java/brave/grpc/MessageProcessor.java | 2 +- .../src/main/java/brave/grpc/TraceContextBinaryFormat.java | 2 +- .../src/main/java/brave/grpc/TracingClientInterceptor.java | 2 +- .../src/main/java/brave/grpc/TracingServerInterceptor.java | 2 +- .../test/java/brave/grpc/BaseITTracingClientInterceptor.java | 2 +- .../test/java/brave/grpc/BaseITTracingServerInterceptor.java | 2 +- .../grpc/src/test/java/brave/grpc/GreeterImpl.java | 2 +- .../grpc/src/test/java/brave/grpc/GrpcParserTest.java | 2 +- instrumentation/grpc/src/test/java/brave/grpc/TestServer.java | 2 +- .../test/java/brave/grpc/TraceContextBinaryFormatTest.java | 2 +- instrumentation/http-tests-jakarta/pom.xml | 2 +- .../java/brave/test/jakarta/http/ITServlet5Container.java | 2 +- .../java/brave/test/jakarta/http/Jetty11ServerController.java | 2 +- instrumentation/http-tests/pom.xml | 2 +- .../src/main/java/brave/test/http/ITHttpClient.java | 2 +- .../src/main/java/brave/test/http/ITHttpServer.java | 2 +- .../test/java/brave/http/features/RequestSamplingTest.java | 2 +- .../src/test/java/brave/http/features/TracingDispatcher.java | 2 +- .../src/test/java/brave/http/features/TracingInterceptor.java | 2 +- instrumentation/http/pom.xml | 2 +- .../http/src/main/java/brave/http/HttpAdapter.java | 2 +- .../http/src/main/java/brave/http/HttpClientAdapter.java | 2 +- .../http/src/main/java/brave/http/HttpClientAdapters.java | 2 +- .../http/src/main/java/brave/http/HttpClientHandler.java | 2 +- .../http/src/main/java/brave/http/HttpClientParser.java | 2 +- .../src/main/java/brave/http/HttpClientParserAdapter.java | 2 +- .../http/src/main/java/brave/http/HttpHandler.java | 2 +- instrumentation/http/src/main/java/brave/http/HttpParser.java | 2 +- .../src/main/java/brave/http/HttpRequestParserAdapters.java | 2 +- .../http/src/main/java/brave/http/HttpResponseParser.java | 2 +- .../src/main/java/brave/http/HttpResponseParserAdapters.java | 2 +- .../http/src/main/java/brave/http/HttpRuleSampler.java | 2 +- .../http/src/main/java/brave/http/HttpSampler.java | 2 +- .../http/src/main/java/brave/http/HttpServerAdapter.java | 2 +- .../http/src/main/java/brave/http/HttpServerAdapters.java | 2 +- .../http/src/main/java/brave/http/HttpServerHandler.java | 2 +- .../http/src/main/java/brave/http/HttpServerParser.java | 2 +- .../src/main/java/brave/http/HttpServerParserAdapter.java | 2 +- .../http/src/main/java/brave/http/HttpTracing.java | 2 +- .../test/java/brave/http/DeprecatedHttpClientHandlerTest.java | 2 +- .../test/java/brave/http/DeprecatedHttpServerHandlerTest.java | 2 +- .../http/src/test/java/brave/http/HttpAdaptersTest.java | 2 +- .../http/src/test/java/brave/http/HttpClientAdaptersTest.java | 2 +- .../http/src/test/java/brave/http/HttpClientHandlerTest.java | 2 +- .../http/src/test/java/brave/http/HttpParserTest.java | 2 +- .../test/java/brave/http/HttpRequestParserAdaptersTest.java | 2 +- .../test/java/brave/http/HttpResponseParserAdaptersTest.java | 2 +- .../http/src/test/java/brave/http/HttpRuleSamplerTest.java | 2 +- .../http/src/test/java/brave/http/HttpSamplerTest.java | 2 +- .../http/src/test/java/brave/http/HttpServerAdapterTest.java | 2 +- .../http/src/test/java/brave/http/HttpServerAdaptersTest.java | 2 +- .../http/src/test/java/brave/http/HttpServerHandlerTest.java | 2 +- .../http/src/test/java/brave/http/HttpTracingTest.java | 2 +- instrumentation/httpasyncclient/pom.xml | 2 +- .../brave/httpasyncclient/TracingHttpAsyncClientBuilder.java | 2 +- instrumentation/httpclient/pom.xml | 2 +- .../src/main/java/brave/httpclient/TracingMainExec.java | 2 +- .../src/main/java/brave/httpclient/TracingProtocolExec.java | 2 +- instrumentation/httpclient5/pom.xml | 2 +- .../main/java/brave/httpclient5/AsyncHandleSendHandler.java | 3 +-- .../src/main/java/brave/httpclient5/HandleReceiveHandler.java | 3 +-- instrumentation/jakarta-jms/pom.xml | 2 +- instrumentation/jaxrs2/pom.xml | 2 +- instrumentation/jersey-server/pom.xml | 2 +- .../brave/jersey/server/TracingApplicationEventListener.java | 2 +- instrumentation/jms-jakarta/pom.xml | 2 +- .../src/main/java/brave/jakarta/jms/JmsTracing.java | 2 +- .../src/main/java/brave/jakarta/jms/PropertyFilter.java | 2 +- .../java/brave/jakarta/jms/TracingCompletionListener.java | 2 +- .../main/java/brave/jakarta/jms/TracingExceptionListener.java | 2 +- .../src/main/java/brave/jakarta/jms/TracingJMSContext.java | 2 +- .../src/main/java/brave/jakarta/jms/TracingJMSProducer.java | 2 +- .../main/java/brave/jakarta/jms/TracingMessageListener.java | 2 +- .../src/main/java/brave/jakarta/jms/TracingSession.java | 2 +- .../src/test/java/brave/jakarta/jms/JmsTracingTest.java | 2 +- .../java/brave/jakarta/jms/TracingCompletionListenerTest.java | 2 +- .../test/java/brave/jakarta/jms/TracingJMSConsumerTest.java | 2 +- instrumentation/jms/pom.xml | 2 +- instrumentation/jms/src/main/java/brave/jms/JmsTracing.java | 2 +- .../jms/src/main/java/brave/jms/PropertyFilter.java | 2 +- .../src/main/java/brave/jms/TracingCompletionListener.java | 2 +- .../jms/src/main/java/brave/jms/TracingExceptionListener.java | 2 +- .../jms/src/main/java/brave/jms/TracingJMSProducer.java | 2 +- .../jms/src/main/java/brave/jms/TracingMessageListener.java | 2 +- .../test/java/brave/jms/ITJms_1_1_TracingMessageConsumer.java | 2 +- .../test/java/brave/jms/ITJms_1_1_TracingMessageProducer.java | 2 +- .../test/java/brave/jms/ITJms_2_0_TracingMessageConsumer.java | 2 +- .../test/java/brave/jms/ITJms_2_0_TracingMessageProducer.java | 2 +- .../jms/src/test/java/brave/jms/ITTracingJMSConsumer.java | 2 +- .../jms/src/test/java/brave/jms/ITTracingJMSProducer.java | 2 +- .../jms/src/test/java/brave/jms/JmsTracingTest.java | 2 +- .../test/java/brave/jms/TracingCompletionListenerTest.java | 2 +- .../jms/src/test/java/brave/jms/TracingJMSConsumerTest.java | 2 +- instrumentation/kafka-clients/pom.xml | 2 +- .../src/main/java/brave/kafka/clients/KafkaTracing.java | 2 +- .../src/main/java/brave/kafka/clients/TracingCallback.java | 2 +- .../src/main/java/brave/kafka/clients/TracingProducer.java | 2 +- .../src/test/java/brave/kafka/clients/KafkaTracingTest.java | 2 +- instrumentation/kafka-streams/pom.xml | 2 +- .../java/brave/kafka/streams/AbstractTracingTransformer.java | 2 +- .../brave/kafka/streams/AbstractTracingValueTransformer.java | 2 +- .../kafka/streams/AbstractTracingValueTransformerWithKey.java | 2 +- .../src/main/java/brave/kafka/streams/KafkaStreamsTags.java | 2 +- .../main/java/brave/kafka/streams/KafkaStreamsTracing.java | 2 +- .../src/main/java/brave/kafka/streams/TracingFilter.java | 2 +- .../java/brave/kafka/streams/TracingFilterTransformer.java | 2 +- .../brave/kafka/streams/TracingFilterTransformerSupplier.java | 2 +- .../kafka/streams/TracingFilterValueTransformerWithKey.java | 2 +- .../streams/TracingFilterValueTransformerWithKeySupplier.java | 2 +- .../java/brave/kafka/streams/TracingKafkaClientSupplier.java | 2 +- .../src/main/java/brave/kafka/streams/TracingProcessor.java | 2 +- .../java/brave/kafka/streams/TracingProcessorSupplier.java | 2 +- .../src/main/java/brave/kafka/streams/TracingTransformer.java | 2 +- .../java/brave/kafka/streams/TracingTransformerSupplier.java | 2 +- .../java/brave/kafka/streams/TracingV2FixedKeyProcessor.java | 2 +- .../src/main/java/brave/kafka/streams/TracingV2Processor.java | 2 +- .../java/brave/kafka/streams/TracingValueTransformer.java | 2 +- .../brave/kafka/streams/TracingValueTransformerSupplier.java | 2 +- .../brave/kafka/streams/TracingValueTransformerWithKey.java | 2 +- .../kafka/streams/TracingValueTransformerWithKeySupplier.java | 2 +- .../test/java/brave/kafka/streams/ITKafkaStreamsTracing.java | 2 +- .../src/test/java/brave/kafka/streams/KafkaStreamsTest.java | 2 +- .../java/brave/kafka/streams/KafkaStreamsTracingTest.java | 2 +- .../brave/kafka/streams/TracingKafkaClientSupplierTests.java | 2 +- instrumentation/messaging/pom.xml | 2 +- .../src/main/java/brave/messaging/ConsumerRequest.java | 2 +- .../src/main/java/brave/messaging/MessagingTracing.java | 2 +- .../src/test/java/brave/messaging/MessagingTracingTest.java | 2 +- instrumentation/mongodb/pom.xml | 2 +- instrumentation/mysql/pom.xml | 2 +- instrumentation/mysql6/pom.xml | 2 +- instrumentation/mysql8/pom.xml | 2 +- instrumentation/netty-codec-http/pom.xml | 2 +- instrumentation/okhttp3/pom.xml | 2 +- .../src/main/java/brave/okhttp3/TracingInterceptor.java | 2 +- .../src/test/java/brave/okhttp3/features/ITRetrofit.java | 2 +- .../src/main/java/brave/p6spy/TracingJdbcEventListener.java | 2 +- .../p6spy/src/main/java/brave/p6spy/TracingP6SpyOptions.java | 2 +- .../p6spy/src/test/java/brave/p6spy/DerbyUtils.java | 2 +- .../p6spy/src/test/java/brave/p6spy/ITTracingP6Factory.java | 2 +- .../test/java/brave/p6spy/TracingJdbcEventListenerTest.java | 2 +- instrumentation/pom.xml | 2 +- instrumentation/rpc/pom.xml | 2 +- .../rpc/src/main/java/brave/rpc/RpcClientHandler.java | 2 +- .../rpc/src/main/java/brave/rpc/RpcServerHandler.java | 2 +- instrumentation/rpc/src/main/java/brave/rpc/RpcTracing.java | 2 +- .../rpc/src/test/java/brave/rpc/RpcClientHandlerTest.java | 2 +- .../rpc/src/test/java/brave/rpc/RpcTracingTest.java | 2 +- instrumentation/servlet-jakarta/pom.xml | 2 +- .../src/main/java/brave/jakarta/servlet/TracingFilter.java | 2 +- .../java/brave/jakarta/servlet/internal/ServletRuntime.java | 2 +- .../brave/jakarta/servlet/HttpServletRequestWrapperTest.java | 2 +- .../brave/jakarta/servlet/HttpServletResponseWrapperTest.java | 2 +- .../src/test/java/brave/jakarta/servlet/ITTracingFilter.java | 2 +- instrumentation/servlet/pom.xml | 2 +- .../src/main/java/brave/servlet/HttpServletAdapter.java | 2 +- .../src/main/java/brave/servlet/internal/ServletRuntime.java | 2 +- .../src/test/java/brave/servlet/HttpServletAdapterTest.java | 2 +- .../src/test/java/brave/sparkjava/ITSparkTracing.java | 2 +- .../src/test/java/brave/sparkjava/ITTracingFilter.java | 2 +- .../src/test/java/brave/sparkjava/TestApplication.java | 2 +- instrumentation/spring-rabbit/pom.xml | 2 +- .../main/java/brave/spring/rabbit/MessageConsumerRequest.java | 2 +- .../main/java/brave/spring/rabbit/SpringRabbitTracing.java | 2 +- .../java/brave/spring/rabbit/TracingRabbitListenerAdvice.java | 2 +- .../test/java/brave/spring/rabbit/ITSpringRabbitTracing.java | 2 +- .../java/brave/spring/rabbit/SpringRabbitTracingTest.java | 2 +- .../brave/spring/rabbit/TracingRabbitListenerAdviceTest.java | 2 +- instrumentation/spring-web/pom.xml | 2 +- .../spring/web/TracingAsyncClientHttpRequestInterceptor.java | 2 +- .../brave/spring/web/TracingClientHttpRequestInterceptor.java | 2 +- instrumentation/spring-webmvc/pom.xml | 2 +- .../webmvc/ITSpanCustomizingAsyncHandlerInterceptor.java | 2 +- instrumentation/vertx-web/pom.xml | 2 +- .../java/brave/vertx/web/TracingRoutingContextHandler.java | 2 +- pom.xml | 4 ++-- spring-beans/pom.xml | 2 +- .../src/main/java/brave/spring/beans/EndpointFactoryBean.java | 2 +- .../brave/spring/beans/ExtraFieldPropagationFactoryBean.java | 2 +- .../main/java/brave/spring/beans/HttpTracingFactoryBean.java | 2 +- .../java/brave/spring/beans/MessagingTracingFactoryBean.java | 2 +- .../main/java/brave/spring/beans/RpcTracingFactoryBean.java | 2 +- .../src/main/java/brave/spring/beans/TracingFactoryBean.java | 2 +- .../brave/spring/beans/BaggagePropagationFactoryBeanTest.java | 2 +- .../test/java/brave/spring/beans/EndpointFactoryBeanTest.java | 2 +- .../spring/beans/ExtraFieldPropagationFactoryBeanTest.java | 2 +- .../java/brave/spring/beans/HttpTracingFactoryBeanTest.java | 2 +- .../brave/spring/beans/MessagingTracingFactoryBeanTest.java | 2 +- .../java/brave/spring/beans/RpcTracingFactoryBeanTest.java | 2 +- .../test/java/brave/spring/beans/TracingFactoryBeanTest.java | 2 +- 339 files changed, 341 insertions(+), 343 deletions(-) diff --git a/brave-bom/pom.xml b/brave-bom/pom.xml index 225fbfd4a4..8d6d014a76 100644 --- a/brave-bom/pom.xml +++ b/brave-bom/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-bom - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT Brave BOM Bill Of Materials POM for all Brave artifacts pom @@ -35,7 +35,7 @@ 2.27.0 - 3.0.0 + 2.17.2 diff --git a/brave-tests/pom.xml b/brave-tests/pom.xml index e7e6134de6..e126779430 100644 --- a/brave-tests/pom.xml +++ b/brave-tests/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/brave-tests/src/main/java/brave/test/propagation/CurrentTraceContextTest.java b/brave-tests/src/main/java/brave/test/propagation/CurrentTraceContextTest.java index 05641e61d1..0710bd2de6 100644 --- a/brave-tests/src/main/java/brave/test/propagation/CurrentTraceContextTest.java +++ b/brave-tests/src/main/java/brave/test/propagation/CurrentTraceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave-tests/src/main/java/brave/test/propagation/PropagationSetterTest.java b/brave-tests/src/main/java/brave/test/propagation/PropagationSetterTest.java index cdafadb5e4..7a35ce5ffa 100644 --- a/brave-tests/src/main/java/brave/test/propagation/PropagationSetterTest.java +++ b/brave-tests/src/main/java/brave/test/propagation/PropagationSetterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave-tests/src/main/java/brave/test/propagation/PropagationTest.java b/brave-tests/src/main/java/brave/test/propagation/PropagationTest.java index 9d83463c2a..920dc27f62 100644 --- a/brave-tests/src/main/java/brave/test/propagation/PropagationTest.java +++ b/brave-tests/src/main/java/brave/test/propagation/PropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave-tests/src/main/java/brave/test/util/AssertableCallback.java b/brave-tests/src/main/java/brave/test/util/AssertableCallback.java index c24a55a025..599e1de963 100644 --- a/brave-tests/src/main/java/brave/test/util/AssertableCallback.java +++ b/brave-tests/src/main/java/brave/test/util/AssertableCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave-tests/src/test/java/brave/propagation/B3PropagationTest.java b/brave-tests/src/test/java/brave/propagation/B3PropagationTest.java index 9bbc61a967..01ea553bdd 100644 --- a/brave-tests/src/test/java/brave/propagation/B3PropagationTest.java +++ b/brave-tests/src/test/java/brave/propagation/B3PropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave-tests/src/test/java/brave/propagation/B3SinglePropagationTest.java b/brave-tests/src/test/java/brave/propagation/B3SinglePropagationTest.java index 1af71e6d4a..8cccc6c67b 100644 --- a/brave-tests/src/test/java/brave/propagation/B3SinglePropagationTest.java +++ b/brave-tests/src/test/java/brave/propagation/B3SinglePropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/pom.xml b/brave/pom.xml index 63930405e8..a8fe7d3136 100644 --- a/brave/pom.xml +++ b/brave/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT brave diff --git a/brave/src/main/java/brave/ErrorParser.java b/brave/src/main/java/brave/ErrorParser.java index 9caaeab9b7..90188c3a15 100644 --- a/brave/src/main/java/brave/ErrorParser.java +++ b/brave/src/main/java/brave/ErrorParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/Response.java b/brave/src/main/java/brave/Response.java index 69c58266b0..e9c4679541 100644 --- a/brave/src/main/java/brave/Response.java +++ b/brave/src/main/java/brave/Response.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/Span.java b/brave/src/main/java/brave/Span.java index fa16a9e138..efa6cb160e 100644 --- a/brave/src/main/java/brave/Span.java +++ b/brave/src/main/java/brave/Span.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/Tags.java b/brave/src/main/java/brave/Tags.java index f89ecde5ba..e65317a470 100644 --- a/brave/src/main/java/brave/Tags.java +++ b/brave/src/main/java/brave/Tags.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/Tracer.java b/brave/src/main/java/brave/Tracer.java index 73de17b9a9..d1edc26786 100644 --- a/brave/src/main/java/brave/Tracer.java +++ b/brave/src/main/java/brave/Tracer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/Tracing.java b/brave/src/main/java/brave/Tracing.java index cad13e7127..4e797121f5 100644 --- a/brave/src/main/java/brave/Tracing.java +++ b/brave/src/main/java/brave/Tracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/baggage/BaggageField.java b/brave/src/main/java/brave/baggage/BaggageField.java index c657d5f1d7..66b0810184 100644 --- a/brave/src/main/java/brave/baggage/BaggageField.java +++ b/brave/src/main/java/brave/baggage/BaggageField.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/handler/FinishedSpanHandler.java b/brave/src/main/java/brave/handler/FinishedSpanHandler.java index 3e3952a259..6205edd645 100644 --- a/brave/src/main/java/brave/handler/FinishedSpanHandler.java +++ b/brave/src/main/java/brave/handler/FinishedSpanHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/handler/MutableSpan.java b/brave/src/main/java/brave/handler/MutableSpan.java index 6e6bbeb981..e8469e3994 100644 --- a/brave/src/main/java/brave/handler/MutableSpan.java +++ b/brave/src/main/java/brave/handler/MutableSpan.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/handler/MutableSpanBytesEncoder.java b/brave/src/main/java/brave/handler/MutableSpanBytesEncoder.java index 2c71423a4c..3d005df29c 100644 --- a/brave/src/main/java/brave/handler/MutableSpanBytesEncoder.java +++ b/brave/src/main/java/brave/handler/MutableSpanBytesEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/internal/baggage/BaggageCodec.java b/brave/src/main/java/brave/internal/baggage/BaggageCodec.java index 119bd9e2e9..b9ad6a1b9e 100644 --- a/brave/src/main/java/brave/internal/baggage/BaggageCodec.java +++ b/brave/src/main/java/brave/internal/baggage/BaggageCodec.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/internal/baggage/ExtraBaggageContext.java b/brave/src/main/java/brave/internal/baggage/ExtraBaggageContext.java index 01546e3ab8..a6c8d23a89 100644 --- a/brave/src/main/java/brave/internal/baggage/ExtraBaggageContext.java +++ b/brave/src/main/java/brave/internal/baggage/ExtraBaggageContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/internal/baggage/SingleFieldBaggageCodec.java b/brave/src/main/java/brave/internal/baggage/SingleFieldBaggageCodec.java index 8918ebe01e..7856ef914c 100644 --- a/brave/src/main/java/brave/internal/baggage/SingleFieldBaggageCodec.java +++ b/brave/src/main/java/brave/internal/baggage/SingleFieldBaggageCodec.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/internal/codec/WriteBuffer.java b/brave/src/main/java/brave/internal/codec/WriteBuffer.java index 0d897748a5..87b678d2c1 100644 --- a/brave/src/main/java/brave/internal/codec/WriteBuffer.java +++ b/brave/src/main/java/brave/internal/codec/WriteBuffer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/internal/collect/LongBitSet.java b/brave/src/main/java/brave/internal/collect/LongBitSet.java index 7aa5833326..b237091140 100644 --- a/brave/src/main/java/brave/internal/collect/LongBitSet.java +++ b/brave/src/main/java/brave/internal/collect/LongBitSet.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/internal/extra/MapExtra.java b/brave/src/main/java/brave/internal/extra/MapExtra.java index 6244678d3b..8b03dd3c67 100644 --- a/brave/src/main/java/brave/internal/extra/MapExtra.java +++ b/brave/src/main/java/brave/internal/extra/MapExtra.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/propagation/B3Propagation.java b/brave/src/main/java/brave/propagation/B3Propagation.java index 04ad6a5262..5ef700cc15 100644 --- a/brave/src/main/java/brave/propagation/B3Propagation.java +++ b/brave/src/main/java/brave/propagation/B3Propagation.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/propagation/ExtraFieldCustomizer.java b/brave/src/main/java/brave/propagation/ExtraFieldCustomizer.java index 12616c56fe..bb84c1c662 100644 --- a/brave/src/main/java/brave/propagation/ExtraFieldCustomizer.java +++ b/brave/src/main/java/brave/propagation/ExtraFieldCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/propagation/SamplingFlags.java b/brave/src/main/java/brave/propagation/SamplingFlags.java index aba3539038..55cb0e3e0e 100644 --- a/brave/src/main/java/brave/propagation/SamplingFlags.java +++ b/brave/src/main/java/brave/propagation/SamplingFlags.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/propagation/TraceContext.java b/brave/src/main/java/brave/propagation/TraceContext.java index 2ea1214b82..f269017bf5 100644 --- a/brave/src/main/java/brave/propagation/TraceContext.java +++ b/brave/src/main/java/brave/propagation/TraceContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/propagation/TraceContextOrSamplingFlags.java b/brave/src/main/java/brave/propagation/TraceContextOrSamplingFlags.java index b2316c08db..71f391ab2d 100644 --- a/brave/src/main/java/brave/propagation/TraceContextOrSamplingFlags.java +++ b/brave/src/main/java/brave/propagation/TraceContextOrSamplingFlags.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/propagation/TraceIdContext.java b/brave/src/main/java/brave/propagation/TraceIdContext.java index 3d2306f993..74a5db4b7b 100644 --- a/brave/src/main/java/brave/propagation/TraceIdContext.java +++ b/brave/src/main/java/brave/propagation/TraceIdContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/sampler/DeclarativeSampler.java b/brave/src/main/java/brave/sampler/DeclarativeSampler.java index 249da0afb1..ed28dee421 100644 --- a/brave/src/main/java/brave/sampler/DeclarativeSampler.java +++ b/brave/src/main/java/brave/sampler/DeclarativeSampler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/main/java/brave/sampler/ParameterizedSampler.java b/brave/src/main/java/brave/sampler/ParameterizedSampler.java index 0206adb540..3d9daff0ec 100644 --- a/brave/src/main/java/brave/sampler/ParameterizedSampler.java +++ b/brave/src/main/java/brave/sampler/ParameterizedSampler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/CurrentSpanCustomizerTest.java b/brave/src/test/java/brave/CurrentSpanCustomizerTest.java index a164246dfd..b2f2ecf729 100644 --- a/brave/src/test/java/brave/CurrentSpanCustomizerTest.java +++ b/brave/src/test/java/brave/CurrentSpanCustomizerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/CurrentTraceContextExecutorServiceTest.java b/brave/src/test/java/brave/CurrentTraceContextExecutorServiceTest.java index 986d9b8417..b36f97c0c1 100644 --- a/brave/src/test/java/brave/CurrentTraceContextExecutorServiceTest.java +++ b/brave/src/test/java/brave/CurrentTraceContextExecutorServiceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/CurrentTraceContextExecutorTest.java b/brave/src/test/java/brave/CurrentTraceContextExecutorTest.java index a8a88f18a3..12b5191fcd 100644 --- a/brave/src/test/java/brave/CurrentTraceContextExecutorTest.java +++ b/brave/src/test/java/brave/CurrentTraceContextExecutorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/ErrorParserTest.java b/brave/src/test/java/brave/ErrorParserTest.java index 9e5887265b..1ab177cdc3 100644 --- a/brave/src/test/java/brave/ErrorParserTest.java +++ b/brave/src/test/java/brave/ErrorParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/LazySpanTest.java b/brave/src/test/java/brave/LazySpanTest.java index ee1bdd6c5c..c4a0fbd420 100644 --- a/brave/src/test/java/brave/LazySpanTest.java +++ b/brave/src/test/java/brave/LazySpanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/NoopSpanTest.java b/brave/src/test/java/brave/NoopSpanTest.java index 8ed213df94..4f7f193314 100644 --- a/brave/src/test/java/brave/NoopSpanTest.java +++ b/brave/src/test/java/brave/NoopSpanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/RealSpanTest.java b/brave/src/test/java/brave/RealSpanTest.java index 4abf72ee2d..73b8187bf2 100644 --- a/brave/src/test/java/brave/RealSpanTest.java +++ b/brave/src/test/java/brave/RealSpanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/TagTest.java b/brave/src/test/java/brave/TagTest.java index 6bad30ab6d..78821cdffb 100644 --- a/brave/src/test/java/brave/TagTest.java +++ b/brave/src/test/java/brave/TagTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/TagsTest.java b/brave/src/test/java/brave/TagsTest.java index e7229cbdef..353c3c62b9 100644 --- a/brave/src/test/java/brave/TagsTest.java +++ b/brave/src/test/java/brave/TagsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/baggage/BaggageFieldTest.java b/brave/src/test/java/brave/baggage/BaggageFieldTest.java index 69baa38511..afc983660c 100644 --- a/brave/src/test/java/brave/baggage/BaggageFieldTest.java +++ b/brave/src/test/java/brave/baggage/BaggageFieldTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/baggage/BaggagePropagationTest.java b/brave/src/test/java/brave/baggage/BaggagePropagationTest.java index 76c1f9d8f8..88f43ab1d0 100644 --- a/brave/src/test/java/brave/baggage/BaggagePropagationTest.java +++ b/brave/src/test/java/brave/baggage/BaggagePropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/baggage/CorrelationScopeDecoratorTest.java b/brave/src/test/java/brave/baggage/CorrelationScopeDecoratorTest.java index bca97a4741..cbf1717d79 100644 --- a/brave/src/test/java/brave/baggage/CorrelationScopeDecoratorTest.java +++ b/brave/src/test/java/brave/baggage/CorrelationScopeDecoratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/features/baggage/SingleHeaderCodec.java b/brave/src/test/java/brave/features/baggage/SingleHeaderCodec.java index 1307534b1e..6a585d42d8 100644 --- a/brave/src/test/java/brave/features/baggage/SingleHeaderCodec.java +++ b/brave/src/test/java/brave/features/baggage/SingleHeaderCodec.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/features/handler/MutableSpanAsyncReporterTest.java b/brave/src/test/java/brave/features/handler/MutableSpanAsyncReporterTest.java index eb504aef08..854e8d18a1 100644 --- a/brave/src/test/java/brave/features/handler/MutableSpanAsyncReporterTest.java +++ b/brave/src/test/java/brave/features/handler/MutableSpanAsyncReporterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/features/handler/SpanMetricsCustomizer.java b/brave/src/test/java/brave/features/handler/SpanMetricsCustomizer.java index d618ae13cd..5f25a624c9 100644 --- a/brave/src/test/java/brave/features/handler/SpanMetricsCustomizer.java +++ b/brave/src/test/java/brave/features/handler/SpanMetricsCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/handler/MutableSpanTest.java b/brave/src/test/java/brave/handler/MutableSpanTest.java index a780e4d67c..1bd5587302 100644 --- a/brave/src/test/java/brave/handler/MutableSpanTest.java +++ b/brave/src/test/java/brave/handler/MutableSpanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/internal/InternalPropagationTest.java b/brave/src/test/java/brave/internal/InternalPropagationTest.java index fa4ee2dbbc..82201796db 100644 --- a/brave/src/test/java/brave/internal/InternalPropagationTest.java +++ b/brave/src/test/java/brave/internal/InternalPropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/internal/propagation/StringPropagationAdapterTest.java b/brave/src/test/java/brave/internal/propagation/StringPropagationAdapterTest.java index 1b247771a8..b2779debd8 100644 --- a/brave/src/test/java/brave/internal/propagation/StringPropagationAdapterTest.java +++ b/brave/src/test/java/brave/internal/propagation/StringPropagationAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/internal/recorder/PendingSpansTest.java b/brave/src/test/java/brave/internal/recorder/PendingSpansTest.java index 54229c0a4b..4289513578 100644 --- a/brave/src/test/java/brave/internal/recorder/PendingSpansTest.java +++ b/brave/src/test/java/brave/internal/recorder/PendingSpansTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/B3PropagationTest.java b/brave/src/test/java/brave/propagation/B3PropagationTest.java index cf03b0db88..d186ff0da0 100644 --- a/brave/src/test/java/brave/propagation/B3PropagationTest.java +++ b/brave/src/test/java/brave/propagation/B3PropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/ExtraFieldPropagationTest.java b/brave/src/test/java/brave/propagation/ExtraFieldPropagationTest.java index f8da9c17ae..5422e8b0e2 100644 --- a/brave/src/test/java/brave/propagation/ExtraFieldPropagationTest.java +++ b/brave/src/test/java/brave/propagation/ExtraFieldPropagationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/PropagationConstantsTest.java b/brave/src/test/java/brave/propagation/PropagationConstantsTest.java index c5e3338c4b..e52115dccb 100644 --- a/brave/src/test/java/brave/propagation/PropagationConstantsTest.java +++ b/brave/src/test/java/brave/propagation/PropagationConstantsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/PropagationFactoryTest.java b/brave/src/test/java/brave/propagation/PropagationFactoryTest.java index bf5ec4d2f6..863c6fc5db 100644 --- a/brave/src/test/java/brave/propagation/PropagationFactoryTest.java +++ b/brave/src/test/java/brave/propagation/PropagationFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/SamplingFlagsTest.java b/brave/src/test/java/brave/propagation/SamplingFlagsTest.java index 1cd3c0eb34..b9fbf173a9 100644 --- a/brave/src/test/java/brave/propagation/SamplingFlagsTest.java +++ b/brave/src/test/java/brave/propagation/SamplingFlagsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/StrictScopeDecoratorTest.java b/brave/src/test/java/brave/propagation/StrictScopeDecoratorTest.java index e23f7571ac..d6dc438ad9 100644 --- a/brave/src/test/java/brave/propagation/StrictScopeDecoratorTest.java +++ b/brave/src/test/java/brave/propagation/StrictScopeDecoratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/TraceContextOrSamplingFlagsTest.java b/brave/src/test/java/brave/propagation/TraceContextOrSamplingFlagsTest.java index b164e6c299..5797e6ef60 100644 --- a/brave/src/test/java/brave/propagation/TraceContextOrSamplingFlagsTest.java +++ b/brave/src/test/java/brave/propagation/TraceContextOrSamplingFlagsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/propagation/TraceContextTest.java b/brave/src/test/java/brave/propagation/TraceContextTest.java index e9845818aa..fa84f04d65 100644 --- a/brave/src/test/java/brave/propagation/TraceContextTest.java +++ b/brave/src/test/java/brave/propagation/TraceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/sampler/DeclarativeSamplerTest.java b/brave/src/test/java/brave/sampler/DeclarativeSamplerTest.java index 041a69618e..46b5497a7f 100644 --- a/brave/src/test/java/brave/sampler/DeclarativeSamplerTest.java +++ b/brave/src/test/java/brave/sampler/DeclarativeSamplerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/brave/src/test/java/brave/sampler/ParameterizedSamplerTest.java b/brave/src/test/java/brave/sampler/ParameterizedSamplerTest.java index 03dedd3aa4..a1cbb6c9a8 100644 --- a/brave/src/test/java/brave/sampler/ParameterizedSamplerTest.java +++ b/brave/src/test/java/brave/sampler/ParameterizedSamplerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/jfr/pom.xml b/context/jfr/pom.xml index 4f57c57de0..4938e7edd4 100644 --- a/context/jfr/pom.xml +++ b/context/jfr/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/context/jfr/src/test/java/brave/context/jfr/JfrScopeDecoratorTest.java b/context/jfr/src/test/java/brave/context/jfr/JfrScopeDecoratorTest.java index b91525251e..2fc2a33f54 100644 --- a/context/jfr/src/test/java/brave/context/jfr/JfrScopeDecoratorTest.java +++ b/context/jfr/src/test/java/brave/context/jfr/JfrScopeDecoratorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/log4j12/pom.xml b/context/log4j12/pom.xml index 8b9ede60b8..1e8a5f52aa 100644 --- a/context/log4j12/pom.xml +++ b/context/log4j12/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/context/log4j12/src/main/java/brave/context/log4j12/MDCCurrentTraceContext.java b/context/log4j12/src/main/java/brave/context/log4j12/MDCCurrentTraceContext.java index 2f18e32a51..64f6857c9b 100644 --- a/context/log4j12/src/main/java/brave/context/log4j12/MDCCurrentTraceContext.java +++ b/context/log4j12/src/main/java/brave/context/log4j12/MDCCurrentTraceContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/log4j12/src/main/java/brave/context/log4j12/MDCScopeDecorator.java b/context/log4j12/src/main/java/brave/context/log4j12/MDCScopeDecorator.java index 6f17fb9269..b70c82f24e 100644 --- a/context/log4j12/src/main/java/brave/context/log4j12/MDCScopeDecorator.java +++ b/context/log4j12/src/main/java/brave/context/log4j12/MDCScopeDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/log4j12/src/test/java/brave/context/log4j12/MDCCurrentTraceContextTest.java b/context/log4j12/src/test/java/brave/context/log4j12/MDCCurrentTraceContextTest.java index 99cc59f65f..ba783f072e 100644 --- a/context/log4j12/src/test/java/brave/context/log4j12/MDCCurrentTraceContextTest.java +++ b/context/log4j12/src/test/java/brave/context/log4j12/MDCCurrentTraceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/log4j2/pom.xml b/context/log4j2/pom.xml index 9b079aae27..c5ef186579 100644 --- a/context/log4j2/pom.xml +++ b/context/log4j2/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextCurrentTraceContext.java b/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextCurrentTraceContext.java index bdcc9cff5a..9df1ffa01f 100644 --- a/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextCurrentTraceContext.java +++ b/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextCurrentTraceContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextScopeDecorator.java b/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextScopeDecorator.java index 3078717365..729e866656 100644 --- a/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextScopeDecorator.java +++ b/context/log4j2/src/main/java/brave/context/log4j2/ThreadContextScopeDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/log4j2/src/test/java/brave/context/log4j2/ThreadContextCurrentTraceContextTest.java b/context/log4j2/src/test/java/brave/context/log4j2/ThreadContextCurrentTraceContextTest.java index c243da3fb0..ed72e4728d 100644 --- a/context/log4j2/src/test/java/brave/context/log4j2/ThreadContextCurrentTraceContextTest.java +++ b/context/log4j2/src/test/java/brave/context/log4j2/ThreadContextCurrentTraceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/pom.xml b/context/pom.xml index cb134b77b7..9315226d2c 100644 --- a/context/pom.xml +++ b/context/pom.xml @@ -20,7 +20,7 @@ io.zipkin.brave brave-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT brave-context-parent diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableCompletable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableCompletable.java index 74b9119ced..2e82a702fe 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableCompletable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableCompletable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableFlowable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableFlowable.java index d92b6b54bc..52396c234b 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableFlowable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableFlowable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableMaybe.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableMaybe.java index 959891113d..f95537fbdf 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableMaybe.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableMaybe.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableObservable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableObservable.java index 35c363f4fa..af4e94bd1e 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableObservable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableObservable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableSingle.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableSingle.java index e533dc0078..8369a019ae 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableSingle.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCallableSingle.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletable.java index 3c7e0b6e7a..2bb8879357 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletableObserver.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletableObserver.java index ce8a550918..070a81f8e6 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletableObserver.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextCompletableObserver.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableFlowable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableFlowable.java index e92268f3f2..725d81ce73 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableFlowable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableFlowable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableObservable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableObservable.java index eaddfd461a..5a585971ac 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableObservable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextConnectableObservable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowable.java index bcac528456..04593686a3 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowableSubscriber.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowableSubscriber.java index 1f54fefe03..f7ae58d5f0 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowableSubscriber.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextFlowableSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybe.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybe.java index cf6580dc07..ba00c53719 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybe.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybe.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybeObserver.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybeObserver.java index 6cee2ebd23..31942da93e 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybeObserver.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextMaybeObserver.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObservable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObservable.java index fd1332754f..9694ca246a 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObservable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObservable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObserver.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObserver.java index 3c45feab08..b197fa10d8 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObserver.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextObserver.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextParallelFlowable.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextParallelFlowable.java index 2e91f2e343..2294d44428 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextParallelFlowable.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextParallelFlowable.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingle.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingle.java index c03e440773..95904900b3 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingle.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingle.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingleObserver.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingleObserver.java index d06eb9e4d8..1bab5ef85e 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingleObserver.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSingleObserver.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSubscriber.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSubscriber.java index 721503f372..67e8d3e251 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSubscriber.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/TraceContextSubscriber.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Util.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Util.java index 54437e8f09..74ecc16af0 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Util.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Util.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Wrappers.java b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Wrappers.java index 0fa6f9c260..12ba8bb273 100644 --- a/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Wrappers.java +++ b/context/rxjava2/src/main/java/brave/context/rxjava2/internal/Wrappers.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingClassLoaderTest.java b/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingClassLoaderTest.java index f763c9b77a..ec356c6398 100644 --- a/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingClassLoaderTest.java +++ b/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingClassLoaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingMatrixTest.java b/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingMatrixTest.java index 01ad3cdc1d..fbb8e41224 100644 --- a/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingMatrixTest.java +++ b/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingMatrixTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingTest.java b/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingTest.java index e63008d149..f65d70be73 100644 --- a/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingTest.java +++ b/context/rxjava2/src/test/java/brave/context/rxjava2/CurrentTraceContextAssemblyTrackingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/test/java/brave/context/rxjava2/NotYetSupportedTest.java b/context/rxjava2/src/test/java/brave/context/rxjava2/NotYetSupportedTest.java index 06e18e4a49..cbd72e392a 100644 --- a/context/rxjava2/src/test/java/brave/context/rxjava2/NotYetSupportedTest.java +++ b/context/rxjava2/src/test/java/brave/context/rxjava2/NotYetSupportedTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/rxjava2/src/test/java/brave/context/rxjava2/features/ITRetrofitRxJava2.java b/context/rxjava2/src/test/java/brave/context/rxjava2/features/ITRetrofitRxJava2.java index 0c5df3ea99..20380d4107 100644 --- a/context/rxjava2/src/test/java/brave/context/rxjava2/features/ITRetrofitRxJava2.java +++ b/context/rxjava2/src/test/java/brave/context/rxjava2/features/ITRetrofitRxJava2.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/slf4j/pom.xml b/context/slf4j/pom.xml index 9b42f43c64..9782b94d44 100644 --- a/context/slf4j/pom.xml +++ b/context/slf4j/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-context-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/context/slf4j/src/main/java/brave/context/slf4j/MDCCurrentTraceContext.java b/context/slf4j/src/main/java/brave/context/slf4j/MDCCurrentTraceContext.java index c013b1f2cd..2046c3c921 100644 --- a/context/slf4j/src/main/java/brave/context/slf4j/MDCCurrentTraceContext.java +++ b/context/slf4j/src/main/java/brave/context/slf4j/MDCCurrentTraceContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/slf4j/src/main/java/brave/context/slf4j/MDCScopeDecorator.java b/context/slf4j/src/main/java/brave/context/slf4j/MDCScopeDecorator.java index e9d94ed029..ce29fcca38 100644 --- a/context/slf4j/src/main/java/brave/context/slf4j/MDCScopeDecorator.java +++ b/context/slf4j/src/main/java/brave/context/slf4j/MDCScopeDecorator.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/context/slf4j/src/test/java/brave/context/slf4j/MDCCurrentTraceContextTest.java b/context/slf4j/src/test/java/brave/context/slf4j/MDCCurrentTraceContextTest.java index a177bc7807..457fa1db08 100644 --- a/context/slf4j/src/test/java/brave/context/slf4j/MDCCurrentTraceContextTest.java +++ b/context/slf4j/src/test/java/brave/context/slf4j/MDCCurrentTraceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml index 3f0afbe6de..289b24529a 100644 --- a/instrumentation/benchmarks/pom.xml +++ b/instrumentation/benchmarks/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT brave-instrumentation-benchmarks diff --git a/instrumentation/benchmarks/src/main/java/brave/baggage/BaggagePropagationBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/baggage/BaggagePropagationBenchmarks.java index 0cd0152476..c2344cd118 100644 --- a/instrumentation/benchmarks/src/main/java/brave/baggage/BaggagePropagationBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/baggage/BaggagePropagationBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/grpc/GrpcPropagationBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/grpc/GrpcPropagationBenchmarks.java index 3153d0e75e..83bd0e3df2 100644 --- a/instrumentation/benchmarks/src/main/java/brave/grpc/GrpcPropagationBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/grpc/GrpcPropagationBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/grpc/TraceContextBinaryMarshallerBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/grpc/TraceContextBinaryMarshallerBenchmarks.java index 8828cfd619..b7751eb12c 100644 --- a/instrumentation/benchmarks/src/main/java/brave/grpc/TraceContextBinaryMarshallerBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/grpc/TraceContextBinaryMarshallerBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/http/HttpClientBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/http/HttpClientBenchmarks.java index b137582730..bef57d0a0d 100644 --- a/instrumentation/benchmarks/src/main/java/brave/http/HttpClientBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/http/HttpClientBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/jersey/server/JerseyServerBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/jersey/server/JerseyServerBenchmarks.java index ea934ab1eb..fe23abf83c 100644 --- a/instrumentation/benchmarks/src/main/java/brave/jersey/server/JerseyServerBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/jersey/server/JerseyServerBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/jms/JmsMessageProducerBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/jms/JmsMessageProducerBenchmarks.java index 6c3e26f48a..9c8049e898 100644 --- a/instrumentation/benchmarks/src/main/java/brave/jms/JmsMessageProducerBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/jms/JmsMessageProducerBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java index af45fe0563..19c8154ef9 100644 --- a/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/kafka/clients/TracingProducerBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/netty/http/NettyHttpServerBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/netty/http/NettyHttpServerBenchmarks.java index 437e9a3b42..a280672b20 100644 --- a/instrumentation/benchmarks/src/main/java/brave/netty/http/NettyHttpServerBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/netty/http/NettyHttpServerBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/propagation/B3PropagationBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/propagation/B3PropagationBenchmarks.java index 652076cb94..c0b08102d0 100644 --- a/instrumentation/benchmarks/src/main/java/brave/propagation/B3PropagationBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/propagation/B3PropagationBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/propagation/CurrentTraceContextBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/propagation/CurrentTraceContextBenchmarks.java index f7c6241ff0..f38c64c697 100644 --- a/instrumentation/benchmarks/src/main/java/brave/propagation/CurrentTraceContextBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/propagation/CurrentTraceContextBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/servlet/ServletBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/servlet/ServletBenchmarks.java index 852ba574a8..147dd4cd15 100644 --- a/instrumentation/benchmarks/src/main/java/brave/servlet/ServletBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/servlet/ServletBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/sparkjava/SparkBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/sparkjava/SparkBenchmarks.java index ed5a02c08b..df60feff06 100644 --- a/instrumentation/benchmarks/src/main/java/brave/sparkjava/SparkBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/sparkjava/SparkBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/benchmarks/src/main/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java b/instrumentation/benchmarks/src/main/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java index 68dba1dcd4..0f2029f7c3 100644 --- a/instrumentation/benchmarks/src/main/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java +++ b/instrumentation/benchmarks/src/main/java/brave/spring/rabbit/TracingMessagePostProcessorBenchmarks.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientRequest.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientRequest.java index 34bce9e22d..7bd5226aff 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientRequest.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientResponse.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientResponse.java index b05da97dce..522c04e4ce 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientResponse.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboClientResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboParser.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboParser.java index 1df35f24db..a490877f03 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboParser.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboRequest.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboRequest.java index 4d0d88fd20..07f26e837f 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboRequest.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboResponse.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboResponse.java index dfbc064105..291c03e944 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboResponse.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerRequest.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerRequest.java index 0679ddc10d..4be1a49ff5 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerRequest.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerResponse.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerResponse.java index a7702a0c79..44f84ab077 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerResponse.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/DubboServerResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpan.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpan.java index 8be1f42f39..489d5ec70c 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpan.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpan.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpanResponseFuture.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpanResponseFuture.java index 747775f462..f5b386b74a 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpanResponseFuture.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/FinishSpanResponseFuture.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingResponseCallback.java b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingResponseCallback.java index 4363b679c4..e96aaa0bcb 100644 --- a/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingResponseCallback.java +++ b/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingResponseCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientRequestTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientRequestTest.java index fd6c114526..01f8354701 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientRequestTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientResponseTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientResponseTest.java index 12ba90a439..0f32567275 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientResponseTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboClientResponseTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboParserTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboParserTest.java index a160a7b16c..32c38f0acb 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboParserTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerRequestTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerRequestTest.java index bb45585225..b90f896d5c 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerRequestTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerRequestTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerResponseTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerResponseTest.java index ad7ee956a2..b576039ad0 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerResponseTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/DubboServerResponseTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/FinishSpanTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/FinishSpanTest.java index 23379bf0c6..f0fb44a89f 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/FinishSpanTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/FinishSpanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GraterService.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GraterService.java index 06d7b0aee7..75a2815121 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GraterService.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GraterService.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GreeterService.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GreeterService.java index 84ddbe7409..3358914bac 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GreeterService.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/GreeterService.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Provider.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Provider.java index 2c153c2c20..65001d11cc 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Provider.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/ITTracingFilter_Provider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/PickUnusedPort.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/PickUnusedPort.java index e97889e27a..295dc991b7 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/PickUnusedPort.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/PickUnusedPort.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TestServer.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TestServer.java index e294c11e42..bb0e06e594 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TestServer.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TestServer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TracingResponseCallbackTest.java b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TracingResponseCallbackTest.java index a5ac20c248..e9a5d335d1 100644 --- a/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TracingResponseCallbackTest.java +++ b/instrumentation/dubbo-rpc/src/test/java/brave/dubbo/rpc/TracingResponseCallbackTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo/pom.xml b/instrumentation/dubbo/pom.xml index 7e896b3d87..4dc633b47e 100644 --- a/instrumentation/dubbo/pom.xml +++ b/instrumentation/dubbo/pom.xml @@ -17,7 +17,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/dubbo/src/main/java/brave/dubbo/TracingFilter.java b/instrumentation/dubbo/src/main/java/brave/dubbo/TracingFilter.java index ad0f25689f..15af620b96 100644 --- a/instrumentation/dubbo/src/main/java/brave/dubbo/TracingFilter.java +++ b/instrumentation/dubbo/src/main/java/brave/dubbo/TracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Provider.java b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Provider.java index 1caede1513..90b76f91b2 100644 --- a/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Provider.java +++ b/instrumentation/dubbo/src/test/java/brave/dubbo/ITTracingFilter_Provider.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/dubbo/src/test/java/brave/dubbo/TestServer.java b/instrumentation/dubbo/src/test/java/brave/dubbo/TestServer.java index d24c900a0f..5d1974a8ea 100644 --- a/instrumentation/dubbo/src/test/java/brave/dubbo/TestServer.java +++ b/instrumentation/dubbo/src/test/java/brave/dubbo/TestServer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/pom.xml b/instrumentation/grpc/pom.xml index 00b53d14b7..fcebec3fa8 100644 --- a/instrumentation/grpc/pom.xml +++ b/instrumentation/grpc/pom.xml @@ -17,7 +17,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/grpc/src/main/java/brave/grpc/GrpcClientParser.java b/instrumentation/grpc/src/main/java/brave/grpc/GrpcClientParser.java index 5421f158d8..8ffb63dad7 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/GrpcClientParser.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/GrpcClientParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/GrpcParser.java b/instrumentation/grpc/src/main/java/brave/grpc/GrpcParser.java index b3807639ca..198b29427f 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/GrpcParser.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/GrpcParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/GrpcPropagation.java b/instrumentation/grpc/src/main/java/brave/grpc/GrpcPropagation.java index 253c6e7a40..05d69ba717 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/GrpcPropagation.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/GrpcPropagation.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/GrpcServerParser.java b/instrumentation/grpc/src/main/java/brave/grpc/GrpcServerParser.java index 678ca61c60..7fa44a81f0 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/GrpcServerParser.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/GrpcServerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/GrpcTracing.java b/instrumentation/grpc/src/main/java/brave/grpc/GrpcTracing.java index 026f96b3ae..dadb5a173a 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/GrpcTracing.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/GrpcTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/MessageProcessor.java b/instrumentation/grpc/src/main/java/brave/grpc/MessageProcessor.java index f1bdb0dd0c..db10b1f2ca 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/MessageProcessor.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/MessageProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/TraceContextBinaryFormat.java b/instrumentation/grpc/src/main/java/brave/grpc/TraceContextBinaryFormat.java index 5563c0fbc6..47cf580982 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/TraceContextBinaryFormat.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/TraceContextBinaryFormat.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/TracingClientInterceptor.java b/instrumentation/grpc/src/main/java/brave/grpc/TracingClientInterceptor.java index 905f199bb6..059572228f 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/TracingClientInterceptor.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/TracingClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/main/java/brave/grpc/TracingServerInterceptor.java b/instrumentation/grpc/src/main/java/brave/grpc/TracingServerInterceptor.java index 98319a052f..fdc54e9f40 100644 --- a/instrumentation/grpc/src/main/java/brave/grpc/TracingServerInterceptor.java +++ b/instrumentation/grpc/src/main/java/brave/grpc/TracingServerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingClientInterceptor.java b/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingClientInterceptor.java index 8b403ff957..ee746c82c5 100644 --- a/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingClientInterceptor.java +++ b/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingClientInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingServerInterceptor.java b/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingServerInterceptor.java index 0696d64c2f..b6bc894cba 100644 --- a/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingServerInterceptor.java +++ b/instrumentation/grpc/src/test/java/brave/grpc/BaseITTracingServerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/test/java/brave/grpc/GreeterImpl.java b/instrumentation/grpc/src/test/java/brave/grpc/GreeterImpl.java index 536cbed1fa..86e2308815 100644 --- a/instrumentation/grpc/src/test/java/brave/grpc/GreeterImpl.java +++ b/instrumentation/grpc/src/test/java/brave/grpc/GreeterImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/test/java/brave/grpc/GrpcParserTest.java b/instrumentation/grpc/src/test/java/brave/grpc/GrpcParserTest.java index 4d5f695b87..ddc5c0a6db 100644 --- a/instrumentation/grpc/src/test/java/brave/grpc/GrpcParserTest.java +++ b/instrumentation/grpc/src/test/java/brave/grpc/GrpcParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/test/java/brave/grpc/TestServer.java b/instrumentation/grpc/src/test/java/brave/grpc/TestServer.java index 8802c2a43b..9c537a3321 100644 --- a/instrumentation/grpc/src/test/java/brave/grpc/TestServer.java +++ b/instrumentation/grpc/src/test/java/brave/grpc/TestServer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/grpc/src/test/java/brave/grpc/TraceContextBinaryFormatTest.java b/instrumentation/grpc/src/test/java/brave/grpc/TraceContextBinaryFormatTest.java index d270c20dcd..0b115b3a1b 100644 --- a/instrumentation/grpc/src/test/java/brave/grpc/TraceContextBinaryFormatTest.java +++ b/instrumentation/grpc/src/test/java/brave/grpc/TraceContextBinaryFormatTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests-jakarta/pom.xml b/instrumentation/http-tests-jakarta/pom.xml index dd2e192fd8..3051913d8f 100644 --- a/instrumentation/http-tests-jakarta/pom.xml +++ b/instrumentation/http-tests-jakarta/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/ITServlet5Container.java b/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/ITServlet5Container.java index a90e9a932c..2f24f9f356 100644 --- a/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/ITServlet5Container.java +++ b/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/ITServlet5Container.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/Jetty11ServerController.java b/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/Jetty11ServerController.java index adcfa8ad9f..213adf402f 100644 --- a/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/Jetty11ServerController.java +++ b/instrumentation/http-tests-jakarta/src/main/java/brave/test/jakarta/http/Jetty11ServerController.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests/pom.xml b/instrumentation/http-tests/pom.xml index 90460bbb56..65673b4801 100644 --- a/instrumentation/http-tests/pom.xml +++ b/instrumentation/http-tests/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpClient.java b/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpClient.java index 2b5b75cf73..9bf1f69ad9 100644 --- a/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpClient.java +++ b/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpServer.java b/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpServer.java index 00cdfa7dfd..f8e7b30d0e 100644 --- a/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpServer.java +++ b/instrumentation/http-tests/src/main/java/brave/test/http/ITHttpServer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests/src/test/java/brave/http/features/RequestSamplingTest.java b/instrumentation/http-tests/src/test/java/brave/http/features/RequestSamplingTest.java index 6201804991..25241e3e3f 100644 --- a/instrumentation/http-tests/src/test/java/brave/http/features/RequestSamplingTest.java +++ b/instrumentation/http-tests/src/test/java/brave/http/features/RequestSamplingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests/src/test/java/brave/http/features/TracingDispatcher.java b/instrumentation/http-tests/src/test/java/brave/http/features/TracingDispatcher.java index 427d7e0eb3..fec90796ea 100644 --- a/instrumentation/http-tests/src/test/java/brave/http/features/TracingDispatcher.java +++ b/instrumentation/http-tests/src/test/java/brave/http/features/TracingDispatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http-tests/src/test/java/brave/http/features/TracingInterceptor.java b/instrumentation/http-tests/src/test/java/brave/http/features/TracingInterceptor.java index 5c31e5ffea..ee3e28bf99 100644 --- a/instrumentation/http-tests/src/test/java/brave/http/features/TracingInterceptor.java +++ b/instrumentation/http-tests/src/test/java/brave/http/features/TracingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/pom.xml b/instrumentation/http/pom.xml index 1e5ed123d0..14191c2912 100644 --- a/instrumentation/http/pom.xml +++ b/instrumentation/http/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/http/src/main/java/brave/http/HttpAdapter.java b/instrumentation/http/src/main/java/brave/http/HttpAdapter.java index d9a2c8e455..70a5b7fff0 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpAdapter.java +++ b/instrumentation/http/src/main/java/brave/http/HttpAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpClientAdapter.java b/instrumentation/http/src/main/java/brave/http/HttpClientAdapter.java index f9f741aa5f..2d3de417e9 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpClientAdapter.java +++ b/instrumentation/http/src/main/java/brave/http/HttpClientAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpClientAdapters.java b/instrumentation/http/src/main/java/brave/http/HttpClientAdapters.java index f9941b1af9..3c2b7ec371 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpClientAdapters.java +++ b/instrumentation/http/src/main/java/brave/http/HttpClientAdapters.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpClientHandler.java b/instrumentation/http/src/main/java/brave/http/HttpClientHandler.java index aca15b88ca..49c5b5fa14 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpClientHandler.java +++ b/instrumentation/http/src/main/java/brave/http/HttpClientHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpClientParser.java b/instrumentation/http/src/main/java/brave/http/HttpClientParser.java index 69deea92eb..76eea75fee 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpClientParser.java +++ b/instrumentation/http/src/main/java/brave/http/HttpClientParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpClientParserAdapter.java b/instrumentation/http/src/main/java/brave/http/HttpClientParserAdapter.java index 20e2c7c297..c7d7c573d0 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpClientParserAdapter.java +++ b/instrumentation/http/src/main/java/brave/http/HttpClientParserAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpHandler.java b/instrumentation/http/src/main/java/brave/http/HttpHandler.java index 65fa0a7094..fc6c71686f 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpHandler.java +++ b/instrumentation/http/src/main/java/brave/http/HttpHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpParser.java b/instrumentation/http/src/main/java/brave/http/HttpParser.java index 76ee10d295..d9d33bab42 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpParser.java +++ b/instrumentation/http/src/main/java/brave/http/HttpParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpRequestParserAdapters.java b/instrumentation/http/src/main/java/brave/http/HttpRequestParserAdapters.java index bede8ff4b9..623f620a9a 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpRequestParserAdapters.java +++ b/instrumentation/http/src/main/java/brave/http/HttpRequestParserAdapters.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpResponseParser.java b/instrumentation/http/src/main/java/brave/http/HttpResponseParser.java index 5e6c73ac03..22454a8621 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpResponseParser.java +++ b/instrumentation/http/src/main/java/brave/http/HttpResponseParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpResponseParserAdapters.java b/instrumentation/http/src/main/java/brave/http/HttpResponseParserAdapters.java index 1f50bb59fb..3151610884 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpResponseParserAdapters.java +++ b/instrumentation/http/src/main/java/brave/http/HttpResponseParserAdapters.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpRuleSampler.java b/instrumentation/http/src/main/java/brave/http/HttpRuleSampler.java index 3d54892774..29f1290721 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpRuleSampler.java +++ b/instrumentation/http/src/main/java/brave/http/HttpRuleSampler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpSampler.java b/instrumentation/http/src/main/java/brave/http/HttpSampler.java index ed04d36ee0..4826549daa 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpSampler.java +++ b/instrumentation/http/src/main/java/brave/http/HttpSampler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpServerAdapter.java b/instrumentation/http/src/main/java/brave/http/HttpServerAdapter.java index cad59e2217..e90f021809 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpServerAdapter.java +++ b/instrumentation/http/src/main/java/brave/http/HttpServerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpServerAdapters.java b/instrumentation/http/src/main/java/brave/http/HttpServerAdapters.java index 284b8c238c..3bdb79a655 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpServerAdapters.java +++ b/instrumentation/http/src/main/java/brave/http/HttpServerAdapters.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpServerHandler.java b/instrumentation/http/src/main/java/brave/http/HttpServerHandler.java index 99ba5c2aac..85510f9bc8 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpServerHandler.java +++ b/instrumentation/http/src/main/java/brave/http/HttpServerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpServerParser.java b/instrumentation/http/src/main/java/brave/http/HttpServerParser.java index 488ba247d0..d27da7bd0f 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpServerParser.java +++ b/instrumentation/http/src/main/java/brave/http/HttpServerParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpServerParserAdapter.java b/instrumentation/http/src/main/java/brave/http/HttpServerParserAdapter.java index 534dd65cfc..818d88cfe5 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpServerParserAdapter.java +++ b/instrumentation/http/src/main/java/brave/http/HttpServerParserAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/main/java/brave/http/HttpTracing.java b/instrumentation/http/src/main/java/brave/http/HttpTracing.java index 2b7ccd9d47..f0dc276821 100644 --- a/instrumentation/http/src/main/java/brave/http/HttpTracing.java +++ b/instrumentation/http/src/main/java/brave/http/HttpTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/DeprecatedHttpClientHandlerTest.java b/instrumentation/http/src/test/java/brave/http/DeprecatedHttpClientHandlerTest.java index d8b3ecf71c..8a2bf66a9d 100644 --- a/instrumentation/http/src/test/java/brave/http/DeprecatedHttpClientHandlerTest.java +++ b/instrumentation/http/src/test/java/brave/http/DeprecatedHttpClientHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/DeprecatedHttpServerHandlerTest.java b/instrumentation/http/src/test/java/brave/http/DeprecatedHttpServerHandlerTest.java index 7be40a8808..76d8971aff 100644 --- a/instrumentation/http/src/test/java/brave/http/DeprecatedHttpServerHandlerTest.java +++ b/instrumentation/http/src/test/java/brave/http/DeprecatedHttpServerHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpAdaptersTest.java b/instrumentation/http/src/test/java/brave/http/HttpAdaptersTest.java index 4795e74733..d9b95e6950 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpAdaptersTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpAdaptersTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpClientAdaptersTest.java b/instrumentation/http/src/test/java/brave/http/HttpClientAdaptersTest.java index 89ba1f3f2d..09994947b1 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpClientAdaptersTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpClientAdaptersTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpClientHandlerTest.java b/instrumentation/http/src/test/java/brave/http/HttpClientHandlerTest.java index be787a8f35..ec9ee34a84 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpClientHandlerTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpClientHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpParserTest.java b/instrumentation/http/src/test/java/brave/http/HttpParserTest.java index 5cd2e0a3d8..ccef7cc699 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpParserTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpRequestParserAdaptersTest.java b/instrumentation/http/src/test/java/brave/http/HttpRequestParserAdaptersTest.java index 6f180a879e..78f6e032f1 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpRequestParserAdaptersTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpRequestParserAdaptersTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpResponseParserAdaptersTest.java b/instrumentation/http/src/test/java/brave/http/HttpResponseParserAdaptersTest.java index bbc09f12da..5d4367a5b2 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpResponseParserAdaptersTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpResponseParserAdaptersTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpRuleSamplerTest.java b/instrumentation/http/src/test/java/brave/http/HttpRuleSamplerTest.java index 82880a75ba..9885def193 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpRuleSamplerTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpRuleSamplerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpSamplerTest.java b/instrumentation/http/src/test/java/brave/http/HttpSamplerTest.java index 1b5835d4a1..c0d6b4dd6a 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpSamplerTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpSamplerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpServerAdapterTest.java b/instrumentation/http/src/test/java/brave/http/HttpServerAdapterTest.java index 5d0319382c..ef6f64fe2d 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpServerAdapterTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpServerAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpServerAdaptersTest.java b/instrumentation/http/src/test/java/brave/http/HttpServerAdaptersTest.java index 3e072f2812..1fec725687 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpServerAdaptersTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpServerAdaptersTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpServerHandlerTest.java b/instrumentation/http/src/test/java/brave/http/HttpServerHandlerTest.java index 9b6e75fe72..cd9513a99d 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpServerHandlerTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpServerHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/http/src/test/java/brave/http/HttpTracingTest.java b/instrumentation/http/src/test/java/brave/http/HttpTracingTest.java index e17f27a7fa..812fb73e40 100644 --- a/instrumentation/http/src/test/java/brave/http/HttpTracingTest.java +++ b/instrumentation/http/src/test/java/brave/http/HttpTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/httpasyncclient/pom.xml b/instrumentation/httpasyncclient/pom.xml index 17236f2f21..f80cd07d91 100644 --- a/instrumentation/httpasyncclient/pom.xml +++ b/instrumentation/httpasyncclient/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/httpasyncclient/src/main/java/brave/httpasyncclient/TracingHttpAsyncClientBuilder.java b/instrumentation/httpasyncclient/src/main/java/brave/httpasyncclient/TracingHttpAsyncClientBuilder.java index e1f688c266..c2f03bd2f4 100644 --- a/instrumentation/httpasyncclient/src/main/java/brave/httpasyncclient/TracingHttpAsyncClientBuilder.java +++ b/instrumentation/httpasyncclient/src/main/java/brave/httpasyncclient/TracingHttpAsyncClientBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/httpclient/pom.xml b/instrumentation/httpclient/pom.xml index ecadd02240..1a9eb8c282 100644 --- a/instrumentation/httpclient/pom.xml +++ b/instrumentation/httpclient/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/httpclient/src/main/java/brave/httpclient/TracingMainExec.java b/instrumentation/httpclient/src/main/java/brave/httpclient/TracingMainExec.java index 7c6e29976f..cd653a12b1 100644 --- a/instrumentation/httpclient/src/main/java/brave/httpclient/TracingMainExec.java +++ b/instrumentation/httpclient/src/main/java/brave/httpclient/TracingMainExec.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/httpclient/src/main/java/brave/httpclient/TracingProtocolExec.java b/instrumentation/httpclient/src/main/java/brave/httpclient/TracingProtocolExec.java index 0fefa5834c..73ef3a98bd 100644 --- a/instrumentation/httpclient/src/main/java/brave/httpclient/TracingProtocolExec.java +++ b/instrumentation/httpclient/src/main/java/brave/httpclient/TracingProtocolExec.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/httpclient5/pom.xml b/instrumentation/httpclient5/pom.xml index df3e38b060..e4632167c3 100644 --- a/instrumentation/httpclient5/pom.xml +++ b/instrumentation/httpclient5/pom.xml @@ -20,7 +20,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT brave-instrumentation-httpclient5 diff --git a/instrumentation/httpclient5/src/main/java/brave/httpclient5/AsyncHandleSendHandler.java b/instrumentation/httpclient5/src/main/java/brave/httpclient5/AsyncHandleSendHandler.java index c519f5a1ec..1c92aec81a 100644 --- a/instrumentation/httpclient5/src/main/java/brave/httpclient5/AsyncHandleSendHandler.java +++ b/instrumentation/httpclient5/src/main/java/brave/httpclient5/AsyncHandleSendHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -11,7 +11,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package brave.httpclient5; import brave.Span; diff --git a/instrumentation/httpclient5/src/main/java/brave/httpclient5/HandleReceiveHandler.java b/instrumentation/httpclient5/src/main/java/brave/httpclient5/HandleReceiveHandler.java index 274325dd25..71af344c50 100644 --- a/instrumentation/httpclient5/src/main/java/brave/httpclient5/HandleReceiveHandler.java +++ b/instrumentation/httpclient5/src/main/java/brave/httpclient5/HandleReceiveHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -11,7 +11,6 @@ * or implied. See the License for the specific language governing permissions and limitations under * the License. */ - package brave.httpclient5; import brave.Span; diff --git a/instrumentation/jakarta-jms/pom.xml b/instrumentation/jakarta-jms/pom.xml index 56fbf74b11..c21def03dd 100644 --- a/instrumentation/jakarta-jms/pom.xml +++ b/instrumentation/jakarta-jms/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/jaxrs2/pom.xml b/instrumentation/jaxrs2/pom.xml index 57ee95edd0..316c81cd57 100644 --- a/instrumentation/jaxrs2/pom.xml +++ b/instrumentation/jaxrs2/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/jersey-server/pom.xml b/instrumentation/jersey-server/pom.xml index 6a9083eb96..7355162397 100644 --- a/instrumentation/jersey-server/pom.xml +++ b/instrumentation/jersey-server/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/jersey-server/src/main/java/brave/jersey/server/TracingApplicationEventListener.java b/instrumentation/jersey-server/src/main/java/brave/jersey/server/TracingApplicationEventListener.java index bb15be4d40..109951412c 100644 --- a/instrumentation/jersey-server/src/main/java/brave/jersey/server/TracingApplicationEventListener.java +++ b/instrumentation/jersey-server/src/main/java/brave/jersey/server/TracingApplicationEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/pom.xml b/instrumentation/jms-jakarta/pom.xml index 3c6f1a9dce..02e5293846 100644 --- a/instrumentation/jms-jakarta/pom.xml +++ b/instrumentation/jms-jakarta/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/JmsTracing.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/JmsTracing.java index eda3fefbb1..4206fba53f 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/JmsTracing.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/JmsTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/PropertyFilter.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/PropertyFilter.java index 1d910370d5..71e2ab38e3 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/PropertyFilter.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/PropertyFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingCompletionListener.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingCompletionListener.java index 69538ec7e9..2856abac3f 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingCompletionListener.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingCompletionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingExceptionListener.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingExceptionListener.java index daeb198d36..5c04972935 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingExceptionListener.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingExceptionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSContext.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSContext.java index 620f415637..67a88bc62f 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSContext.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSProducer.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSProducer.java index 3a7ed1b498..1698974972 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSProducer.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingJMSProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingMessageListener.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingMessageListener.java index 794ccd2f13..7f99554e49 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingMessageListener.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingMessageListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingSession.java b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingSession.java index b803302ab5..1c82e48501 100644 --- a/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingSession.java +++ b/instrumentation/jms-jakarta/src/main/java/brave/jakarta/jms/TracingSession.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/JmsTracingTest.java b/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/JmsTracingTest.java index 686425eee7..b71521db93 100644 --- a/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/JmsTracingTest.java +++ b/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/JmsTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingCompletionListenerTest.java b/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingCompletionListenerTest.java index 5061642964..a5fb1485d0 100644 --- a/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingCompletionListenerTest.java +++ b/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingCompletionListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingJMSConsumerTest.java b/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingJMSConsumerTest.java index 5b3f875f4d..9cd3ff8af8 100644 --- a/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingJMSConsumerTest.java +++ b/instrumentation/jms-jakarta/src/test/java/brave/jakarta/jms/TracingJMSConsumerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/pom.xml b/instrumentation/jms/pom.xml index f35802a7a3..00eecd0ff9 100644 --- a/instrumentation/jms/pom.xml +++ b/instrumentation/jms/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/jms/src/main/java/brave/jms/JmsTracing.java b/instrumentation/jms/src/main/java/brave/jms/JmsTracing.java index ad62b0edfa..821b816ac8 100644 --- a/instrumentation/jms/src/main/java/brave/jms/JmsTracing.java +++ b/instrumentation/jms/src/main/java/brave/jms/JmsTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/main/java/brave/jms/PropertyFilter.java b/instrumentation/jms/src/main/java/brave/jms/PropertyFilter.java index 3666385171..8988813e09 100644 --- a/instrumentation/jms/src/main/java/brave/jms/PropertyFilter.java +++ b/instrumentation/jms/src/main/java/brave/jms/PropertyFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/main/java/brave/jms/TracingCompletionListener.java b/instrumentation/jms/src/main/java/brave/jms/TracingCompletionListener.java index fc84d068d8..a1507f70ac 100644 --- a/instrumentation/jms/src/main/java/brave/jms/TracingCompletionListener.java +++ b/instrumentation/jms/src/main/java/brave/jms/TracingCompletionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/main/java/brave/jms/TracingExceptionListener.java b/instrumentation/jms/src/main/java/brave/jms/TracingExceptionListener.java index cd57a71ca0..ed0931fb95 100644 --- a/instrumentation/jms/src/main/java/brave/jms/TracingExceptionListener.java +++ b/instrumentation/jms/src/main/java/brave/jms/TracingExceptionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/main/java/brave/jms/TracingJMSProducer.java b/instrumentation/jms/src/main/java/brave/jms/TracingJMSProducer.java index 53d30d00e0..87c3384269 100644 --- a/instrumentation/jms/src/main/java/brave/jms/TracingJMSProducer.java +++ b/instrumentation/jms/src/main/java/brave/jms/TracingJMSProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/main/java/brave/jms/TracingMessageListener.java b/instrumentation/jms/src/main/java/brave/jms/TracingMessageListener.java index 7c68f20312..4361b022b5 100644 --- a/instrumentation/jms/src/main/java/brave/jms/TracingMessageListener.java +++ b/instrumentation/jms/src/main/java/brave/jms/TracingMessageListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageConsumer.java b/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageConsumer.java index ed9bc7176d..c616f3a5e7 100644 --- a/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageConsumer.java +++ b/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageProducer.java b/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageProducer.java index 01b9f9c7f7..659377781c 100644 --- a/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageProducer.java +++ b/instrumentation/jms/src/test/java/brave/jms/ITJms_1_1_TracingMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageConsumer.java b/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageConsumer.java index 1450309161..eb8759972f 100644 --- a/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageConsumer.java +++ b/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageProducer.java b/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageProducer.java index 2fea72e3c2..9b2c52f5e7 100644 --- a/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageProducer.java +++ b/instrumentation/jms/src/test/java/brave/jms/ITJms_2_0_TracingMessageProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSConsumer.java b/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSConsumer.java index 21a66ad1fc..2ee335e168 100644 --- a/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSConsumer.java +++ b/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSProducer.java b/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSProducer.java index 318c5a774c..74a45de89c 100644 --- a/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSProducer.java +++ b/instrumentation/jms/src/test/java/brave/jms/ITTracingJMSProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/JmsTracingTest.java b/instrumentation/jms/src/test/java/brave/jms/JmsTracingTest.java index bb729af94f..cd1973f19d 100644 --- a/instrumentation/jms/src/test/java/brave/jms/JmsTracingTest.java +++ b/instrumentation/jms/src/test/java/brave/jms/JmsTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/TracingCompletionListenerTest.java b/instrumentation/jms/src/test/java/brave/jms/TracingCompletionListenerTest.java index 6ed7ef6355..3b5754e5f1 100644 --- a/instrumentation/jms/src/test/java/brave/jms/TracingCompletionListenerTest.java +++ b/instrumentation/jms/src/test/java/brave/jms/TracingCompletionListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/jms/src/test/java/brave/jms/TracingJMSConsumerTest.java b/instrumentation/jms/src/test/java/brave/jms/TracingJMSConsumerTest.java index 4db0649424..b9b4102e53 100644 --- a/instrumentation/jms/src/test/java/brave/jms/TracingJMSConsumerTest.java +++ b/instrumentation/jms/src/test/java/brave/jms/TracingJMSConsumerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-clients/pom.xml b/instrumentation/kafka-clients/pom.xml index c8a8318b8a..0681d2bfc4 100644 --- a/instrumentation/kafka-clients/pom.xml +++ b/instrumentation/kafka-clients/pom.xml @@ -19,7 +19,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT brave-instrumentation-kafka-clients diff --git a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/KafkaTracing.java b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/KafkaTracing.java index db89b810d0..8d0d9cee10 100644 --- a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/KafkaTracing.java +++ b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/KafkaTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingCallback.java b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingCallback.java index f300044730..b27499b022 100644 --- a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingCallback.java +++ b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java index 6c554a08b2..0d29563f62 100644 --- a/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java +++ b/instrumentation/kafka-clients/src/main/java/brave/kafka/clients/TracingProducer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaTracingTest.java b/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaTracingTest.java index 6ce1d476da..6a5e36b47c 100644 --- a/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaTracingTest.java +++ b/instrumentation/kafka-clients/src/test/java/brave/kafka/clients/KafkaTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/pom.xml b/instrumentation/kafka-streams/pom.xml index 5288e41320..dff1ba0e99 100644 --- a/instrumentation/kafka-streams/pom.xml +++ b/instrumentation/kafka-streams/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingTransformer.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingTransformer.java index f6aa8c0726..6c83b7fcc9 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingTransformer.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformer.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformer.java index ee24e48b5d..f6b70540df 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformer.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformerWithKey.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformerWithKey.java index 73e6eed2a2..571da0c895 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformerWithKey.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/AbstractTracingValueTransformerWithKey.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTags.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTags.java index 420c0d51de..2184e5f15c 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTags.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTags.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTracing.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTracing.java index 6e14987d0c..f75fdf5044 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTracing.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/KafkaStreamsTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilter.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilter.java index 6c6285e150..166c4c44e2 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilter.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformer.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformer.java index 32380904e2..00d8db277b 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformer.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformerSupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformerSupplier.java index 7f3503649e..241d578f4b 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformerSupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterTransformerSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKey.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKey.java index 4fea19d278..3a88a8e3d6 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKey.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKey.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKeySupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKeySupplier.java index b4d574c64c..0e27294165 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKeySupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingFilterValueTransformerWithKeySupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingKafkaClientSupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingKafkaClientSupplier.java index 645e81ce27..8de4e072f0 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingKafkaClientSupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingKafkaClientSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2021 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessor.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessor.java index dd0d85a5bd..d06a9277ba 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessor.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessorSupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessorSupplier.java index e0e496a289..529da5668c 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessorSupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingProcessorSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformer.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformer.java index a2d02dcdce..257de1b57e 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformer.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformerSupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformerSupplier.java index 9923c530ec..7cff6dafe6 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformerSupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingTransformerSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2FixedKeyProcessor.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2FixedKeyProcessor.java index 2e49f250db..c247f43065 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2FixedKeyProcessor.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2FixedKeyProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2Processor.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2Processor.java index 683da2853b..76c4dd865b 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2Processor.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingV2Processor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformer.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformer.java index 865468d2c8..900a789003 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformer.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerSupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerSupplier.java index 31873bdcab..6d014ef5cd 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerSupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerSupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKey.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKey.java index e92269b2ed..ac85e237a8 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKey.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKey.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKeySupplier.java b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKeySupplier.java index bdf2134fd7..0c9cf2e183 100644 --- a/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKeySupplier.java +++ b/instrumentation/kafka-streams/src/main/java/brave/kafka/streams/TracingValueTransformerWithKeySupplier.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java index 0e5fec947a..d9d9f5dc04 100644 --- a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java +++ b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/ITKafkaStreamsTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTest.java b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTest.java index bdb2715c94..ce85c7aae0 100644 --- a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTest.java +++ b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTracingTest.java b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTracingTest.java index 1b257af55d..a2caf13d6f 100644 --- a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTracingTest.java +++ b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/KafkaStreamsTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/TracingKafkaClientSupplierTests.java b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/TracingKafkaClientSupplierTests.java index 6fd4c6c906..1ea6e6711b 100644 --- a/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/TracingKafkaClientSupplierTests.java +++ b/instrumentation/kafka-streams/src/test/java/brave/kafka/streams/TracingKafkaClientSupplierTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/messaging/pom.xml b/instrumentation/messaging/pom.xml index e0d896593d..dd9799480f 100644 --- a/instrumentation/messaging/pom.xml +++ b/instrumentation/messaging/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/messaging/src/main/java/brave/messaging/ConsumerRequest.java b/instrumentation/messaging/src/main/java/brave/messaging/ConsumerRequest.java index 90d00d0b27..d583acb698 100644 --- a/instrumentation/messaging/src/main/java/brave/messaging/ConsumerRequest.java +++ b/instrumentation/messaging/src/main/java/brave/messaging/ConsumerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/messaging/src/main/java/brave/messaging/MessagingTracing.java b/instrumentation/messaging/src/main/java/brave/messaging/MessagingTracing.java index 814921809a..cf7b475458 100644 --- a/instrumentation/messaging/src/main/java/brave/messaging/MessagingTracing.java +++ b/instrumentation/messaging/src/main/java/brave/messaging/MessagingTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/messaging/src/test/java/brave/messaging/MessagingTracingTest.java b/instrumentation/messaging/src/test/java/brave/messaging/MessagingTracingTest.java index ee27d12d40..ae2bfd5148 100644 --- a/instrumentation/messaging/src/test/java/brave/messaging/MessagingTracingTest.java +++ b/instrumentation/messaging/src/test/java/brave/messaging/MessagingTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/mongodb/pom.xml b/instrumentation/mongodb/pom.xml index e4ddfdbe14..0b0bac4d46 100644 --- a/instrumentation/mongodb/pom.xml +++ b/instrumentation/mongodb/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/mysql/pom.xml b/instrumentation/mysql/pom.xml index 83405cd60d..d6e0fc0f00 100644 --- a/instrumentation/mysql/pom.xml +++ b/instrumentation/mysql/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/mysql6/pom.xml b/instrumentation/mysql6/pom.xml index 7c297853ad..21586ec6b9 100644 --- a/instrumentation/mysql6/pom.xml +++ b/instrumentation/mysql6/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/mysql8/pom.xml b/instrumentation/mysql8/pom.xml index 19fdce9c7b..66e458e6e7 100644 --- a/instrumentation/mysql8/pom.xml +++ b/instrumentation/mysql8/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/netty-codec-http/pom.xml b/instrumentation/netty-codec-http/pom.xml index be7c62f307..1e2ca15081 100644 --- a/instrumentation/netty-codec-http/pom.xml +++ b/instrumentation/netty-codec-http/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/okhttp3/pom.xml b/instrumentation/okhttp3/pom.xml index 727d31dd8e..c6f1bf794a 100644 --- a/instrumentation/okhttp3/pom.xml +++ b/instrumentation/okhttp3/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/okhttp3/src/main/java/brave/okhttp3/TracingInterceptor.java b/instrumentation/okhttp3/src/main/java/brave/okhttp3/TracingInterceptor.java index d7ed3fee39..e90590ed78 100644 --- a/instrumentation/okhttp3/src/main/java/brave/okhttp3/TracingInterceptor.java +++ b/instrumentation/okhttp3/src/main/java/brave/okhttp3/TracingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/okhttp3/src/test/java/brave/okhttp3/features/ITRetrofit.java b/instrumentation/okhttp3/src/test/java/brave/okhttp3/features/ITRetrofit.java index c8f72107a7..cc37bb363e 100644 --- a/instrumentation/okhttp3/src/test/java/brave/okhttp3/features/ITRetrofit.java +++ b/instrumentation/okhttp3/src/test/java/brave/okhttp3/features/ITRetrofit.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingJdbcEventListener.java b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingJdbcEventListener.java index e562c4bcc4..e0e0f64516 100644 --- a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingJdbcEventListener.java +++ b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingJdbcEventListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6SpyOptions.java b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6SpyOptions.java index 2177d9a181..91b9053afe 100644 --- a/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6SpyOptions.java +++ b/instrumentation/p6spy/src/main/java/brave/p6spy/TracingP6SpyOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/p6spy/src/test/java/brave/p6spy/DerbyUtils.java b/instrumentation/p6spy/src/test/java/brave/p6spy/DerbyUtils.java index 0ae4cfac69..f8e18cf984 100644 --- a/instrumentation/p6spy/src/test/java/brave/p6spy/DerbyUtils.java +++ b/instrumentation/p6spy/src/test/java/brave/p6spy/DerbyUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2019 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/p6spy/src/test/java/brave/p6spy/ITTracingP6Factory.java b/instrumentation/p6spy/src/test/java/brave/p6spy/ITTracingP6Factory.java index c980d4c8fa..e66fa9e027 100644 --- a/instrumentation/p6spy/src/test/java/brave/p6spy/ITTracingP6Factory.java +++ b/instrumentation/p6spy/src/test/java/brave/p6spy/ITTracingP6Factory.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/p6spy/src/test/java/brave/p6spy/TracingJdbcEventListenerTest.java b/instrumentation/p6spy/src/test/java/brave/p6spy/TracingJdbcEventListenerTest.java index 49e3a77dc5..0ab1fb8078 100644 --- a/instrumentation/p6spy/src/test/java/brave/p6spy/TracingJdbcEventListenerTest.java +++ b/instrumentation/p6spy/src/test/java/brave/p6spy/TracingJdbcEventListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/pom.xml b/instrumentation/pom.xml index 2d1bbd1d21..6e1b64b339 100644 --- a/instrumentation/pom.xml +++ b/instrumentation/pom.xml @@ -20,7 +20,7 @@ io.zipkin.brave brave-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT brave-instrumentation-parent diff --git a/instrumentation/rpc/pom.xml b/instrumentation/rpc/pom.xml index 4978452ba0..4a00136395 100644 --- a/instrumentation/rpc/pom.xml +++ b/instrumentation/rpc/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/rpc/src/main/java/brave/rpc/RpcClientHandler.java b/instrumentation/rpc/src/main/java/brave/rpc/RpcClientHandler.java index 75e0a6d07e..14cd57df43 100644 --- a/instrumentation/rpc/src/main/java/brave/rpc/RpcClientHandler.java +++ b/instrumentation/rpc/src/main/java/brave/rpc/RpcClientHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/rpc/src/main/java/brave/rpc/RpcServerHandler.java b/instrumentation/rpc/src/main/java/brave/rpc/RpcServerHandler.java index 420b3cc4de..d1a1383556 100644 --- a/instrumentation/rpc/src/main/java/brave/rpc/RpcServerHandler.java +++ b/instrumentation/rpc/src/main/java/brave/rpc/RpcServerHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/rpc/src/main/java/brave/rpc/RpcTracing.java b/instrumentation/rpc/src/main/java/brave/rpc/RpcTracing.java index 3d174daacf..b6ced75aec 100644 --- a/instrumentation/rpc/src/main/java/brave/rpc/RpcTracing.java +++ b/instrumentation/rpc/src/main/java/brave/rpc/RpcTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/rpc/src/test/java/brave/rpc/RpcClientHandlerTest.java b/instrumentation/rpc/src/test/java/brave/rpc/RpcClientHandlerTest.java index 359edce3bb..e157f16cfe 100644 --- a/instrumentation/rpc/src/test/java/brave/rpc/RpcClientHandlerTest.java +++ b/instrumentation/rpc/src/test/java/brave/rpc/RpcClientHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/rpc/src/test/java/brave/rpc/RpcTracingTest.java b/instrumentation/rpc/src/test/java/brave/rpc/RpcTracingTest.java index f770538584..969d000956 100644 --- a/instrumentation/rpc/src/test/java/brave/rpc/RpcTracingTest.java +++ b/instrumentation/rpc/src/test/java/brave/rpc/RpcTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet-jakarta/pom.xml b/instrumentation/servlet-jakarta/pom.xml index b188b140e8..cfe95af987 100644 --- a/instrumentation/servlet-jakarta/pom.xml +++ b/instrumentation/servlet-jakarta/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/TracingFilter.java b/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/TracingFilter.java index 0d15ddfe3b..d8e7b7aab7 100644 --- a/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/TracingFilter.java +++ b/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/TracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/internal/ServletRuntime.java b/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/internal/ServletRuntime.java index 9dd940b461..7945a05d38 100644 --- a/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/internal/ServletRuntime.java +++ b/instrumentation/servlet-jakarta/src/main/java/brave/jakarta/servlet/internal/ServletRuntime.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletRequestWrapperTest.java b/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletRequestWrapperTest.java index d7dbae4ed3..b7a74bb1fd 100644 --- a/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletRequestWrapperTest.java +++ b/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletRequestWrapperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletResponseWrapperTest.java b/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletResponseWrapperTest.java index 45d73c8fbc..2bd719a912 100644 --- a/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletResponseWrapperTest.java +++ b/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/HttpServletResponseWrapperTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/ITTracingFilter.java b/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/ITTracingFilter.java index 62da3e5e68..81cbb82726 100644 --- a/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/ITTracingFilter.java +++ b/instrumentation/servlet-jakarta/src/test/java/brave/jakarta/servlet/ITTracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet/pom.xml b/instrumentation/servlet/pom.xml index dc23aa1d0a..cef50a11bd 100644 --- a/instrumentation/servlet/pom.xml +++ b/instrumentation/servlet/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/servlet/src/main/java/brave/servlet/HttpServletAdapter.java b/instrumentation/servlet/src/main/java/brave/servlet/HttpServletAdapter.java index 4608fa0a81..d7895c5ba3 100644 --- a/instrumentation/servlet/src/main/java/brave/servlet/HttpServletAdapter.java +++ b/instrumentation/servlet/src/main/java/brave/servlet/HttpServletAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet/src/main/java/brave/servlet/internal/ServletRuntime.java b/instrumentation/servlet/src/main/java/brave/servlet/internal/ServletRuntime.java index 7fca26afad..06a921248f 100644 --- a/instrumentation/servlet/src/main/java/brave/servlet/internal/ServletRuntime.java +++ b/instrumentation/servlet/src/main/java/brave/servlet/internal/ServletRuntime.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/servlet/src/test/java/brave/servlet/HttpServletAdapterTest.java b/instrumentation/servlet/src/test/java/brave/servlet/HttpServletAdapterTest.java index 839e95b05e..65da247dd6 100644 --- a/instrumentation/servlet/src/test/java/brave/servlet/HttpServletAdapterTest.java +++ b/instrumentation/servlet/src/test/java/brave/servlet/HttpServletAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITSparkTracing.java b/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITSparkTracing.java index a31b246b3e..9ca5c3a14b 100644 --- a/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITSparkTracing.java +++ b/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITSparkTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITTracingFilter.java b/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITTracingFilter.java index deb45d88f1..b2ad0e1ebb 100644 --- a/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITTracingFilter.java +++ b/instrumentation/sparkjava/src/test/java/brave/sparkjava/ITTracingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/sparkjava/src/test/java/brave/sparkjava/TestApplication.java b/instrumentation/sparkjava/src/test/java/brave/sparkjava/TestApplication.java index 519edbfd4b..ed4bbb5f1e 100644 --- a/instrumentation/sparkjava/src/test/java/brave/sparkjava/TestApplication.java +++ b/instrumentation/sparkjava/src/test/java/brave/sparkjava/TestApplication.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-rabbit/pom.xml b/instrumentation/spring-rabbit/pom.xml index bb26dd35f9..0380742f62 100644 --- a/instrumentation/spring-rabbit/pom.xml +++ b/instrumentation/spring-rabbit/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/MessageConsumerRequest.java b/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/MessageConsumerRequest.java index 951c265303..78af71afc9 100644 --- a/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/MessageConsumerRequest.java +++ b/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/MessageConsumerRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/SpringRabbitTracing.java b/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/SpringRabbitTracing.java index d87cdbad07..fe7bfe9137 100644 --- a/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/SpringRabbitTracing.java +++ b/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/SpringRabbitTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2022 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/TracingRabbitListenerAdvice.java b/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/TracingRabbitListenerAdvice.java index 9fe0273b54..f49d554a6f 100644 --- a/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/TracingRabbitListenerAdvice.java +++ b/instrumentation/spring-rabbit/src/main/java/brave/spring/rabbit/TracingRabbitListenerAdvice.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbitTracing.java b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbitTracing.java index b7ebf9c169..f34fb2d9f6 100644 --- a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbitTracing.java +++ b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/ITSpringRabbitTracing.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/SpringRabbitTracingTest.java b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/SpringRabbitTracingTest.java index 1214a98f19..eecbcc2f9a 100644 --- a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/SpringRabbitTracingTest.java +++ b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/SpringRabbitTracingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/TracingRabbitListenerAdviceTest.java b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/TracingRabbitListenerAdviceTest.java index 1862ab73f3..785c918128 100644 --- a/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/TracingRabbitListenerAdviceTest.java +++ b/instrumentation/spring-rabbit/src/test/java/brave/spring/rabbit/TracingRabbitListenerAdviceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-web/pom.xml b/instrumentation/spring-web/pom.xml index a6af1d7df3..6c201891be 100644 --- a/instrumentation/spring-web/pom.xml +++ b/instrumentation/spring-web/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/spring-web/src/main/java/brave/spring/web/TracingAsyncClientHttpRequestInterceptor.java b/instrumentation/spring-web/src/main/java/brave/spring/web/TracingAsyncClientHttpRequestInterceptor.java index c33562851d..c4a275924c 100644 --- a/instrumentation/spring-web/src/main/java/brave/spring/web/TracingAsyncClientHttpRequestInterceptor.java +++ b/instrumentation/spring-web/src/main/java/brave/spring/web/TracingAsyncClientHttpRequestInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-web/src/main/java/brave/spring/web/TracingClientHttpRequestInterceptor.java b/instrumentation/spring-web/src/main/java/brave/spring/web/TracingClientHttpRequestInterceptor.java index 563110d6b1..4516e3f537 100644 --- a/instrumentation/spring-web/src/main/java/brave/spring/web/TracingClientHttpRequestInterceptor.java +++ b/instrumentation/spring-web/src/main/java/brave/spring/web/TracingClientHttpRequestInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/spring-webmvc/pom.xml b/instrumentation/spring-webmvc/pom.xml index 981566cc0c..abd12f37a0 100644 --- a/instrumentation/spring-webmvc/pom.xml +++ b/instrumentation/spring-webmvc/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/spring-webmvc/src/test/java/brave/spring/webmvc/ITSpanCustomizingAsyncHandlerInterceptor.java b/instrumentation/spring-webmvc/src/test/java/brave/spring/webmvc/ITSpanCustomizingAsyncHandlerInterceptor.java index 83eb1937fe..5f4759eaf6 100644 --- a/instrumentation/spring-webmvc/src/test/java/brave/spring/webmvc/ITSpanCustomizingAsyncHandlerInterceptor.java +++ b/instrumentation/spring-webmvc/src/test/java/brave/spring/webmvc/ITSpanCustomizingAsyncHandlerInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/instrumentation/vertx-web/pom.xml b/instrumentation/vertx-web/pom.xml index 54994dd3b8..34ecb8eb11 100644 --- a/instrumentation/vertx-web/pom.xml +++ b/instrumentation/vertx-web/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-instrumentation-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/instrumentation/vertx-web/src/main/java/brave/vertx/web/TracingRoutingContextHandler.java b/instrumentation/vertx-web/src/main/java/brave/vertx/web/TracingRoutingContextHandler.java index c9c030cbc4..34fe95b789 100644 --- a/instrumentation/vertx-web/src/main/java/brave/vertx/web/TracingRoutingContextHandler.java +++ b/instrumentation/vertx-web/src/main/java/brave/vertx/web/TracingRoutingContextHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/pom.xml b/pom.xml index 2ef75a8737..9cc5872c45 100755 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ io.zipkin.brave brave-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT pom Brave (parent) @@ -84,7 +84,7 @@ 2.27.0 - 3.0.0 + 2.17.2 1.3.2 diff --git a/spring-beans/pom.xml b/spring-beans/pom.xml index 0b1378a547..44fd40855c 100644 --- a/spring-beans/pom.xml +++ b/spring-beans/pom.xml @@ -18,7 +18,7 @@ io.zipkin.brave brave-parent - 6.0.0-SNAPSHOT + 5.18.1-SNAPSHOT 4.0.0 diff --git a/spring-beans/src/main/java/brave/spring/beans/EndpointFactoryBean.java b/spring-beans/src/main/java/brave/spring/beans/EndpointFactoryBean.java index 41032b82d9..8846c0338a 100644 --- a/spring-beans/src/main/java/brave/spring/beans/EndpointFactoryBean.java +++ b/spring-beans/src/main/java/brave/spring/beans/EndpointFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/main/java/brave/spring/beans/ExtraFieldPropagationFactoryBean.java b/spring-beans/src/main/java/brave/spring/beans/ExtraFieldPropagationFactoryBean.java index 12f635375b..81911fc03c 100644 --- a/spring-beans/src/main/java/brave/spring/beans/ExtraFieldPropagationFactoryBean.java +++ b/spring-beans/src/main/java/brave/spring/beans/ExtraFieldPropagationFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/main/java/brave/spring/beans/HttpTracingFactoryBean.java b/spring-beans/src/main/java/brave/spring/beans/HttpTracingFactoryBean.java index fdadf0d06c..fa129a85c3 100644 --- a/spring-beans/src/main/java/brave/spring/beans/HttpTracingFactoryBean.java +++ b/spring-beans/src/main/java/brave/spring/beans/HttpTracingFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/main/java/brave/spring/beans/MessagingTracingFactoryBean.java b/spring-beans/src/main/java/brave/spring/beans/MessagingTracingFactoryBean.java index 8ad84a6740..215dc9a3e2 100644 --- a/spring-beans/src/main/java/brave/spring/beans/MessagingTracingFactoryBean.java +++ b/spring-beans/src/main/java/brave/spring/beans/MessagingTracingFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/main/java/brave/spring/beans/RpcTracingFactoryBean.java b/spring-beans/src/main/java/brave/spring/beans/RpcTracingFactoryBean.java index bdb9abd648..5ea1e8a40e 100644 --- a/spring-beans/src/main/java/brave/spring/beans/RpcTracingFactoryBean.java +++ b/spring-beans/src/main/java/brave/spring/beans/RpcTracingFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/main/java/brave/spring/beans/TracingFactoryBean.java b/spring-beans/src/main/java/brave/spring/beans/TracingFactoryBean.java index fe89bafc2e..55327f437d 100644 --- a/spring-beans/src/main/java/brave/spring/beans/TracingFactoryBean.java +++ b/spring-beans/src/main/java/brave/spring/beans/TracingFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/BaggagePropagationFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/BaggagePropagationFactoryBeanTest.java index fd06d88905..0207c9579c 100755 --- a/spring-beans/src/test/java/brave/spring/beans/BaggagePropagationFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/BaggagePropagationFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/EndpointFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/EndpointFactoryBeanTest.java index a3b87e8082..cb88136bf7 100755 --- a/spring-beans/src/test/java/brave/spring/beans/EndpointFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/EndpointFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/ExtraFieldPropagationFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/ExtraFieldPropagationFactoryBeanTest.java index 34f26b75cf..891e417e36 100755 --- a/spring-beans/src/test/java/brave/spring/beans/ExtraFieldPropagationFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/ExtraFieldPropagationFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/HttpTracingFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/HttpTracingFactoryBeanTest.java index cbce9311a9..3f39f58e61 100755 --- a/spring-beans/src/test/java/brave/spring/beans/HttpTracingFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/HttpTracingFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/MessagingTracingFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/MessagingTracingFactoryBeanTest.java index e8e07cdae7..3901131d01 100755 --- a/spring-beans/src/test/java/brave/spring/beans/MessagingTracingFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/MessagingTracingFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/RpcTracingFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/RpcTracingFactoryBeanTest.java index ce8005b0e5..36a33b8f21 100755 --- a/spring-beans/src/test/java/brave/spring/beans/RpcTracingFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/RpcTracingFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at diff --git a/spring-beans/src/test/java/brave/spring/beans/TracingFactoryBeanTest.java b/spring-beans/src/test/java/brave/spring/beans/TracingFactoryBeanTest.java index 278df93bd8..069bd23674 100755 --- a/spring-beans/src/test/java/brave/spring/beans/TracingFactoryBeanTest.java +++ b/spring-beans/src/test/java/brave/spring/beans/TracingFactoryBeanTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2023 The OpenZipkin Authors + * Copyright 2013-2024 The OpenZipkin Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at