ecs-logging 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1915b7e8e0bb7478ec5f730ab0362392f09f820ac12d79fd3474f87e207a05a3
-  data.tar.gz: e4100217b49ec650f2594176976f8f452a64cf26e7b807b99e1baca6fc47cbb0
+  metadata.gz: 3a81f133f4afd81becd74097f04605c64aa775ba3d608b098796aa529e7cd3b5
+  data.tar.gz: 1956240ae662101b9bb8ad9921eae6d7df22b4d203f105c70b88bd509b2f308a
 SHA512:
-  metadata.gz: 27e97608af308c9efed7211c0a50cef1f9832a6aa57ac4eb4c80d01d25d9b3cd28b3a01fb73cbbb88ee9a314ffa5c5cc45bdd8eddd645d7752741f21d10f43ed
-  data.tar.gz: 15abf89d399284aaad1517508358a8a5b34da28bdf1b442164be2f905a790eaa44b49978c7ab7285024e50b3c035e9f155b846da6acb85e5dea6b39a9042042e
+  metadata.gz: 69401d9254d264f341cce477be077d6d2dd7955b012daef75bd7517d91a5d25c46137f274445b86ec20be0004c3e08462f52dc1f92c5d07abecac48d475c7a21
+  data.tar.gz: 5ceb443448b0bd5e75ed5f6acce0177f3916dffd31fe321031c380acb83ed4de8a2f239de7b815564214c08a8b14902e1ae1a28ca7b4167bb3acadf914018588

data/CHANGELOG.asciidoc

@@ -32,6 +32,16 @@ endif::[]
 ==== Unreleased
 ////
 
+[[release-notes-1.x]]
+=== ECS logging Ruby 1.x
+
+[[release-notes-1.0.0]]
+==== 1.0.0 (2021-02-09)
+
+===== Added
+
+- Add tracing IDs from Elastic APM if running alongside {pull}14[#14]
+
 [[release-notes-0.x]]
 === ECS logging Ruby 0.x
 

data/Gemfile

@@ -1,3 +1,20 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -3,7 +3,7 @@
 [![Jenkins](https://apm-ci.elastic.co/buildStatus/icon?job=apm-agent-ruby/ecs-logging-ruby-mbp/master)](https://apm-ci.elastic.co/job/apm-agent-ruby/job/ecs-logging-ruby-mbp/job/master/) [![Gem](https://img.shields.io/gem/v/ecs-logging.svg)](https://rubygems.org/gems/ecs-logging)
 
 This set of libraries allows you to transform your application logs to structured logs that comply with the [Elastic Common Schema (ECS)](https://www.elastic.co/guide/en/ecs/current/ecs-reference.html).
-In combination with [filebeat](https://www.elastic.co/products/beats/filebeat) you can send your logs directly to Elasticsearch and leverage [Kibana's Logs UI](https://www.elastic.co/guide/en/infrastructure/guide/current/logs-ui-overview.html) to inspect all logs in one single place.
+In combination with [Filebeat](https://www.elastic.co/products/beats/filebeat), send your logs directly to Elasticsearch and leverage [Kibana's Logs app](https://www.elastic.co/guide/en/observability/current/monitor-logs.html) to inspect all of your logs in a single place.
 See [ecs-logging](https://github.com/elastic/ecs-logging) for other ECS logging libraries and more resources about ECS & logging.
 
 ---

data/bin/dev

@@ -1,4 +1,22 @@
 #!/usr/bin/env ruby
+
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 # frozen_string_literal: true
 
 require 'optparse'

data/docs/setup.asciidoc

@@ -71,7 +71,7 @@ Logs the following:
 ----
 {
   "@timestamp":"2020-11-24T13:32:21.331Z",
-  "log.level":"ERROR",
+  "log.level":"INFO",
   "message":"oh no!",
   "ecs.version":"1.4.0",
   "labels":{"my_label":"value"},

data/lib/ecs_logging/logger.rb

@@ -43,6 +43,12 @@ module EcsLogging
         end
       end
 
+      if apm_agent_present_and_running?
+        extras[:"transaction.id"] = ElasticAPM.current_transaction&.id
+        extras[:"trace.id"] = ElasticAPM.current_transaction&.trace_id
+        extras[:"span.id"] = ElasticAPM.current_span&.id
+      end
+
       @logdev.write(
         format_message(
           format_severity(severity),
@@ -87,5 +93,11 @@ module EcsLogging
     def format_message(severity, datetime, progname, msg, **extras)
       formatter.call(severity, datetime, progname, msg, **extras)
     end
+
+    def apm_agent_present_and_running?
+      return false unless defined?(::ElasticAPM)
+
+      ElasticAPM.running?
+    end
   end
 end

data/lib/ecs_logging/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module EcsLogging
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs-logging
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Write a longer description or delete this line.
 email: