[Hawkular-commits] [hawkular/hawkular-metrics] eacccd: [HWKMETRICS-564] fix several bugs

Fri Jan 20 14:51:01 EST 2017

  Branch: refs/heads/HWKMETRICS-523_2
  Home:   https://github.com/hawkular/hawkular-metrics
  Commit: eacccd7ff3aec11c306efbb3977da338218284bc
      https://github.com/hawkular/hawkular-metrics/commit/eacccd7ff3aec11c306efbb3977da338218284bc
  Author: John Sanda <jsanda at redhat.com>
  Date:   2017-01-06 (Fri, 06 Jan 2017)

  Changed paths:
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/JobsService.java
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java

  Log Message:
  -----------
  [HWKMETRICS-564] fix several bugs

When jobs fall behind and are rescheduled for immediate execution, we first
renew the job lock. The job should only be executed again if the lock is
successfully renewed. We were always executing the job. This is fixed.

When there are jobs to execute across multiple time slices, we were executing
things out of order. This is fixed simply by replacing flatMap with concatMap
in a few places.

When retrying a job execution, we were updating finished_jobs_idx with the
wrong timestamp. We were using the trigger time instead of the time in which
the job is scheduled. In this scenario, the scheduled time != the trigger time.

  Commit: 91cb9007a400b356c03dced348d6fd9cfdeb3904
      https://github.com/hawkular/hawkular-metrics/commit/91cb9007a400b356c03dced348d6fd9cfdeb3904
  Author: John Sanda <jsanda at redhat.com>
  Date:   2017-01-09 (Mon, 09 Jan 2017)

  Changed paths:
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java

  Log Message:
  -----------
  [HWKMETRICS-564] changes based on PR review

  Commit: 028528516fb315f232874d0de1e6301a1ca3d53e
      https://github.com/hawkular/hawkular-metrics/commit/028528516fb315f232874d0de1e6301a1ca3d53e
  Author: Stefan Negrea <stefannegrea at users.noreply.github.com>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/JobsService.java
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java

  Log Message:
  -----------
  Merge pull request #719 from jsanda/hwkmetrics-564

[HWKMETRICS-564] fix several bugs

  Commit: 20d86c30242ca3238de55e660f8f41fe2ea79e64
      https://github.com/hawkular/hawkular-metrics/commit/20d86c30242ca3238de55e660f8f41fe2ea79e64
  Author: mwringe <mwringe at redhat.com>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    M containers/hawkular-openshift-security-filter/src/main/java/org/hawkular/openshift/auth/TokenAuthenticator.java

  Log Message:
  -----------
  HWKMETRICS-571: properly handle all response types from the OpenShift API.

  Commit: 185b2db40d38dd3d08454112c7bae60fad5eb182
      https://github.com/hawkular/hawkular-metrics/commit/185b2db40d38dd3d08454112c7bae60fad5eb182
  Author: Stefan Negrea <stefannegrea at users.noreply.github.com>
  Date:   2017-01-10 (Tue, 10 Jan 2017)

  Changed paths:
    M containers/hawkular-openshift-security-filter/src/main/java/org/hawkular/openshift/auth/TokenAuthenticator.java

  Log Message:
  -----------
  Merge pull request #720 from mwringe/HWKMETRICS-571

HWKMETRICS-571: properly handle all response types from the OpenShift API

  Commit: af66de6b339bfb3705584a2afbdd1f8bdd02b854
      https://github.com/hawkular/hawkular-metrics/commit/af66de6b339bfb3705584a2afbdd1f8bdd02b854
  Author: Michael Burman <yak at iki.fi>
  Date:   2017-01-11 (Wed, 11 Jan 2017)

  Changed paths:
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java

  Log Message:
  -----------
  Change dropWizard logging to debug

  Commit: 8b8f02038e6143fa8c6464ba5649240e9189dbad
      https://github.com/hawkular/hawkular-metrics/commit/8b8f02038e6143fa8c6464ba5649240e9189dbad
  Author: jsanda <jsanda at redhat.com>
  Date:   2017-01-11 (Wed, 11 Jan 2017)

  Changed paths:
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java

  Log Message:
  -----------
  Merge pull request #722 from burmanm/dropwizard_logging

Change dropWizard logging to debug

  Commit: c0463168ef570a54376293f8ffbd3d1d9db18ff4
      https://github.com/hawkular/hawkular-metrics/commit/c0463168ef570a54376293f8ffbd3d1d9db18ff4
  Author: Michael Burman <yak at iki.fi>
  Date:   2017-01-11 (Wed, 11 Jan 2017)

  Changed paths:
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java

  Log Message:
  -----------
  Hiphurraa license header

  Commit: 746b219b3f22de18664f2b5cd50393ad2ef1da2d
      https://github.com/hawkular/hawkular-metrics/commit/746b219b3f22de18664f2b5cd50393ad2ef1da2d
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java
    M api/metrics-api-util/src/main/java/org/hawkular/metrics/api/jaxrs/config/ConfigurationKey.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/MetricNameService.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/MetricsInitializer.java

  Log Message:
  -----------
  [HWKMETRICS-572] Make admin tenant configurable. The admin tenant is used for persisting internal metrics.

  Commit: 7ce50ad2f582e7ac6b810b7c534da6dfaf62099e
      https://github.com/hawkular/hawkular-metrics/commit/7ce50ad2f582e7ac6b810b7c534da6dfaf62099e
  Author: jsanda <jsanda at redhat.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java
    M api/metrics-api-util/src/main/java/org/hawkular/metrics/api/jaxrs/config/ConfigurationKey.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/MetricNameService.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/MetricsInitializer.java

  Log Message:
  -----------
  Merge pull request #728 from hawkular/HWKMETRICS-572

[HWKMETRICS-572] Make admin tenant configurable. The admin tenant is …

  Commit: e1fccdcd3ba65895c109febfeec25298c3412cfe
      https://github.com/hawkular/hawkular-metrics/commit/e1fccdcd3ba65895c109febfeec25298c3412cfe
  Author: John Sanda <jsanda at redhat.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java

  Log Message:
  -----------
  [HWKMETRICS-577] make MetricNameService object a member variable

  Commit: 48b22e2909e22d28e68e227c9c7a0097df575e59
      https://github.com/hawkular/hawkular-metrics/commit/48b22e2909e22d28e68e227c9c7a0097df575e59
  Author: John Sanda <jsanda at redhat.com>
  Date:   2017-01-18 (Wed, 18 Jan 2017)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java
    M api/metrics-api-util/src/main/java/org/hawkular/metrics/api/jaxrs/config/ConfigurationKey.java

  Log Message:
  -----------
  [HWKMETRICS-578] disable metrics reporting by default

  Commit: f8026cad4748be3ae1c3d4ca332bd8fd8dccdab8
      https://github.com/hawkular/hawkular-metrics/commit/f8026cad4748be3ae1c3d4ca332bd8fd8dccdab8
  Author: Stefan Negrea <stefannegrea at users.noreply.github.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java
    M api/metrics-api-util/src/main/java/org/hawkular/metrics/api/jaxrs/config/ConfigurationKey.java

  Log Message:
  -----------
  Merge pull request #732 from jsanda/hwkmetrics-578

[HWKMETRICS-578] disable metrics reporting by default

  Commit: b8b224ec0daceeaab32dc25cd757dca4e1538858
      https://github.com/hawkular/hawkular-metrics/commit/b8b224ec0daceeaab32dc25cd757dca4e1538858
  Author: Stefan Negrea <stefannegrea at users.noreply.github.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java

  Log Message:
  -----------
  Merge pull request #730 from jsanda/hwkmetrics-577

[HWKMETRICS-577] make MetricNameService object a member variable

  Commit: 67e3a467f3f60019ed472b6bda7e6cad82029401
      https://github.com/hawkular/hawkular-metrics/commit/67e3a467f3f60019ed472b6bda7e6cad82029401
  Author: John Sanda <jsanda at redhat.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java

  Log Message:
  -----------
  [HWKMETRICS-579] job subscription should run on the I/O scheduler

  Commit: cd83a172307d7ecccd6436c6336018e09601219f
      https://github.com/hawkular/hawkular-metrics/commit/cd83a172307d7ecccd6436c6336018e09601219f
  Author: Paul Gier <pgier at redhat.com>
  Date:   2017-01-19 (Thu, 19 Jan 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  [HWKMETRICS-582] Upgrade joda-time 2.7 -> 2.9.5

  Commit: 40b30c4e602aabb041303dd11ad5591405fc7248
      https://github.com/hawkular/hawkular-metrics/commit/40b30c4e602aabb041303dd11ad5591405fc7248
  Author: Stefan Negrea <stefannegrea at users.noreply.github.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #739 from pgier/HWKMETRICS-582

[HWKMETRICS-582] Upgrade joda-time 2.7 -> 2.9.5

  Commit: 046cb9839c8199d0fdeab27886caf53c2bfeb896
      https://github.com/hawkular/hawkular-metrics/commit/046cb9839c8199d0fdeab27886caf53c2bfeb896
  Author: Stefan Negrea <stefannegrea at users.noreply.github.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java

  Log Message:
  -----------
  Merge pull request #737 from jsanda/hwkmetrics-579

[HWKMETRICS-579] job subscription should run on the I/O scheduler

  Commit: 4f4142d3ba9b1d3907ddcb3d9ea15c535fd4dfb0
      https://github.com/hawkular/hawkular-metrics/commit/4f4142d3ba9b1d3907ddcb3d9ea15c535fd4dfb0
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/MetricsServiceLifecycle.java
    M api/metrics-api-util/src/main/java/org/hawkular/metrics/api/jaxrs/config/ConfigurationKey.java
    M containers/hawkular-openshift-security-filter/src/main/java/org/hawkular/openshift/auth/TokenAuthenticator.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/DropWizardReporter.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/MetricNameService.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/dropwizard/MetricsInitializer.java
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/JobsService.java
    M job-scheduler/src/main/java/org/hawkular/metrics/scheduler/impl/SchedulerImpl.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:hawkular/hawkular-metrics into HWKMETRICS-523_2

  Commit: 20c16fdb46e63ad09db02ce4101f3a342d39fbbb
      https://github.com/hawkular/hawkular-metrics/commit/20c16fdb46e63ad09db02ce4101f3a342d39fbbb
  Author: Stefan Negrea <snegrea at redhat.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M core/metrics-core-service/src/main/antlr4/org/hawkular/metrics/core/service/tags/parser/TagQuery.g4
    M core/metrics-core-service/src/main/java/TagQuery.tokens
    M core/metrics-core-service/src/main/java/TagQueryLexer.tokens
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/ExpressionTagQueryParser.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseListener.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryBaseVisitor.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryLexer.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryListener.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryParser.java
    M core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/tags/parser/TagQueryVisitor.java
    M core/metrics-core-service/src/test/java/org/hawkular/metrics/core/service/metrics/ExpressionTagQueryITest.java
    M integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/ExpressionTagQueryITest.groovy

  Log Message:
  -----------
  [HWKMETRICS-523] The expression now supports non-quoted text for simple tag value matching. Complex regex expressions are still required to be enclosed in single quotes.

Also, query for the actual metric definitions only when the result is returned by the users. Use metric id definition up to that point.

Compare: https://github.com/hawkular/hawkular-metrics/compare/b250cfe919e1...20c16fdb46e6