Skip to content

Commit

Permalink
Merge branch 'main' into fix/OTEL-3607
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Dec 6, 2023
2 parents 44a51bd + 181474b commit 28ea38d
Show file tree
Hide file tree
Showing 51 changed files with 620 additions and 292 deletions.
152 changes: 152 additions & 0 deletions .cspell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
# cSpell:ignore textlintrc
# For settings, see
# https://www.streetsidesoftware.com/vscode-spell-checker/docs/configuration/
version: '0.2'
caseSensitive: true
ignorePaths:
- '*.svg'
# words here are only listed for their spelling, if there is a certain way
# to write a word (e.g. OpenTelemetry vs Opentelemetry or cloud native vs
# cloud-native), edit the text-lint rules in .textlintrc.yml
words:
- accountingservice
- adservice
- alibaba
- Alloc
- Alolita
- APAC
- appdynamics
- appender
- appenders
- aspecto
- autoload
- autoloaded
- autoloader
- autoloading
- backoff
- bytecode
- caml
- cartservice
- cassandra
- checkoutservice
- cncf
- currencyservice
- daemonset
- datadog
- declarators
- discoverability
- dotnet
- Dyla
- dynatrace
- emailservice
- EMEA
- erlang
- errorf
- featureflagservice
- frauddetectionservice
- frontendproxy
- github
- gitpod
- grafana
- gzipped
- Hausenblas
- hugo
- initializers
- instana
- istio
- jaeger
- jaegertracing
- javaagent
- javadoc
- jboss
- jdbc
- julia
- Juraci
- knative
- kotlin
- Kröhling
- kubecon
- kubernetes
- laravel
- lifecycles
- lightstep
- linux
- Loffay
- Mancuso
- microservices
- mongodb
- mysql
- ndjson
- netlify
- Neumann
- nginx
- ocaml
- opamp
- opencensus
- opensearch
- opentelemetry
- opentracing
- openzipkin
- otel
- otel-comms
- otel-endusers
- otelcol
- otep
- otlp
- overridable
- Paixão
- parentbased
- Pavol
- paymentservice
- pluggable
- postgresql
- Pranay
- Prateek
- Println
- productcatalogservice
- prometheus
- proto
- protobuf
- quantile
- quantiles
- quarkus
- quoteservice
- recommendationservice
- redis
- relref
- Rexed
- roadmap
- runtimes
- Rynn
- semconv
- servlet
- Severin
- Sharma
- shippingservice
- shortcode
- snmp
- Socha
- sqlite
- Stalnaker
- stdoutmetric
- Strimzi
- subdir
- symfony
- tabpane
- textlint
- thanos
- tocstop
- tracecontext
- traceidratio
- traceloop
- traceparent
- traefik
- Trask
- uids
- unshallow
- upstreamed
- Villela
- wordpress
- WSGI
- zend
- zipkin
9 changes: 8 additions & 1 deletion .github/workflows/check-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,14 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v3
with: { name: build-log-etc }
- run: npm run diff:fail
- name: Fail when refcache contains entries with HTTP status 4XX
run: |
if grep -B 1 -e '"StatusCode": 4' static/refcache.json; then
echo "Run 'npx gulp prune' to remove 4xx entries from the refcache"
exit 1
fi
- name: Does the refcache need updating?
run: npm run diff:fail

check-build-log-for-issues:
name: WARNINGS in build log?
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
content/**/*.md
layouts/**/*.md
data/**/*
config: .vscode/cspell.json
config: .cspell.yml

dict-check:
name: CSPELL:IGNORE check
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ assets/jsconfig.json

# VS Code
/.vscode/**
!/.vscode/cspell.json

# Webstorm
/.idea/**
152 changes: 0 additions & 152 deletions .vscode/cspell.json

This file was deleted.

22 changes: 22 additions & 0 deletions content/en/blog/2023/otel-in-focus-break.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
title: 'OpenTelemetry in Focus: Wrapping Up a Successful 2023'
linkTitle: OTel in Focus Wrap-Up
date: 2023-12-06
author: '[Severin Neumann](https://github.com/svrnm) (Cisco)'
---

As we approach the end of an eventful year, we're announcing that "OpenTelemetry
in Focus", our platform for sharing updates about the OpenTelemetry project, is
taking an end-of-year break after ten successful editions in 2023.

Over the past year, OpenTelemetry in Focus has been a key resource for news and
insights about the OpenTelemetry project.
[Austin Parker](https://github.com/austinlparker) aimed to give a clear picture
of OTel's progress, the issues that got solved, and what is planned for the
future.

In those ten editions, each issue has highlighted the ongoing work, creativity,
and dedication that drive the OpenTelemetry project.

While OpenTelemetry in Focus is on a break, we will be working on a new and
improved format for it. Stay tuned!
2 changes: 1 addition & 1 deletion content/en/docs/collector/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ title: Collector
description: Vendor-agnostic way to receive, process and export telemetry data.
aliases: [collector/about]
cascade:
vers: 0.90.0
vers: 0.90.1
weight: 10
---

Expand Down
5 changes: 3 additions & 2 deletions content/en/docs/concepts/semantic-conventions.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ weight: 30

OpenTelemetry defines [Semantic Conventions](/docs/specs/semconv/) (sometimes
called Semantic Attributes) that specify common names for different kinds of
operations and data. The benefit to using Semantic Conventions is in following a
operations and data. The benefit of using Semantic Conventions is in following a
common naming scheme that can be standardized across a codebase, libraries, and
platforms.

Currently, Semantic Conventions are available for traces, metrics and resources:
Semantic Conventions are available for traces, metrics, logs, and resources:

- [Trace Semantic Conventions](/docs/specs/semconv/general/trace/)
- [Metric Semantic Conventions](/docs/specs/semconv/general/metrics/)
- [Log Semantic Conventions](/docs/specs/semconv/general/logs/)
- [Resource Semantic Conventions](/docs/specs/semconv/resource/)
Loading

0 comments on commit 28ea38d

Please sign in to comment.