Permalink
Commits on Jun 22, 2017
  1. [maven-release-plugin] prepare for next development iteration

    zipkinci committed Jun 22, 2017
  2. [maven-release-plugin] prepare release 1.26.2

    zipkinci committed Jun 22, 2017
  3. Escape HTML input (#1625)

    eirslett committed with adriancole Jun 22, 2017
Commits on Jun 20, 2017
  1. InMemorySpanStore.clear() should clear all its data (#1624)

    joel-airspring committed with adriancole Jun 20, 2017
Commits on Jun 15, 2017
  1. [maven-release-plugin] prepare for next development iteration

    zipkinci committed Jun 15, 2017
  2. [maven-release-plugin] prepare release 1.26.1

    zipkinci committed Jun 15, 2017
  3. Updates versions notably Spring Boot, MariaDB and ErrorProne (#1618)

    ErrorProne caught a small bug in cassandra3. MariaDB bump caught a
    missing dialect.
    adriancole committed on GitHub Jun 15, 2017
  4. Allow query-only servers to disable the HTTP collector (#1615)

    * Added configuration point for enabling or disabling the HTTP collector in zipkin-server. This can be controlled through the property zipkin.collector.http.enabled or the corresponding environment variable HTTP_COLLECTOR_ENABLED. The collector is enabled by default.
    dgrabows committed with adriancole Jun 15, 2017
  5. Accepts json span names (previously broke ElasticSearch) (#1616)

    While not good practice, if we break on json span names, users can't
    easily troubleshoot. This works around the problem by escaping json.
    
    Fixes #1613
    adriancole committed on GitHub Jun 15, 2017
  6. Disables services in CircleCI redundantly tested with Travis

    adriancole committed Jun 15, 2017
Commits on Jun 13, 2017
  1. Add zipkin banner (#1612)

    making committed with adriancole Jun 13, 2017
Commits on Jun 7, 2017
  1. Merge pull request #1606 from shakuzen/patch-2

    Fix broken image markup in UI README
    eirslett committed on GitHub Jun 7, 2017
  2. Fix broken image markup in UI README

    shakuzen committed on GitHub Jun 7, 2017
Commits on Jun 5, 2017
  1. Makes the simple type name of kafka10's autoconfiguration unique (#1598)

    The /autoconfig endpoint expects the simple type names of autoconfiguration
    to be different.
    adriancole committed on GitHub Jun 5, 2017
  2. Add .editorconfig and make sure we use LF (not CRLF) for line endings (

    …#1603)
    
    * Add .editorconfig and make sure we use LF (not CRLF) for line endings
    
    * All code should be utf-8
    eirslett committed with adriancole Jun 5, 2017
Commits on May 18, 2017
  1. Made a note explaining why this differs from zipkin-aws

    adriancole committed on GitHub May 18, 2017
Commits on May 17, 2017
  1. [maven-release-plugin] prepare for next development iteration

    zipkinci committed May 17, 2017
  2. [maven-release-plugin] prepare release 1.26.0

    zipkinci committed May 17, 2017
  3. Add a Kafka 0.10+ compatible collector and attempt to integrate into …

    …zipkin-server (#1586)
    
    * Added module to house a kafka 0.10 compatible collector. Made an initial pass at converting the 0.8 collector over to the new Kafka Consumer API. Still need to work on tests, which don't even compile at this point, and shake out issues withthe implementation.
    
    * Got tests working for Kafka 0.10 Collector. Added some logging and resource cleanup to the collector. There are still some outstanding todos and logging levels in the tests are probably a bit verbose.
    
    * Added auto-configure module for Kafka 0.10 collector. Still need to wire it into zipkin-server.
    
    * Wired Kafka 0.10 collector auto-configuration into zipkin-server.
    
    * Removed todo comment about adding max message size config point. Determined that this is not necessary. The new consumer will always fetch at least one message, even if it is larger than the configured maximum size per partition or per fetch. See in max.partition.fetch.bytes and fetch.max.bytes https://kafka.apache.org/documentation/#newconsumerconfigs. These settings can still be modified via overrides if there is a need to tune these soft limits on fetch sizes.
    
    * Added some documentation on configuration properties. Cleaned up some unused imports and variables.
    
    * Switched environment variables from KAFKA10_* to KAFKA_*.
    
    * Doc updates for changing environment variables from KAFKA10_* to KAFKA_*.
    
    * Merged zipkin.collector.kafka10 configuration properties into zipkin.collector.kafka properties.
    
    * Updated test missed when merging zipkin.collector.kafka10 properties into zipkin.collector.kafka properties.
    
    * Replaced zipkin.collector.kafka.consumer-threads property with pre-existing zipkin.collector.kafka.streams property. Updated docs to better describe configuration opations for Kafka 0.10 collector. Added a todo for unit testing the collector with more than one consumer thread.
    
    * Pom version bumps to get caught up with changes from openzipkin/zipkin/master.
    
    * Added packaging of module jar to Kafka 0.10 autoconfigure module. Removed kafak10 collector dependency from zipkin-server.
    
    * Added new test cases for kafka10 collector autoconfigure. The first ensures Kafka consumer configuration overrides are correctly included in properties used to construct new consumers. The second ensures the kafka10 collector will not be loaded if the bootstrap servers property is set to an empty value.
    
    * Cleaned up log binding and configuration for zipkin-collector-kafka10 unit tests. Deleted unused log4j config file and made kafka consumer logging less verbose when running tests.
    
    * Verified that the kafka10 collector external module can be successfully loaded and run with zipkin-server. Moved documentation on running the kafka10 collector from the zipkin-server readme to the zipkin-autoconfigure-collector-kafka10 readme, and updated with explanation of how to use the external module.
    
    * kafka10 collector documentation fixes and tweaks.
    
    * Fixed spelling error.
    
    * Added test to verify kafka10 collector functions correctly with multiple consumer threads.
    
    * Attempting to fix failed test on CirleCI. The test checks to make that two different threads were used to consume span messages from Kafka. It previously made an assumption that the names of threads in the thread pool backing the executor service are unique. The theory is that is not always true and the check now looks for unique instances of Thread.
    
    * Cleaned up and expanded unit tests for configuration and connectivity failures with the kafka10 collector.
    
    * Second attempt to fix test for multi-threaded Kafka collector that fails intermittently. Added check to wait for all consumer threads to receive topic partitions assignments before producing messages. Without this check, whether the messages were consumed all by one thread or distributed across both depended on timing. If the first thread's Kafka consumer started and was assigned both partitions before the second thread's Kafka consumer was started and assigned a partition, the first thread could consume both messages.
    
    * Updated handling of thread interrupts in the kafak10 collector to be detected and handled in a more consistent way. Added some logging to capture the reason workers exit.
    
    * Changes based on code review feedback.
    
    * Version bumps to 1.25.1 to catch up with upstream/master.
    dgrabows committed with adriancole May 17, 2017
  4. Make RegisterZipkinHealthIndicators public for custom zipkin server i…

    …nstances. (#1597)
    garyd203 committed with adriancole May 17, 2017
Commits on May 16, 2017
  1. [maven-release-plugin] prepare for next development iteration

    zipkinci committed May 16, 2017
  2. [maven-release-plugin] prepare release 1.25.0

    zipkinci committed May 16, 2017
  3. Replaces revoked key

    fedj committed May 16, 2017
  4. Stop running cassandra as we are over mem. See #1573

    adriancole committed May 16, 2017
  5. Uses code preformatting so long lines break in the UI (#1583)

    Fixes #1583
    dmitry-prokopchenkov committed with adriancole May 5, 2017
  6. Explicitly sets line endings to LF for source, doc and configuration (#…

    …1536)
    
    Per https://help.github.com/articles/dealing-with-line-endings/ in
    efforts to help avoid mixed line endings with unix and windows.
    
    See #1535
    adriancole committed on GitHub May 16, 2017
  7. Quiets zipkin-server integration test setup (#1508)

    Our CI builds are full of log output that isn't helpful, ex.
    
    ```
    [INFO] [INFO] Downloading: file:///Users/acole/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.pom
    [INFO] [INFO] Downloaded: file:///Users/acole/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.21/plexus-interpolation-1.21.pom (2 KB at 501.3 KB/sec)
    ```
    
    See http://stackoverflow.com/questions/35119522/disable-downloaded-logs-in-maven-invoker-tests
    adriancole committed on GitHub May 16, 2017
  8. Adds the ability to log http requests sent to Elasticsearch (#1596)

    This is helpful when troubleshooting.
    
    Ex.
    ```bash
    $ STORAGE_TYPE=elasticsearch ES_HTTP_LOGGING=BASIC  java -jar ./zipkin-server/target/zipkin-server-*exec.jar
    ```
    adriancole committed on GitHub May 16, 2017
Commits on May 15, 2017
  1. Considers the translated table name in MySQL health checks (#1595)

    Before, we didn't look for non-default schema. Now we do.
    
    Fixes #1592
    adriancole committed on GitHub May 15, 2017
  2. Allows collector-only servers to disable the UI and query apis (#1593)

    This adds the ability to set `QUERY_ENABLED=false` for reasons including
    security policy.
    adriancole committed on GitHub May 15, 2017
  3. Fix year in header to appease license-maven-plugin (#1590)

    garyd203 committed with adriancole May 15, 2017
Commits on May 13, 2017
  1. Fixes bad advice

    adriancole committed May 13, 2017
Commits on May 4, 2017
  1. [maven-release-plugin] prepare for next development iteration

    zipkinci committed May 4, 2017
  2. [maven-release-plugin] prepare release 1.24.0

    zipkinci committed May 4, 2017
  3. Enables search by binary annotation aka tag key (#1582)

    I believe we once were able to search by presence of a tag key. Ex
    "http.method" would return any traces that included any http request.
    Somewhere along the way this stopped working. This resurrects the
    feature along with tests. Here's the impact:
    
    * Cassandra will index a bit more: once per unique service/tag key
    * Elasticsearch now does two nested queries when looking for a key
    * MySQL now considers all annotation rows when looking for a key
    
    I think the value is greater than the impact as this is intuitive and
    answers a functionality many expect to "just work".
    adriancole committed on GitHub May 4, 2017