From bc39d7f894a2650bcf372b42932379aa3c32a323 Mon Sep 17 00:00:00 2001 From: Gang Li Date: Fri, 15 Sep 2023 22:11:07 +0800 Subject: [PATCH] Change license header and update --- .github/workflows/merge-build.yml | 2 +- .github/workflows/pr-build.yml | 2 +- metrics/api/pom.xml | 2 +- .../o11yphant/metrics/MetricSetProvider.java | 2 +- .../o11yphant/metrics/MetricsConstants.java | 2 +- .../o11yphant/metrics/MetricsManager.java | 2 +- .../metrics/RequestContextConstants.java | 2 +- .../o11yphant/metrics/annotation/Measure.java | 2 +- .../o11yphant/metrics/annotation/MetricNamed.java | 2 +- .../metrics/annotation/MetricWrapper.java | 2 +- .../metrics/annotation/MetricWrapperEnd.java | 2 +- .../metrics/annotation/MetricWrapperNamed.java | 2 +- .../annotation/MetricWrapperNamedAfterRun.java | 2 +- .../metrics/annotation/MetricWrapperStart.java | 2 +- .../commonjava/o11yphant/metrics/api/Gauge.java | 2 +- .../o11yphant/metrics/api/Histogram.java | 2 +- .../commonjava/o11yphant/metrics/api/Meter.java | 2 +- .../commonjava/o11yphant/metrics/api/Metered.java | 2 +- .../commonjava/o11yphant/metrics/api/Metric.java | 2 +- .../o11yphant/metrics/api/MetricRegistry.java | 2 +- .../o11yphant/metrics/api/MetricSet.java | 2 +- .../o11yphant/metrics/api/Snapshot.java | 2 +- .../commonjava/o11yphant/metrics/api/Timer.java | 2 +- .../api/healthcheck/CompoundHealthCheck.java | 2 +- .../metrics/api/healthcheck/HealthCheck.java | 2 +- .../o11yphant/metrics/conf/ConsoleConfig.java | 2 +- .../o11yphant/metrics/conf/ELKConfig.java | 2 +- .../o11yphant/metrics/conf/GraphiteConfig.java | 2 +- .../o11yphant/metrics/conf/MetricsConfig.java | 2 +- .../o11yphant/metrics/conf/PrometheusConfig.java | 2 +- .../metrics/exception/MetricsException.java | 2 +- .../o11yphant/metrics/util/NameUtils.java | 2 +- metrics/common/pom.xml | 2 +- .../metrics/AbstractTrafficClassifier.java | 2 +- .../o11yphant/metrics/RequestContextHelper.java | 2 +- .../o11yphant/metrics/TrafficClassifier.java | 2 +- .../healthcheck/impl/AbstractHealthCheck.java | 2 +- .../healthcheck/impl/HealthCheckResult.java | 2 +- .../healthcheck/impl/SummaryHealthCheck.java | 2 +- .../impl/component/ComponentHealthCheck.java | 2 +- .../impl/component/DeadlockHealthCheck.java | 2 +- .../impl/component/HeapHealthCheck.java | 2 +- .../o11yphant/metrics/impl/O11Histogram.java | 2 +- .../o11yphant/metrics/impl/O11Meter.java | 2 +- .../o11yphant/metrics/impl/O11Snapshot.java | 2 +- .../o11yphant/metrics/impl/O11Timer.java | 2 +- .../metrics/sli/GoldenSignalsFunctionMetrics.java | 2 +- .../metrics/sli/GoldenSignalsMetricSet.java | 2 +- metrics/core/pom.xml | 2 +- .../src/main/conf/conf.d/elasticsearch.properties | 2 +- .../o11yphant/metrics/DefaultMetricRegistry.java | 2 +- .../o11yphant/metrics/DefaultMetricsManager.java | 2 +- .../o11yphant/metrics/GoldenSignalsFilter.java | 2 +- .../metrics/conf/DefaultMetricsConfig.java | 2 +- .../metrics/inject/DefaultMetricProducer.java | 2 +- .../interceptor/DefaultMetricsInterceptor.java | 2 +- .../CodahaleHealthCheckDeploymentProvider.java | 2 +- ...CodahaleHealthCheckServletContextListener.java | 2 +- .../CodahalePrometheusDeploymentProvider.java | 2 +- .../metrics/jaxrs/DeploymentProvider.java | 2 +- .../jaxrs/HealthCheckDeploymentProvider.java | 2 +- .../metrics/jaxrs/LoggingPrometheusServlet.java | 2 +- .../jaxrs/PromEnhancedStatsAndTimingExports.java | 2 +- .../jaxrs/PrometheusDeploymentProvider.java | 2 +- .../jaxrs/PrometheusFilteringRegistry.java | 2 +- .../metrics/jaxrs/PrometheusSampleBuilder.java | 2 +- .../o11yphant/metrics/jvm/JVMInstrumentation.java | 2 +- .../metrics/reporter/ReporterInitializer.java | 2 +- .../metrics/system/StoragePathProvider.java | 2 +- .../o11yphant/metrics/system/SystemGaugesSet.java | 2 +- .../metrics/system/SystemGaugesSetProvider.java | 2 +- .../o11yphant/metrics/util/HealthCheckUtils.java | 2 +- .../o11yphant/metrics/util/MetricUtils.java | 2 +- .../metrics/DefaultMetricRegistryTest.java | 2 +- metrics/pom.xml | 2 +- pom.xml | 6 +++--- trace/api/pom.xml | 2 +- .../o11yphant/trace/SpanFieldsDecorator.java | 2 +- .../commonjava/o11yphant/trace/TraceManager.java | 2 +- .../o11yphant/trace/TracerConfiguration.java | 2 +- .../o11yphant/trace/TracingConstants.java | 2 +- .../o11yphant/trace/impl/FieldInjectionSpan.java | 2 +- .../o11yphant/trace/impl/SpanWrapper.java | 2 +- .../o11yphant/trace/impl/ThreadedSpan.java | 2 +- .../trace/spi/CloseBlockingDecorator.java | 2 +- .../o11yphant/trace/spi/ContextPropagator.java | 2 +- .../o11yphant/trace/spi/O11yphantTracePlugin.java | 2 +- .../o11yphant/trace/spi/SpanFieldsInjector.java | 2 +- .../o11yphant/trace/spi/SpanProvider.java | 2 +- .../o11yphant/trace/spi/adapter/SpanAdapter.java | 2 +- .../o11yphant/trace/spi/adapter/SpanContext.java | 2 +- .../o11yphant/trace/spi/adapter/TracerType.java | 2 +- .../trace/thread/ThreadTracingContext.java | 2 +- .../trace/thread/ThreadedTraceContext.java | 2 +- .../trace/thread/TraceThreadContextualizer.java | 15 +++++++++++++++ trace/core/pom.xml | 2 +- .../CassandraConnectionSpanFieldsInjector.java | 2 +- .../trace/impl/ConfiguredSpanFieldsInjector.java | 2 +- .../impl/DBConnectionSpanFieldsInjector.java | 2 +- .../trace/impl/EnvSpanFieldsInjector.java | 2 +- .../impl/GoldenSignalsSpanFieldsInjector.java | 2 +- .../trace/impl/JVMSpanFieldsInjector.java | 2 +- .../interceptor/FlatTraceMeasureInterceptor.java | 2 +- .../FlatTraceWrapperEndInterceptor.java | 2 +- .../interceptor/FlatTraceWrapperInterceptor.java | 2 +- .../FlatTraceWrapperStartInterceptor.java | 2 +- .../o11yphant/trace/util/InterceptorUtils.java | 2 +- .../trace/impl/JVMSpanFieldsInjectorTest.java | 2 +- .../commonjava/o11yphant/trace/impl/MockSpan.java | 2 +- trace/helper-httpclient/pom.xml | 2 +- .../trace/httpclient/HttpClientTools.java | 2 +- trace/helper-jhttpc/pom.xml | 2 +- .../o11yphant/jhttpc/SpanClosingResponse.java | 2 +- .../o11yphant/jhttpc/SpanningHttpFactory.java | 2 +- .../o11yphant/jhttpc/TracerHttpClient.java | 2 +- trace/helper-servlet/pom.xml | 2 +- .../trace/servlet/ServletContextTools.java | 2 +- .../o11yphant/trace/servlet/TraceFilter.java | 2 +- trace/honeycomb/pom.xml | 2 +- .../honeycomb/HoneycombConfiguration.java | 2 +- .../o11yphant/honeycomb/HoneycombTracePlugin.java | 2 +- .../honeycomb/impl/ConfigurableTraceSampler.java | 2 +- .../honeycomb/impl/CustomTraceIdProvider.java | 2 +- .../honeycomb/impl/DefaultTracingContext.java | 2 +- .../impl/HoneycombContextPropagator.java | 2 +- .../honeycomb/impl/HoneycombSpanProvider.java | 2 +- .../honeycomb/impl/SimpleTraceSampler.java | 2 +- .../honeycomb/impl/adapter/HoneycombSpan.java | 2 +- .../impl/adapter/HoneycombSpanContext.java | 2 +- .../honeycomb/impl/adapter/HoneycombType.java | 2 +- .../impl/event/MeteringEventPostProcessor.java | 2 +- .../src/main/resources/META-INF/beans.xml | 2 +- trace/otel/pom.xml | 2 +- .../o11yphant/otel/OtelConfiguration.java | 2 +- .../o11yphant/otel/OtelTracePlugin.java | 2 +- .../otel/impl/OtelContextPropagator.java | 2 +- .../o11yphant/otel/impl/OtelSpanProvider.java | 2 +- .../otel/impl/OtelThreadTracingContext.java | 2 +- .../o11yphant/otel/impl/adapter/OtelSpan.java | 2 +- .../otel/impl/adapter/OtelSpanContext.java | 2 +- .../o11yphant/otel/impl/adapter/OtelType.java | 2 +- .../o11yphant/otel/OtelTracePluginTest.java | 2 +- trace/pom.xml | 2 +- 143 files changed, 159 insertions(+), 144 deletions(-) diff --git a/.github/workflows/merge-build.yml b/.github/workflows/merge-build.yml index 4daabff1..7a8cb1f6 100644 --- a/.github/workflows/merge-build.yml +++ b/.github/workflows/merge-build.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Red Hat, Inc. (nos-devel@redhat.com) +# Copyright (C) 2020-2023 Red Hat, Inc. (https://github.com/commonjava/o11yphant) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index ec43b1b4..2e0dcfc5 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 Red Hat, Inc. (nos-devel@redhat.com) +# Copyright (C) 2020-2023 Red Hat, Inc. (https://github.com/commonjava/o11yphant) # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/metrics/api/pom.xml b/metrics/api/pom.xml index 880d982d..6178b5e2 100644 --- a/metrics/api/pom.xml +++ b/metrics/api/pom.xml @@ -1,7 +1,7 @@