Commit Graph

2188 Commits (5e3bc0085a62518c8e2c4c25aa1d92007a5e2f44)

Author SHA1 Message Date
Moritz Halbritter 28a3cee5a2 Merge branch '3.0.x'
Closes gh-35766
1 year ago
Moritz Halbritter 85720a5d90 Merge branch '2.7.x' into 3.0.x
Closes gh-35765
1 year ago
Bernardo Bulgarelli 51afaa79a7 Add @AliasFor annotation to EndpointCloudFoundryExtension
See gh-35716
1 year ago
Moritz Halbritter d841490f5f Enable ZipkinProperties in ZipkinAutoConfiguration
Closes gh-35592
2 years ago
Stephane Nicoll 9643dbeed2 Merge branch '3.0.x'
Closes gh-35590
2 years ago
Christoph Dreis b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc
See gh-35568
2 years ago
Stephane Nicoll 7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2 years ago
Johnny Lim 1b5fc89b43 Polish
See gh-35576
2 years ago
Phillip Webb 0743da4987 Merge branch '3.0.x'
Closes gh-35546
2 years ago
Phillip Webb 4072588c29 Polish "Fix invalid Zipkin Reporter back-off behavior"
See gh-35455
2 years ago
ryosuke-hasebe 903e19854d Fix invalid Zipkin Reporter back-off behavior
Update `ReporterConfiguration` so that `spanReporter` back off
if a `Reporter` bean is defined. Prior to this commit, only
`AsyncReporter` beans would be considered.

See gh-35455
2 years ago
Phillip Webb 08c3cccc92 Merge branch '3.0.x' 2 years ago
Phillip Webb 4e305cc209 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb a75cd014fc Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 95d1cb9884 Merge branch '2.5.x' into 2.6.x 2 years ago
Phillip Webb 8316a96515 Polish 2 years ago
Phillip Webb 25b0a4a67b Merge branch '2.5.x' into 2.6.x
Fixes gh-35438
2 years ago
Andy Wilkinson 086b1e5f58 Stop WebFilterChainPostProcessor from causing eager init
Fixes gh-35437
2 years ago
Phillip Webb ef1401fcc9 Fix formatting 2 years ago
Phillip Webb 27c8da66f1 Merge branch '2.5.x' into 2.6.x
Closes gh-35412
2 years ago
Madhura Bhave 307f3c3399 Use endpoint mappings in CloudFoundry integration
Closes gh-35411
2 years ago
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2 years ago
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2 years ago
Johnny Lim ff9fd1abeb Polish
See gh-35185
2 years ago
Stephane Nicoll ae0efba523 Merge branch '3.0.x'
See gh-35312
2 years ago
Stephane Nicoll 1b4f9a7e9c Remove GraphQL's tracing observation auto-configuration
This commit removes the auto-configuration for
PropagationWebGraphQlInterceptor as it has been deprecated with no
replacement.

See gh-35303
2 years ago
Stephane Nicoll 66cc9d73b8 Merge branch '3.0.x' 2 years ago
Stephane Nicoll be29ab389a Merge branch '2.7.x' into 3.0.x 2 years ago
Stephane Nicoll eeefb2a1de Polish 2 years ago
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2 years ago
Jonatan Ivanov 5142e8e157
Support Brave's joint spans
Brave has a feature called joint spans that was enabled by default with
Spring Cloud Sleuth (and Boot 2.x). This has changed with
Micrometer Tracing and Boot 3.x. In order to make migration simpler,
joint spans should be set through a property.
This is a Brave+B3-only feature, W3C is not supported by Brave and
OTel does not have this capability.

See gh-35165
2 years ago
Phillip Webb a890323758 Merge branch '3.0.x' 2 years ago
Andy Wilkinson b03f1e47d0 Merge branch '3.0.x'
Closes gh-35171
2 years ago
Andy Wilkinson d6e3db9c36 Merge branch '2.7.x' into 3.0.x
Closes gh-35170
2 years ago
Andy Wilkinson 472afafd4b Stop WebFilterChainPostProcessor from causing eager init
Fixes gh-35163
2 years ago
Scott Frederick 66db13b962 Refactor web server support to use SslBundles
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.

See gh-34814
2 years ago
Andy Wilkinson 04780650a1 Merge branch '3.0.x'
Closes gh-35087
2 years ago
Andy Wilkinson 32444fed4b Merge branch '2.7.x' into 3.0.x
Closes gh-35086
2 years ago
Madhura Bhave 3522714c13 Use endpoint mappings in CloudFoundry integration
Closes gh-35085
2 years ago
Andy Wilkinson c55d398f95 Validate health group includes and excludes
Closes gh-34360
2 years ago
Andy Wilkinson 45068c777f Document default value for management.otlp.tracing.compression
See gh-34508
2 years ago
Andy Wilkinson c543d9172c Polish "Add auto-configuration for OTLP span exporter"
See gh-34508
2 years ago
Jonatan Ivanov ceaafeca0b Add auto-configuration for OTLP span exporter
With these changes an OTLP HTTP/protobuf exporter is auto-configured
if opentelemetry-exporter-otlp is on the classpath.

See gh-34508
2 years ago
Stephane Nicoll a323bd90a8 Polish "Reintroduce support for ActiveMQ"
See gh-35048
2 years ago
Martin BENDA 3e9908a797 Reintroduce support for ActiveMQ
See gh-35048
2 years ago
Andy Wilkinson 1ad428129d Polish "Add customizer for SdkTracerProviderBuilder"
See gh-34945
2 years ago
Yanming Zhou f40e9738b6 Add customizer for SdkTracerProviderBuilder
See gh-34945
2 years ago
Phillip Webb 1849b82334 Don't apply configuration-properties from auto-configuration plugin
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This  allows us to have auto-configuration modules that don't ship
configuration properties.

Closes gh-35028
2 years ago
Phillip Webb 00dc942e94 Migrate to Spring Security lambda config
Closes gh-35011
2 years ago
Jonatan Ivanov 9774d8a439
Add aggregation temporality to OtlpProperties
In Micrometer 1.11.0-RC1, a new property was introduced in OtlpConfig
to define aggregation temporality.
See https://github.com/micrometer-metrics/micrometer/pull/3625
2 years ago
Andy Wilkinson d4980ea993 Always define connection details beans
Closes gh-34776
2 years ago
Phillip Webb e9a198a68f Merge branch '3.0.x' 2 years ago
Phillip Webb 7fea4c84b4 Update copyright year of changed files 2 years ago
Phillip Webb 8d2f550f8c Merge branch '3.0.x' 2 years ago
Phillip Webb 3ba3558cff Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb 3e9a136143 Polish gradle formatting 2 years ago
Phillip Webb 463701db18 Merge branch '3.0.x' 2 years ago
Phillip Webb d442bfbeff Polish 2 years ago
Stephane Nicoll a031bf4d58 Merge branch '3.0.x'
Closes gh-34867
2 years ago
Stephane Nicoll 579364c2ec Polish "Auto-configure observation for Spring-Batch"
See gh-34305
2 years ago
Mark Bonnekessel 5ad29db9c8 Auto-configure observation for Spring-Batch
See gh-34305
2 years ago
Andy Wilkinson 8721c0e64f Add ConnectionDetail support to Zipkin auto-configuration
Update Zipkin auto-configuration so that `ZipkinConnectionDetails`
beans may be optionally used to provide connection details.

See gh-34657

Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2 years ago
Andy Wilkinson eef4919a33 Start building against Micrometer Tracing 1.1.0-M2 snapshots
See gh-34547

Co-Authored-By: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2 years ago
Moritz Halbritter 0b23ffd73a Merge branch '3.0.x'
Closes gh-34425
2 years ago
Moritz Halbritter ecbc412c7c Add property 'management.wavefront.trace-derived-custom-tag-keys'
Closes gh-34194
2 years ago
Moritz Halbritter 79a4861c17 Merge branch '3.0.x'
Closes gh-34418
2 years ago
Moritz Halbritter 73ba797c02 Merge branch '2.7.x' into 3.0.x
Closes gh-34417
2 years ago
Johnny Lim 956a579bc9 Polish "Add missing Micrometer PropertiesConfigAdapterTests"
See gh-34319
2 years ago
Tadaya Tsuyukubo 1a6d240234 Add management.wavefront.application.custom-tags property
Add `management.wavefront.application.custom-tags` property which
populates custom tags in `ApplicationTags` created by
`WavefrontAutoConfiguration`.

See gh-34223

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2 years ago
Andy Wilkinson 8a9ea2bad8 Merge branch '3.0.x'
Closes gh-34370
2 years ago
Tadaya Tsuyukubo 9854154c31 Specify @Order to the defaultTracingObservationHandler bean definition
See gh-34216

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2 years ago
Phillip Webb 157091a811 Merge branch '3.0.x' 2 years ago
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb b07269a018 Merge branch '3.0.x' 2 years ago
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2 years ago
Andy Wilkinson 1847a9deb6 Upgrade to Spring Framework 6.0.5
Closes gh-34301
2 years ago
Andy Wilkinson e617d362d5 Merge branch '3.0.x'
Closes gh-34208
2 years ago
Andy Wilkinson efbeab74ee Merge branch '2.7.x' into 3.0.x
Closes gh-34207
2 years ago
Mirko Sobeck ff04f009c0 Add missing Micrometer PropertiesConfigAdapterTests
Closes gh-33743
2 years ago
Andy Wilkinson 5cef7632ee Start building against Spring Framework 6.0.5 snapshots
This commit adapts to the changes made for
spring-projects/spring-framework#29885.

Closes gh-34152
2 years ago
Andy Wilkinson 1c9e22c845 Merge branch '3.0.x'
Closes gh-34121
2 years ago
Andy Wilkinson 3551030e3f Add ObservationFilter beans to auto-configured ObservationRegistry
Fixes gh-33968
2 years ago
Moritz Halbritter 23f1c896c9 Merge branch '3.0.x'
Closes gh-34015
2 years ago
Johnny Lim bc7fc90550 Replace Base64Utils with JDK's Base64
See gh-33967
2 years ago
Marcin Grzejszczak 06aec1a9bf Adds CompositeSpanExporter
Micrometer Tracing comes with 3 generic interfaces, SpanExportingPredicate,
SpanReporter and SpanFilter, thanks to which you can decide whether you
want to export a span, how you want to report it and how to mutate it
regardless of which tracer library you are using.

Without this change usage of these 3 interfaces is not possible
for OpenTelemetry.

With this change we're putting all SpanExporters to the
CompositeSpanExporter and apply the exporters only after predicates,
filtering and reporting took place.

See gh-34002
2 years ago
Eddú Meléndez 92dd004375 Add property `headers` in `OtlpProperties`
In Micrometer 1.11, headers property has been introduced.

See gh-34004
2 years ago
Krzysztof Krason 0e68cae57f Use instanceof patterns
See gh-33987
2 years ago
Krzysztof Krason a9c547e767 Use text blocks
See gh-33987
2 years ago
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2 years ago
Phillip Webb 5120242996 Merge branch '2.7.x' into 3.0.x 2 years ago
Krzysztof Krason 888d4ac392 Use '==' rather than '.equals' with enum value
See gh-33987
2 years ago
Moritz Halbritter 31ca94833a Use parent-based sampler by default
Closes gh-33821
2 years ago
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2 years ago
Phillip Webb 7c508fa324 Update copyright year of changed files 2 years ago
Moritz Halbritter 94f4a4396c Merge branch '2.7.x'
Closes gh-33880
2 years ago
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
2 years ago
Phillip Webb fad88232b9 Update copyright year of changed files 2 years ago
Phillip Webb a889c539ab Merge branch '2.7.x' 2 years ago
Phillip Webb a0fe8241a7 Update copyright year of changed files 2 years ago
Moritz Halbritter f08842019e Merge branch '2.7.x'
Closes gh-33841
2 years ago
Moritz Halbritter 96175a8e50 Use OperationParameter consistently
Closes gh-31240
2 years ago
Andy Wilkinson 433364601d Merge branch '2.7.x' 2 years ago
Andy Wilkinson 3b2e5e5292 Remove references to https://repo.spring.io/release 2 years ago
Moritz Halbritter 52760f6b78 Merge branch '2.7.x'
Closes gh-33756
2 years ago
Yongjo Lee 0440e5d1ac Fix duplicate 'the' typo
See gh-33736
2 years ago
Moritz Halbritter fe1c1edcd4 Change transient to volatile in CompositeHandlerExceptionResolver 2 years ago
Phillip Webb a2ac38e203 Update copyright year of changed files 2 years ago
Phillip Webb 1621cfd578 Merge branch '2.7.x' 2 years ago
Phillip Webb 6a0a61f1ce Refine EndpointRequest matcher `toString` and apply to reactive variant
Refine the recently introduced `EndpointRequest` matcher `toString()`
to use lower-case item names. Also applied the same logic to the
reactive variant.

See gh-33690
2 years ago
Moritz Halbritter 3b6b795c9f Merge branch '2.7.x'
Closes gh-33729
2 years ago
rishal c84399e705 Add toString method for EndpointRequestMatcher
See gh-33690
2 years ago
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2 years ago
Phillip Webb f588793445 Update copyright year of changed files 2 years ago
Phillip Webb 0254619782 Merge branch '2.7.x' 2 years ago
Phillip Webb e4772cf3b7 Update copyright year of changed files 2 years ago
Brian Clozel 28f9f20d39 Declare order for ServerHttpObservationFilter WebFilter
This commit declares an `@Order` for the `ServerHttpObservationFilter`
bean declaration in the Observation WebFlux auto-configuration.

This allows developers to consistently order other `WebFilter` instances
relatively to this one. Here, `@Order(Ordered.HIGHEST_PRECEDENCE + 1)`
has been chosen to align with the order of its MVC counterpart.

Fixes gh-33444
2 years ago
Brian Clozel 3310b59520 Polish 2 years ago
Brian Clozel 593b5311e9 Configure GraphQL web propagation for tracing
As of spring-projects/spring-graphql#547, Spring GraphQL introduced a
`PropagationWebGraphQlInterceptor` that propagates the incoming tracing
information in HTTP request headers into the GraphQL context.

This commit auto-configures the propagation interceptor if the
application exposes a GraphQL HTTP endpoint and if it is configured for
Tracing support.

Fixes gh-33542
2 years ago
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2 years ago
Johnny Lim d21572a189 Resolve TODOs for observability tests
See gh-33481
2 years ago
Brian Clozel 50be8cbf91 Fix IllegalArgumentException in WebClient convention adapter
Prior to this commit, the `ClientObservationConventionAdapter` would
fail with an `IllegalArgumentException` when the observation is first
started: at this point, the carrier (the request builder here) is
present, but the full request not yet fully built.

This commit ensures that the convention adapter uses the request and, if
not available, the request builder to adapt to the
`WebClientExchangeTagsProvider`.

Fixes gh-33483
2 years ago
Johnny Lim 90589fd6d4 Polish
See gh-33384
2 years ago
Moritz Halbritter cfaade95df Add test to verify ZipkinRestTemplateBuilderCustomizer
See gh-33399
2 years ago
Moritz Halbritter 2ceee789ce Fix bug where ZipkinRestTemplateBuilderCustomizer had no effect
Closes gh-33399
2 years ago
Brian Clozel 07766c436c Apply user-provided ObservationConventions in auto-configurations
Prior to this commit, we would advise developers, as migration path from
Spring Boot 2.0-x metrics, to create `GlobalObservationConvention` beans
for the observations they want to customize (observation name or key
values).

`GlobalObservationConvention` are currently applied **in addition** to
the chosen convention in some cases, so this does not work well with
this migration path.

Instead, instrumentations always provide a default convention but also a
way to configure a custom convention for their observations. Spring Boot
should inject custom convention beans in the relevant
auto-configurations.

Fixes gh-33285
2 years ago
Jonatan Ivanov 2d40d07773 Remove Brave and OTel HTTP support in favor of instrumentation
See gh-33287
2 years ago
Stephane Nicoll 29ee5d2d9a Polish 2 years ago
Phillip Webb 12b4578e98 Further refine WavefrontProperties
See gh-33244
2 years ago
Phillip Webb c93e248c46 Refine WavefrontProperties
Remove naming properties under `management.wavefront.application`.

Closes gh-33244
2 years ago
Andy Wilkinson e63fcebcf4 Merge branch '2.7.x'
Closes gh-33256
2 years ago
Andy Wilkinson c483e662a9 Merge branch '2.6.x' into 2.7.x
Closes gh-33255
2 years ago
Andy Wilkinson fc9c036c88 Create git commit time with epoch seconds rather than milliseconds
Closes gh-33237
2 years ago
Phillip Webb fb5cdbd11c Create ApplicationTags in common WavefrontAutoConfiguration
Relocate `ApplicationTags` `@Bean` method from
`WavefrontTracingAutoConfiguration` to `WavefrontAutoConfiguration`
since it is now shared between tracing and metrics.

The `application-name`, `service-name`, `cluster-name` and `shard-name`
have also been relocated from `management.wavefront.tracing` to
`management.wavefront`.

Fixes gh-33244
2 years ago
Andy Wilkinson cd455a9f6f Restore previous serialization formatting in Actuator responses
Fixes gh-33236
2 years ago
Phillip Webb a0f39d66fe Polish 'Align Wavefront application tags support with Spring Boot 2.x'
See gh-32844
2 years ago
Glenn Oppegard 42bb4c0615 Align Wavefront application tags support with Spring Boot 2.x
Update `application-name` and `service-name` `management.wavefront`
properties to align with Spring Boot 2.x support. The properties now
use the wavefront terminology where `application` refers to an a
collection of (micro)`services`.

This commit also adds `cluster-name` and `shard-name` properties that
can be used to add additional items to the `ApplicationTags`.

See gh-32844
2 years ago
Johnny Lim 6027508cf7 Polish
See gh-33108
2 years ago
Phillip Webb 0754665973 Merge branch '2.7.x'
Closes gh-33169
2 years ago
Phillip Webb 733638cf89 Merge branch '2.6.x' into 2.7.x
Closes gh-33168
2 years ago
Phillip Webb 2a989b31aa Create Environment and apply ConversionService to management contexts
Update `ManagementContextFactory` implementations to create an
appropriate `Environment` type and to apply the `ConversionService`
from the parent context.

Prior to this commit, the management context `Environment` would not
be able to convert values from a `configtree:` source due to a missing
converter.

Fixes gh-32941
2 years ago
Brian Clozel 932f7d705f Start building against Spring Framework 6.0.0 SNAPSHOTs
See gh-33136
2 years ago
Andy Wilkinson fe72f307f4 Avoid actuator beans being ineligible for post-processing
Closes gh-33110
2 years ago
Andy Wilkinson b5e502d03b Make class package-private as it's returned from package-private method
Returning a private class from a package-private method causes the
AOT-generated source files to fail to compile as the private class is
not visible.

Closes gh-33106
2 years ago
Madhura Bhave 8cb615e9b6 Remove workarounds for SecurityContextRepository 2 years ago
Andy Wilkinson 5f6b63e277 Auto-configure span customizer beans
Closes gh-33087
2 years ago
Phillip Webb e5a0b164ac Configure MeterBinders after beans have been created
Update `MeterRegistryPostProcessor` to configure `MeterRegistry` beans
in two distinct sweeps. The first sweep applies customizers and filters
as the `MeterRegistry` bean is initialized, the second sweep applies
`MeterBinder` beans once all singletons have been instantiated.

Prior to this commit, it was not possible for a `MeterBinder` bean to
directly or indirectly use a `MeterRegistry`. It was also possible for
bound meters to cause a deadlock during refresh processing if those
meters could be updated on a thread other than main, such as GC
notifications.

Fixes gh-30636
Fixes gh-33070
2 years ago
Andy Wilkinson e60084112e Avoid NPE when TraceContext has deferred sampling
Closes gh-33093
2 years ago
Andy Wilkinson 6e4bece912 Make auto-configured OtelTracer back off when user defines a Tracer
Closes gh-33097
2 years ago
Andy Wilkinson d91e16a6c5 Make auto-configured BraveTracer back off when user defines a Tracer
Closes gh-33095
2 years ago