1. 22 Dec, 2016 8 commits
    • Artem Bilan's avatar
      Refactor Spring Integration metrics support · d69e43b4
      Artem Bilan authored
      Update Spring Integration metrics support since Spring Integration
      `4.3.6`+ no longer needs `spring-integration-jmx` enable
      `MessageChannel`, `MessageHandler` and `MessageSource` metrics.
      
      - Add `IntegrationManagementConfiguration` conditional auto-configuration
        to provide `@EnableIntegrationManagement` when JMX is `enabled` or there
        is no `IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME` bean.
        By default this bean doesn't exist and you explicitly should declare it
        (e.g. via `@EnableIntegrationManagement`) if you would like to collect
        metrics. At the same time Spring Integration enables it when JMX
        management is present (that is a purpose of that new
        `IntegrationManagementConfiguration`)
      
      - Change `SpringIntegrationMetricReader` to read metrics from the
        `IntegrationManagementConfigurer`, not `IntegrationMBeanExporter`
      
      - Change `PublicMetricsAutoConfiguration` to register
        `IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME` bean if
        not present. Since we are here in `actuator`, therefore we are
        interested in the metrics for SI as well.
      
      - Since we don't need JMX for the metrics any more, remove SI-JMX
        dependency from the `spring-boot-starter-integration`.
      
      - Remove `IntegrationManagementConfiguration` modification from the
        `integrationMbeanExporter()`, since that looks like mutation of an
        external object, when end-user would prefer their own options.
        Therefore we don't need `ObjectProvider<IntegrationManagementConfigurer>`, too
      
      - Add missed `MessageSourceMetrics` gathering for the
        `SpringIntegrationMetricReader`
      
      Closes gh-7722
      d69e43b4
    • Phillip Webb's avatar
      Merge pull request #7723 from artembilan/KafkaPropertiesTypes · 2e0f87e7
      Phillip Webb authored
      * pr/7723:
        Fix typo in Kafka sample
        Fix compatibility with Apache Kafka 0.10.1
      2e0f87e7
    • Artem Bilan's avatar
      Fix typo in Kafka sample · c700cf28
      Artem Bilan authored
      c700cf28
    • Phillip Webb's avatar
      Merge pull request #7714 from izeye/polish-20161221 · f21e7940
      Phillip Webb authored
      * pr/7714:
        Polish
      f21e7940
    • Artem Bilan's avatar
      Fix compatibility with Apache Kafka 0.10.1 · 28474aa3
      Artem Bilan authored
      Update KafkaProperties since  Apache Kafka `0.10.1` changed the type
      for the `ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG` from the
      `Long` to `Integer`.
      
      Kafka includes the following conversion logic:
      
          case LONG:
              if (value instanceof Integer)
                  return ((Integer) value).longValue();
              if (value instanceof Long)
                  return (Long) value;
              else if (value instanceof String)
                  return Long.parseLong(trimmed);
      
      So we remain compatible with both `0.10.0` and `0.10.1`
      
      Closes gh-7723
      28474aa3
    • Johnny Lim's avatar
      Polish · e12b4a94
      Johnny Lim authored
      e12b4a94
    • Phillip Webb's avatar
      Refine LoggingApplicationListenerTests · 4aac1e3f
      Phillip Webb authored
      Update the Tomcat logging test to be more like the real scenario.
      
      See gh-7639
      4aac1e3f
    • Phillip Webb's avatar
      Merge branch '1.4.x' into 1.5.x · 765fd1dc
      Phillip Webb authored
      765fd1dc
  2. 21 Dec, 2016 31 commits
  3. 20 Dec, 2016 1 commit